.gitignore

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

.maven-resolver.metadata

@@ -1 +1 @@
-9ea37ad1cdb9ade006af38929a64cecf88af19f9 SOURCES/maven-resolver-1.6.1-source-release.zip
+8e98446e93e2810c84257194c67568e069765602 SOURCES/maven-resolver-1.1.1-source-release.zip

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

@@ -1,37 +0,0 @@
-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
-
----
- .../aether/repository/AuthenticationDigest.java       | 11 ++---------
- 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 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
-@@ -98,18 +98,11 @@ public final class AuthenticationDigest
-     {
-         try
-         {
--            return MessageDigest.getInstance( "SHA-1" );
-+            return MessageDigest.getInstance( "SHA-256" );
-         }
-         catch ( NoSuchAlgorithmException e )
-         {
--            try
--            {
--                return MessageDigest.getInstance( "MD5" );
--            }
--            catch ( NoSuchAlgorithmException ne )
--            {
--                throw new IllegalStateException( ne );
--            }
-+            throw new IllegalStateException( e );
-         }
-     }
- 
--- 
-2.32.0
-

SPECS/maven-resolver.spec

@@ -1,61 +1,35 @@
-%bcond_with bootstrap
-
 Name:           maven-resolver
 Epoch:          1
-Version:        1.6.1
+Version:        1.1.1
-Release:        12%{?dist}
+Release:        2%{?dist}
 License:        ASL 2.0
 Summary:        Apache Maven Artifact Resolver library
-URL:            https://maven.apache.org/resolver/
+URL:            http://maven.apache.org/resolver/
+Source0:        http://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip
 BuildArch:      noarch
 
-Source0:        https://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip
+BuildRequires:  maven-local
-
-Patch0:         0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch
-
-BuildRequires:  maven-local-openjdk8
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
 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.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.plugins:maven-enforcer-plugin)
+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:  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
+
-
+# XXX Remove after F26 EOL
-Provides:       maven-resolver-api = %{epoch}:%{version}-%{release}
+Obsoletes:      aether < 1:1.0.3
-Provides:       maven-resolver-spi = %{epoch}:%{version}-%{release}
-Provides:       maven-resolver-impl = %{epoch}:%{version}-%{release}
-Provides:       maven-resolver-util = %{epoch}:%{version}-%{release}
-Provides:       maven-resolver-connector-basic = %{epoch}:%{version}-%{release}
-Provides:       maven-resolver-transport-wagon = %{epoch}:%{version}-%{release}
-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
@@ -63,21 +37,103 @@ repositories and dependency resolution. Maven Artifact Resolver deals with the
 specification of local repository, remote repository, developer workspaces,
 artifact transports and artifact resolution.
 
-%{?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
-%patch -P 0 -p1
 
-%pom_remove_plugin -r :bnd-maven-plugin
+# 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-synccontext-global
-%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
 for pom in $(find -mindepth 2 -name pom.xml) ; do
@@ -104,111 +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 -f .mfiles
 %license LICENSE NOTICE
 
-%changelog
+%files api -f .mfiles-%{name}-api
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:1.6.1-12
+%license LICENSE NOTICE
-- Fix patch usage
+%files spi -f .mfiles-%{name}-spi
-
+%files util -f .mfiles-%{name}-util
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1:1.6.1-11
+%files impl -f .mfiles-%{name}-impl
-- Rebuild with regenerated Requires on Java
+%files test-util -f .mfiles-%{name}-test-util
-
+%files connector-basic -f .mfiles-%{name}-connector-basic
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-10
+%files transport-classpath -f .mfiles-%{name}-transport-classpath
-- Rebuild to regenerate auto-requires
+%files transport-file -f .mfiles-%{name}-transport-file
-
+%files transport-http -f .mfiles-%{name}-transport-http
-* Sun Nov 14 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-9
+%files transport-wagon -f .mfiles-%{name}-transport-wagon
-- Rebuild with no changes
+
-
+%files javadoc -f .mfiles-javadoc
-* Fri Nov 12 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-8
+%license LICENSE NOTICE
-- Remove use of deprecated SHA-1 and MD5 algorithms
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.6.1-7
-- 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
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-5
-- 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
-
-* Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-3
-- Obsolete removed subpackages
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-2
-- Bootstrap build
-- Non-bootstrap build
-
-* Wed Feb 17 2021 Fabio Valentini <decathorpe@gmail.com> - 1:1.4.2-5
-- Build with -release 8 for better OpenJDK 8 compatibility.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.4.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 15 2021 Marian Koncek <mkoncek@redhat.com> - 1.6.1-1
-- Update to upstream version 1.6.1
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.4.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:1.4.2-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Fri Jun 26 2020 Marian Koncek <mkoncek@redhat.com> - 1.4.2-1
-- Update to upstream version 1.4.2
-
-* Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 1:1.4.2-1
-- Update to version 1.4.2.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* 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
-
-* Sun Nov 03 2019 Fabio Valentini <decathorpe@gmail.com> - 1:1.4.1-1
-- Update to version 1.4.1.
-
-* Wed Sep 11 2019 Marian Koncek <mkoncek@redhat.com> - 1.4.1-1
-- Update to upstream version 1.4.1
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* 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
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* 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
 
+%changelog
 * Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.1.1-2
 - Remove aether provides