.gitignore

@@ -1 +1 @@
-SOURCES/maven-artifact-transfer-0.13.1-source-release.zip
+SOURCES/maven-artifact-transfer-0.9.0-source-release.zip

.maven-artifact-transfer.metadata

@@ -1 +1 @@
-ad73b17e3421aff753361afa9cb296a27fb53815 SOURCES/maven-artifact-transfer-0.13.1-source-release.zip
+4f99fea3cdf0209f767d7c36813758ba5737d4a7 SOURCES/maven-artifact-transfer-0.9.0-source-release.zip

SOURCES/0001-Compatibility-with-Maven-3.0.3-and-later.patch

@@ -4,15 +4,14 @@ Date: Mon, 12 Oct 2015 13:28:56 +0200
 Subject: [PATCH] Compatibility with Maven 3.0.3 and later
 
 ---
- .../Maven31ArtifactRepositoryAdapter.java     | 20 +++++++++++++++++++
+ .../internal/Maven31ArtifactRepositoryAdapter.java   | 20 ++++++++++++++++++++
- .../Maven31ArtifactRepositoryAdapter.java     | 20 +++++++++++++++++++
+ 1 file changed, 20 insertions(+)
- 2 files changed, 40 insertions(+)
 
-diff --git a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java
+diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
-index d53a452..9d93f31 100644
+index 5de5dbb..11b7453 100644
---- a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java
+--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
-+++ b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java
++++ b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
-@@ -19,6 +19,7 @@ package org.apache.maven.shared.transfer.collection.internal;
+@@ -19,6 +19,7 @@ package org.apache.maven.shared.dependencies.collect.internal;
   * under the License.
   */
  
@@ -20,43 +19,7 @@ index d53a452..9d93f31 100644
  import java.util.List;
  
  import org.apache.maven.artifact.Artifact;
-@@ -262,4 +263,23 @@ class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
+@@ -263,4 +264,23 @@ public class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
-         }
-         return true;
-     }
-+
-+    private List<ArtifactRepository> mirroredRepositories = Collections.emptyList();
-+
-+    public List<ArtifactRepository> getMirroredRepositories()
-+    {
-+        return mirroredRepositories;
-+    }
-+
-+    public void setMirroredRepositories( List<ArtifactRepository> mirroredRepositories )
-+    {
-+        if ( mirroredRepositories != null )
-+        {
-+            this.mirroredRepositories = mirroredRepositories;
-+        }
-+        else
-+        {
-+            this.mirroredRepositories = Collections.emptyList();
-+        }
-+    }
- }
-diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
-index f450dfd..d5716bb 100644
---- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
-+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
-@@ -19,6 +19,7 @@ package org.apache.maven.shared.transfer.dependencies.collect.internal;
-  * under the License.
-  */
- 
-+import java.util.Collections;
- import java.util.List;
- 
- import org.apache.maven.artifact.Artifact;
-@@ -263,4 +264,23 @@ class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
          }
          return true;
      }
@@ -81,5 +44,5 @@ index f450dfd..d5716bb 100644
 +    }
  }
 -- 
-2.29.2
+2.7.4
 

SOURCES/0002-Remove-support-for-maven-3.0.X.patch

@@ -1,176 +0,0 @@
-From 21bf966408cf1bceaa6603e45958bc30ddae8c83 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Thu, 14 Jan 2021 18:21:21 +0100
-Subject: [PATCH] Remove support for maven 3.0.X
-
----
- .../deploy/internal/DefaultArtifactDeployer.java |  8 +-------
- .../internal/DefaultArtifactInstaller.java       |  8 +-------
- .../internal/DefaultArtifactResolver.java        | 11 +----------
- .../internal/DefaultDependencyCollector.java     | 12 +-----------
- .../internal/DefaultDependencyCollector.java     | 13 +------------
- .../internal/DefaultDependencyResolver.java      | 13 +------------
- .../internal/DefaultRepositoryManager.java       | 16 +---------------
- 7 files changed, 7 insertions(+), 74 deletions(-)
-
-diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
-index 11a268c..9b24335 100644
---- a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
-+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
-@@ -133,13 +133,7 @@ class DefaultArtifactDeployer implements ArtifactDeployer, Contextualizable
-         }
-         else
-         {
--            org.sonatype.aether.RepositorySystem repositorySystem = container.lookup(
--                    org.sonatype.aether.RepositorySystem.class );
--
--            org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
--                    "getRepositorySession" );
--
--            return new Maven30ArtifactDeployer( repositorySystem, session );
-+            throw new UnsupportedOperationException("Maven 3.0.X is not supported");
-         }
-     }
- }
-diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
-index 238e814..000bdbb 100644
---- a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
-+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
-@@ -150,13 +150,7 @@ class DefaultArtifactInstaller implements ArtifactInstaller, Contextualizable
-         }
-         else
-         {
--            org.sonatype.aether.RepositorySystem repositorySystem = container.lookup(
--                    org.sonatype.aether.RepositorySystem.class );
--
--            org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
--                    "getRepositorySession" );
--
--            return new Maven30ArtifactInstaller( repositorySystem, session );
-+            throw new UnsupportedOperationException("Maven 3.0.X is not supported");
-         }
-     }
- }
-diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
-index 83d7517..cfb5b61 100644
---- a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
-+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
-@@ -146,16 +146,7 @@ class DefaultArtifactResolver implements ArtifactResolver, Contextualizable
-         }
-         else
-         {
--            org.sonatype.aether.RepositorySystem repositorySystem = container.lookup(
--                    org.sonatype.aether.RepositorySystem.class );
--
--            List<org.sonatype.aether.repository.RemoteRepository> aetherRepositories = Invoker.invoke(
--                    RepositoryUtils.class, "toRepos", List.class, buildingRequest.getRemoteRepositories() );
--
--            org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
--                    "getRepositorySession" );
--
--            return new Maven30ArtifactResolver( repositorySystem, aetherRepositories, session );
-+            throw new UnsupportedOperationException("Maven 3.0.X is not supported");
-         }
- 
- 
-diff --git a/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
-index e6ce50e..bfb7797 100644
---- a/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
-+++ b/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
-@@ -177,17 +177,7 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
-         }
-         else
-         {
--            org.sonatype.aether.RepositorySystem m30RepositorySystem = container.lookup(
--                    org.sonatype.aether.RepositorySystem.class );
--
--            org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
--                    "getRepositorySession" );
--
--            List<org.sonatype.aether.repository.RemoteRepository> aetherRepositories = Invoker.invoke(
--                    RepositoryUtils.class, "toRepos", List.class, buildingRequest.getRemoteRepositories() );
--
--            return new Maven30DependencyCollector( m30RepositorySystem, artifactHandlerManager, session,
--                    aetherRepositories );
-+            throw new UnsupportedOperationException("Maven 3.0.X is not supported");
-         }
- 
-     }
-diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
-index bf84fc9..c906534 100644
---- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
-+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
-@@ -179,18 +179,7 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
-         }
-         else
-         {
--
--            org.sonatype.aether.RepositorySystem m30RepositorySystem = container.lookup(
--                    org.sonatype.aether.RepositorySystem.class );
--
--            org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
--                    "getRepositorySession" );
--
--            List<org.sonatype.aether.repository.RemoteRepository> aetherRepositories = Invoker.invoke(
--                    RepositoryUtils.class, "toRepos", List.class, buildingRequest.getRemoteRepositories() );
--
--            return new Maven30DependencyCollector( m30RepositorySystem, artifactHandlerManager, session,
--                    aetherRepositories );
-+            throw new UnsupportedOperationException("Maven 3.0.X is not supported");
-         }
- 
-     }
-diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
-index 28289a8..34779d2 100644
---- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
-+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
-@@ -164,18 +164,7 @@ class DefaultDependencyResolver implements DependencyResolver, Contextualizable
-         }
-         else
-         {
--            org.sonatype.aether.RepositorySystem m30RepositorySystem = container.lookup(
--                    org.sonatype.aether.RepositorySystem.class );
--
--            org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
--                    "getRepositorySession" );
--
--            List<org.sonatype.aether.repository.RemoteRepository> aetherRepositories = Invoker.invoke(
--                    RepositoryUtils.class, "toRepos", List.class, buildingRequest.getRemoteRepositories() );
--
--            return new Maven30DependencyResolver( m30RepositorySystem, artifactHandlerManager, session,
--                    aetherRepositories );
--
-+            throw new UnsupportedOperationException("Maven 3.0.X is not supported");
-         }
-     }
- 
-diff --git a/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java b/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java
-index c29cc08..add22fa 100644
---- a/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java
-+++ b/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java
-@@ -166,21 +166,7 @@ class DefaultRepositoryManager
-         }
-         else
-         {
--            org.sonatype.aether.RepositorySystem m30RepositorySystem =
--                container.lookup( org.sonatype.aether.RepositorySystem.class );
--
--            org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
--                    "getRepositorySession" );
--            
--            if ( isMaven302() )
--            {
--                return new Maven302RepositoryManager( m30RepositorySystem, session );
--                
--            }
--            else
--            {
--                return new Maven30RepositoryManager( m30RepositorySystem, session );
--            }
-+            throw new UnsupportedOperationException("Maven 3.0.X is not supported");
-         }
-     }
-     
--- 
-2.29.2
-

SPECS/maven-artifact-transfer.spec

@@ -1,23 +1,17 @@
-%bcond_with bootstrap
-
 Name:           maven-artifact-transfer
-Version:        0.13.1
+Version:        0.9.0
-Release:        5%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Apache Maven Artifact Transfer
 License:        ASL 2.0
-URL:            https://maven.apache.org/shared/maven-artifact-transfer
+URL:            http://maven.apache.org/shared/maven-artifact-transfer
 BuildArch:      noarch
 
-Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 Patch0:         0001-Compatibility-with-Maven-3.0.3-and-later.patch
-Patch1:         0002-Remove-support-for-maven-3.0.X.patch
 
 BuildRequires:  maven-local
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
 BuildRequires:  mvn(commons-codec:commons-codec)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
@@ -30,9 +24,8 @@ BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.eclipse.aether:aether-api)
 BuildRequires:  mvn(org.eclipse.aether:aether-impl)
 BuildRequires:  mvn(org.eclipse.aether:aether-util)
-BuildRequires:  mvn(org.mockito:mockito-core)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
-%endif
+
 
 %description
 An API to either install or deploy artifacts with Maven 3.
@@ -45,12 +38,11 @@ This package provides %{summary}.
 
 %prep
 %setup -q
-find -name '*.java' -exec sed -i 's/\r//' {} +
 %patch0 -p1
-%patch1 -p1
 
-%pom_remove_plugin :apache-rat-plugin
 %pom_remove_plugin :maven-shade-plugin
+%pom_remove_plugin :apache-rat-plugin
+%pom_remove_plugin :maven-enforcer-plugin
 %pom_remove_plugin :animal-sniffer-maven-plugin
 
 # We don't want to support legacy Maven versions (older than 3.1)
@@ -70,59 +62,6 @@ find -name Maven30\*.java -delete
 %license LICENSE NOTICE
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.13.1-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.13.1-4
-- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.13.1-3
-- Bootstrap Maven for CentOS Stream 9
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.13.1-2
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 14 2021 Marian Koncek <mkoncek@redhat.com> - 0.13.1-1
-- Update to upstream version 0.13.1
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:0.11.0-3
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 21 2020 Marian Koncek <mkoncek@redhat.com> - 0.12.0-1
-- Update to upstream version 0.12.0
-
-* Tue Nov 05 2019 Marian Koncek <mkoncek@redhat.com> - 1:0.11.0-1
-- Update to upstream version 0.11.0
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.9.0-6
-- Mass rebuild for javapackages-tools 201902
-
-* Sun Nov 03 2019 Fabio Valentini <decathorpe@gmail.com> - 1:0.11.0-1
-- Update to version 0.11.0.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.9.0-5
-- Mass rebuild for javapackages-tools 201901
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild