SOURCES/0003-Port-to-maven-3.8.1.patch

@@ -1,59 +0,0 @@
-From 801cdd23a9dd9e8948f516537b0f5f09a252c5b7 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Fri, 17 Dec 2021 13:33:49 +0100
-Subject: [PATCH] Port to maven 3.8.1
-
----
- .../internal/Maven31ArtifactRepositoryAdapter.java   | 12 ++++++++++++
- .../internal/Maven31ArtifactRepositoryAdapter.java   | 12 ++++++++++++
- 2 files changed, 24 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
-index 9d93f31..8297fdb 100644
---- 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
-@@ -207,6 +207,18 @@ class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
-         throw new UnsupportedOperationException();
-     }
- 
-+    @Override
-+    public boolean isBlocked()
-+    {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    @Override
-+    public void setBlocked(boolean blocked)
-+    {
-+        throw new UnsupportedOperationException();
-+    }
-+
-     @Override
-     public String toString()
-     {
-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 d5716bb..4669353 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
-@@ -207,6 +207,18 @@ class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
-         throw new UnsupportedOperationException();
-     }
- 
-+    @Override
-+    public boolean isBlocked()
-+    {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    @Override
-+    public void setBlocked(boolean blocked)
-+    {
-+        throw new UnsupportedOperationException();
-+    }
-+
-     @Override
-     public String toString()
-     {
--- 
-2.31.1
-

SPECS/maven-artifact-transfer.spec

@@ -2,24 +2,22 @@
 
 Name:           maven-artifact-transfer
 Version:        0.13.1
-Release:        15%{?dist}
+Release:        5%{?dist}
 Epoch:          1
 Summary:        Apache Maven Artifact Transfer
-License:        Apache-2.0
+License:        ASL 2.0
 URL:            https://maven.apache.org/shared/maven-artifact-transfer
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://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
-Patch2:         0003-Port-to-maven-3.8.1.patch
 
+BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local
 BuildRequires:  mvn(commons-codec:commons-codec)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
@@ -48,9 +46,8 @@ This package provides %{summary}.
 %prep
 %setup -q
 find -name '*.java' -exec sed -i 's/\r//' {} +
-%patch 0 -p1
+%patch0 -p1
-%patch 1 -p1
+%patch1 -p1
-%patch 2 -p1
 
 %pom_remove_plugin :apache-rat-plugin
 %pom_remove_plugin :maven-shade-plugin
@@ -61,7 +58,7 @@ find -name '*.java' -exec sed -i 's/\r//' {} +
 find -name Maven30\*.java -delete
 
 %build
-%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
+%mvn_build
 
 %install
 %mvn_install
@@ -73,49 +70,15 @@ find -name Maven30\*.java -delete
 %license LICENSE NOTICE
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:0.13.1-15
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.13.1-5
-- Bump release for October 2024 mass rebuild:
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Resolves: RHEL-64018
+  Related: rhbz#1991688
-
-* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.13.1-14
-- Switch Java compiler source/target to 1.8
-- Resolves: RHEL-52696
-
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1:0.13.1-14
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:0.13.1-13
-- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.13.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.13.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.13.1-10
-- Convert License tag to SPDX format
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.13.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.13.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.13.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:0.13.1-6
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.13.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Wed Jan 05 2022 Marian Koncek <mkoncek@redhat.com> - 1:0.13.1-4
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.13.1-4
-- Port to maven 3.8.1
+- Rebuild to workaround DistroBaker issue
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.13.1-3
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.13.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Bootstrap Maven for CentOS Stream 9
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.13.1-2
 - Bootstrap build