.gitignore

@@ -1 +1 @@
-SOURCES/maven-resolver-1.6.1-source-release.zip
+SOURCES/maven-resolver-1.7.3-source-release.zip

.maven-resolver.metadata

@@ -1 +1 @@
-9ea37ad1cdb9ade006af38929a64cecf88af19f9 SOURCES/maven-resolver-1.6.1-source-release.zip
+4c6b378f56fd1a39bc06024e7866dcdde31c64e7 SOURCES/maven-resolver-1.7.3-source-release.zip

SPECS/maven-resolver.spec

@@ -1,29 +1,36 @@
 %bcond_with bootstrap
 
+%if %{without bootstrap} && !0%{?rhel}
+%bcond_without maven_resolver_extra_modules
+%else
+%bcond_with maven_resolver_extra_modules
+%endif
+
 Name:           maven-resolver
 Epoch:          1
-Version:        1.6.1
+Version:        1.7.3
-Release:        12%{?dist}
+Release:        5%{?dist}
 License:        ASL 2.0
 Summary:        Apache Maven Artifact Resolver library
 URL:            https://maven.apache.org/resolver/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip
 
 Patch0:         0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch
 
-BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
+BuildRequires:  javapackages-bootstrap-openjdk8
 %else
+BuildRequires:  maven-local-openjdk8
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-classworlds)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
@@ -35,6 +42,12 @@ BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.slf4j:slf4j-simple)
 BuildRequires:  mvn(org.sonatype.sisu:sisu-guice::no_aop:)
 %endif
+%if %{with maven_resolver_extra_modules}
+BuildRequires:  mvn(javax.servlet:javax.servlet-api)
+BuildRequires:  mvn(org.eclipse.jetty:jetty-http)
+BuildRequires:  mvn(org.eclipse.jetty:jetty-server)
+BuildRequires:  mvn(org.eclipse.jetty:jetty-util)
+%endif
 
 Provides:       maven-resolver-api = %{epoch}:%{version}-%{release}
 Provides:       maven-resolver-spi = %{epoch}:%{version}-%{release}
@@ -46,17 +59,6 @@ Provides:       maven-resolver-transport-http = %{epoch}:%{version}-%{release}
 Provides:       maven-resolver-transport-file = %{epoch}:%{version}-%{release}
 Provides:       maven-resolver-transport-classpath = %{epoch}:%{version}-%{release}
 
-Obsoletes:      maven-resolver-api < 1:1.4.2-6
-Obsoletes:      maven-resolver-spi < 1:1.4.2-6
-Obsoletes:      maven-resolver-impl < 1:1.4.2-6
-Obsoletes:      maven-resolver-util < 1:1.4.2-6
-Obsoletes:      maven-resolver-connector-basic < 1:1.4.2-6
-Obsoletes:      maven-resolver-transport-wagon < 1:1.4.2-6
-Obsoletes:      maven-resolver-transport-http < 1:1.4.2-6
-Obsoletes:      maven-resolver-transport-file < 1:1.4.2-6
-Obsoletes:      maven-resolver-transport-classpath < 1:1.4.2-6
-Obsoletes:      maven-resolver-test-util < 1:1.4.2-6
-
 %description
 Apache Maven Artifact Resolver is a library for working with artifact
 repositories and dependency resolution. Maven Artifact Resolver deals with the
@@ -67,16 +69,23 @@ artifact transports and artifact resolution.
 
 %prep
 %setup -q
-%patch -P 0 -p1
+%patch0 -p1
+
+# requires internet connection
+rm maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
 
 %pom_remove_plugin -r :bnd-maven-plugin
+%pom_remove_plugin -r org.codehaus.mojo:animal-sniffer-maven-plugin
+%pom_remove_plugin -r org.apache.maven.plugins:maven-enforcer-plugin
 
 %pom_disable_module maven-resolver-demos
-%pom_disable_module maven-resolver-synccontext-global
+%pom_disable_module maven-resolver-named-locks-hazelcast
-%pom_disable_module maven-resolver-synccontext-redisson
+%pom_disable_module maven-resolver-named-locks-redisson
 %pom_disable_module maven-resolver-transport-classpath
+%if %{without maven_resolver_extra_modules}
 %pom_disable_module maven-resolver-transport-file
 %pom_disable_module maven-resolver-transport-http
+%endif
 %mvn_package :maven-resolver-test-util __noinstall
 
 # generate OSGi manifests
@@ -105,6 +114,7 @@ done
 </configuration>"
 
 %mvn_alias 'org.apache.maven.resolver:maven-resolver{*}' 'org.eclipse.aether:aether@1'
+%mvn_alias 'org.apache.maven.resolver:maven-resolver-transport-wagon' 'org.eclipse.aether:aether-connector-wagon'
 %mvn_file ':maven-resolver{*}' %{name}/maven-resolver@1 aether/aether@1
 
 %build
@@ -117,30 +127,29 @@ done
 %license LICENSE NOTICE
 
 %changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:1.6.1-12
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.3-5
-- Fix patch usage
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1:1.6.1-11
+* Fri Apr 29 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.7.3-4
-- Rebuild with regenerated Requires on Java
+- Add aether-connector-wagon alias
 
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-10
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:1.7.3-3
-- Rebuild to regenerate auto-requires
+- Rebuilt for java-17-openjdk as system jdk
 
-* Sun Nov 14 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-9
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.3-2
-- Rebuild with no changes
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Fri Nov 12 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-8
+* Fri Jan 07 2022 Marian Koncek <mkoncek@redhat.com> - 1:1.7.3-1
-- Remove use of deprecated SHA-1 and MD5 algorithms
+- Update to upstream version 1.7.3
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.6.1-7
+* Thu Oct 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Remove use of deprecated SHA-1 and MD5 algorithms
-  Related: rhbz#1991688
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-6
+* Sun Oct 03 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1:1.6.1-6
-- Rebuild to workaround DistroBaker issue
+- Enable transport-file and transport-http module
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-5
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-5
-- Bootstrap Maven for CentOS Stream 9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-4
 - Add epoch to obsoleted packages