.gitignore

@@ -1 +1 @@
-SOURCES/maven-resolver-1.4.1-source-release.zip
+SOURCES/maven-resolver-1.1.1-source-release.zip

.maven-resolver.metadata

@@ -1 +1 @@
-689ff47a550ae9833804d2cd6d60b4f04591906d SOURCES/maven-resolver-1.4.1-source-release.zip
+8e98446e93e2810c84257194c67568e069765602 SOURCES/maven-resolver-1.1.1-source-release.zip

SPECS/maven-resolver.spec

@@ -1,46 +1,139 @@
 Name:           maven-resolver
-Version:        1.4.1
-Release:        3%{?dist}
+Epoch:          1
+Version:        1.1.1
+Release:        2%{?dist}
 License:        ASL 2.0
 Summary:        Apache Maven Artifact Resolver library
 URL:            http://maven.apache.org/resolver/
 Source0:        http://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip
 BuildArch:      noarch
 
-BuildRequires:  maven-local-openjdk8
+BuildRequires:  maven-local
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  %{?module_prefix}mvn(org.apache.maven.wagon:wagon-provider-api)
+BuildRequires:  mvn(org.apache.httpcomponents:httpclient)
+BuildRequires:  mvn(org.apache.httpcomponents:httpcore)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
+BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-classworlds)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
 BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
-BuildRequires:  mvn(org.mockito:mockito-core)
-BuildRequires:  %{?module_prefix}mvn(org.slf4j:slf4j-api)
-BuildRequires:  mvn(org.slf4j:slf4j-simple)
+BuildRequires:  mvn(org.slf4j:jcl-over-slf4j)
+BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.sonatype.sisu:sisu-guice::no_aop:)
 
+# XXX Remove after F26 EOL
+Obsoletes:      aether < 1:1.0.3
+
 %description
 Apache Maven Artifact Resolver is a library for working with artifact
 repositories and dependency resolution. Maven Artifact Resolver deals with the
 specification of local repository, remote repository, developer workspaces,
 artifact transports and artifact resolution.
 
-%{?module_package}
-%{?javadoc_package}
+%package api
+Summary:   Maven Artifact Resolver API
+# XXX Remove after F26 EOL
+Obsoletes: aether-api < 1:1.0.3
+Obsoletes: aether-ant-tasks < 1:1.0.1-9
+
+%description api
+The application programming interface for the repository system.
+
+%package spi
+Summary:   Maven Artifact Resolver SPI
+# XXX Remove after F26 EOL
+Obsoletes: aether-spi < 1:1.0.3
+
+%description spi
+The service provider interface for repository system implementations and
+repository connectors.
+
+%package util
+Summary:   Maven Artifact Resolver Utilities
+# XXX Remove after F26 EOL
+Obsoletes: aether-util < 1:1.0.3
+
+%description util
+A collection of utility classes to ease usage of the repository system.
+
+%package impl
+Summary:   Maven Artifact Resolver Implementation
+# XXX Remove after F26 EOL
+Obsoletes: aether-impl < 1:1.0.3
+
+%description impl
+An implementation of the repository system.
+
+%package test-util
+Summary:   Maven Artifact Resolver Test Utilities
+# XXX Remove after F26 EOL
+Obsoletes: aether-test-util < 1:1.0.3
+
+%description test-util
+A collection of utility classes to ease testing of the repository system.
+
+%package connector-basic
+Summary:   Maven Artifact Resolver Connector Basic
+# XXX Remove after F26 EOL
+Obsoletes: aether-connector-basic < 1:1.0.3
+
+%description connector-basic
+A repository connector implementation for repositories using URI-based layouts.
+
+%package transport-classpath
+Summary:   Maven Artifact Resolver Transport Classpath
+# XXX Remove after F26 EOL
+Obsoletes: aether-transport-classpath < 1:1.0.3
+
+%description transport-classpath
+A transport implementation for repositories using classpath:// URLs.
+
+%package transport-file
+Summary:   Maven Artifact Resolver Transport File
+# XXX Remove after F26 EOL
+Obsoletes: aether-transport-file < 1:1.0.3
+
+%description transport-file
+A transport implementation for repositories using file:// URLs.
+
+%package transport-http
+Summary:   Maven Artifact Resolver Transport HTTP
+# XXX Remove after F26 EOL
+Obsoletes: aether-transport-http < 1:1.0.3
+
+%description transport-http
+A transport implementation for repositories using http:// and https:// URLs.
+
+%package transport-wagon
+Summary:   Maven Artifact Resolver Transport Wagon
+# XXX Remove after F26 EOL
+Obsoletes: aether-transport-wagon < 1:1.0.3
+
+%description transport-wagon
+A transport implementation based on Maven Wagon.
+
+%package        javadoc
+Summary:        API documentation for %{name}
+
+%description    javadoc
+This package provides %{summary}.
+
 
 %prep
 %setup -q
 
+# tests require jetty 7
+%pom_remove_dep :::test maven-resolver-transport-http
+rm -r maven-resolver-transport-http/src/test
+
 %pom_disable_module maven-resolver-demos
-%pom_disable_module maven-resolver-transport-classpath
-%pom_disable_module maven-resolver-transport-file
-%pom_disable_module maven-resolver-transport-http
-%mvn_package :maven-resolver-test-util __noinstall
 
 # generate OSGi manifests
 for pom in $(find -mindepth 2 -name pom.xml) ; do
@@ -67,43 +160,36 @@ done
   </archive>
 </configuration>"
 
+%mvn_package :maven-resolver
 %mvn_alias 'org.apache.maven.resolver:maven-resolver{*}' 'org.eclipse.aether:aether@1'
 %mvn_file ':maven-resolver{*}' %{name}/maven-resolver@1 aether/aether@1
 
 %build
-%mvn_build
+%mvn_build -s
 
 %install
 %mvn_install
 
-%files -n %{?module_prefix}%{name} -f .mfiles
+
+%files -f .mfiles
+%license LICENSE NOTICE
+
+%files api -f .mfiles-%{name}-api
+%license LICENSE NOTICE
+%files spi -f .mfiles-%{name}-spi
+%files util -f .mfiles-%{name}-util
+%files impl -f .mfiles-%{name}-impl
+%files test-util -f .mfiles-%{name}-test-util
+%files connector-basic -f .mfiles-%{name}-connector-basic
+%files transport-classpath -f .mfiles-%{name}-transport-classpath
+%files transport-file -f .mfiles-%{name}-transport-file
+%files transport-http -f .mfiles-%{name}-transport-http
+%files transport-wagon -f .mfiles-%{name}-transport-wagon
+
+%files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE
 
 %changelog
-* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.1-3
-- Build with OpenJDK 8
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.1-2
-- Mass rebuild for javapackages-tools 201902
-
-* Wed Sep 11 2019 Marian Koncek <mkoncek@redhat.com> - 1.4.1-1
-- Update to upstream version 1.4.1
-
-* Sat Jun 29 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.3.3-3
-- Disable unneeded transporters
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.3.3-2
-- Mass rebuild for javapackages-tools 201901
-
-* Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.3.3-1
-- Update to upstream version 1.3.3
-
-* Tue Oct 23 2018 Marian Koncek <mkoncek@redhat.com> - 1:1.3.1-1
-- Update to upstream version 1.3.1
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.1.1-2
 - Remove aether provides