.gitignore

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

.maven-resolver.metadata

@@ -1 +1 @@
-e179e8ba82a78e82e6f34f93a80bd5250b9c662f SOURCES/maven-resolver-1.9.18-source-release.zip
+9ea37ad1cdb9ade006af38929a64cecf88af19f9 SOURCES/maven-resolver-1.6.1-source-release.zip

SOURCES/0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch

@@ -1,26 +1,31 @@
-From b21684d4ce0ad83f1eb3553cfa5e8ccdd08bcdcd Mon Sep 17 00:00:00 2001
+From 8f7d5c7c763f66035dda86012d58744547672abe Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Thu, 28 Oct 2021 10:03:13 +0200
 Subject: [PATCH] Remove use of deprecated SHA-1 and MD5 algorithms
 
 ---
- .../eclipse/aether/repository/AuthenticationDigest.java   | 8 ++------
+ .../aether/repository/AuthenticationDigest.java       | 11 ++---------
- 1 file changed, 2 insertions(+), 6 deletions(-)
+ 1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java b/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java
-index ec95fcba..a9a57953 100644
+index 27b88c02..6236e7b2 100644
 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java
 +++ b/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java
-@@ -88,13 +88,9 @@ public final class AuthenticationDigest {
+@@ -98,18 +98,11 @@ public final class AuthenticationDigest
- 
+     {
-     private static MessageDigest newDigest() {
+         try
-         try {
+         {
 -            return MessageDigest.getInstance( "SHA-1" );
 +            return MessageDigest.getInstance( "SHA-256" );
-         } catch (NoSuchAlgorithmException e) {
+         }
--            try {
+         catch ( NoSuchAlgorithmException e )
+         {
+-            try
+-            {
 -                return MessageDigest.getInstance( "MD5" );
--            } catch (NoSuchAlgorithmException ne) {
+-            }
+-            catch ( NoSuchAlgorithmException ne )
+-            {
 -                throw new IllegalStateException( ne );
 -            }
 +            throw new IllegalStateException( e );
@@ -28,5 +33,5 @@ index ec95fcba..a9a57953 100644
      }
  
 -- 
-2.39.2
+2.32.0
 

SPECS/maven-resolver.spec

@@ -2,46 +2,38 @@
 
 Name:           maven-resolver
 Epoch:          1
-Version:        1.9.18
+Version:        1.6.1
-Release:        4%{?dist}
+Release:        12%{?dist}
-License:        Apache-2.0
+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
 %else
-BuildRequires:  maven-local
-BuildRequires:  mvn(com.google.inject:guice)
-BuildRequires:  mvn(commons-codec:commons-codec)
 BuildRequires:  mvn(javax.inject:javax.inject)
-BuildRequires:  mvn(javax.servlet:javax.servlet-api)
 BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.httpcomponents:httpclient)
-BuildRequires:  mvn(org.apache.httpcomponents:httpcore)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
-BuildRequires:  mvn(org.apache.maven:maven-model-builder)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
-BuildRequires:  mvn(org.apache.maven:maven-resolver-provider)
+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.codehaus.plexus:plexus-xml)
 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)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
 BuildRequires:  mvn(org.mockito:mockito-core)
-BuildRequires:  mvn(org.slf4j:jcl-over-slf4j)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.slf4j:slf4j-simple)
+BuildRequires:  mvn(org.sonatype.sisu:sisu-guice::no_aop:)
 %endif
 
 Provides:       maven-resolver-api = %{epoch}:%{version}-%{release}
@@ -54,6 +46,17 @@ 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
@@ -64,21 +67,16 @@ artifact transports and artifact resolution.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch -P 0 -p1
-
-# Skip tests that equire internet connection
-rm maven-resolver-supplier/src/test/java/org/eclipse/aether/supplier/RepositorySystemSupplierTest.java
-rm maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/{HttpServer,HttpTransporterTest}.java
-%pom_remove_dep org.eclipse.jetty: maven-resolver-transport-http
 
 %pom_remove_plugin -r :bnd-maven-plugin
-%pom_remove_plugin -r org.codehaus.mojo:animal-sniffer-maven-plugin
-%pom_remove_plugin -r :japicmp-maven-plugin
 
 %pom_disable_module maven-resolver-demos
-%pom_disable_module maven-resolver-named-locks-hazelcast
+%pom_disable_module maven-resolver-synccontext-global
-%pom_disable_module maven-resolver-named-locks-redisson
+%pom_disable_module maven-resolver-synccontext-redisson
 %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
@@ -107,7 +105,6 @@ 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
@@ -120,75 +117,30 @@ done
 %license LICENSE NOTICE
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:1.9.18-4
+* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:1.6.1-12
-- Bump release for October 2024 mass rebuild:
+- Fix patch usage
-  Resolves: RHEL-64018
-
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:1.9.18-3
-- Rebuilt for MSVSphere 10
-
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1:1.9.18-3
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.9.18-2
-- Bump release for June 2024 mass rebuild
-
-* Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.9.18-1
-- Update to upstream version 1.9.18
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.15-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.15-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.9.15-3
-- Rebuild to regenerate auto-Requires on java
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.9.15-2
-- Convert License tag to SPDX format
 
-* Fri Aug 18 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.9.15-1
+* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1:1.6.1-11
-- Update to upstream version 1.9.15
+- Rebuild with regenerated Requires on Java
 
-* Tue Aug 15 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.9.7-4
+* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-10
-- Build with default JDK 17
+- Rebuild to regenerate auto-requires
 
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.7-3
+* Sun Nov 14 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Mar 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.9.7-2
 - Rebuild with no changes
 
-* Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.9.7-1
+* Fri Nov 12 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-8
-- Update to upstream version 1.9.7
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Apr 29 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.7.3-4
-- Add aether-connector-wagon alias
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:1.7.3-3
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jan 07 2022 Marian Koncek <mkoncek@redhat.com> - 1:1.7.3-1
-- Update to upstream version 1.7.3
-
-* Thu Oct 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-7
 - Remove use of deprecated SHA-1 and MD5 algorithms
 
-* Sun Oct 03 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1:1.6.1-6
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.6.1-7
-- Enable transport-file and transport-http module
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-6
+- Rebuild to workaround DistroBaker issue
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-5
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Bootstrap Maven for CentOS Stream 9
 
 * Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-4
 - Add epoch to obsoleted packages