.gitignore

@@ -1 +1,20 @@
-SOURCES/maven-dependency-plugin-3.6.1-source-release.zip
+/results_*
+/*.src.rpm
+
+/maven-dependency-plugin-2.2.tar.xz
+/maven-dependency-plugin-2.2-source-release.zip
+/maven-dependency-plugin-2.3-source-release.zip
+/maven-dependency-plugin-2.4-source-release.zip
+/maven-dependency-plugin-2.6-source-release.zip
+/maven-dependency-plugin-2.7-source-release.zip
+/maven-dependency-plugin-2.8-source-release.zip
+/maven-dependency-plugin-2.9-source-release.zip
+/maven-dependency-plugin-2.10-source-release.zip
+/maven-dependency-plugin-3.0-SNAPSHOT-source-release.zip
+/maven-dependency-plugin-3.0.0-SNAPSHOT-source-release.zip
+/maven-dependency-plugin-3.0.0-source-release.zip
+/maven-dependency-plugin-3.0.1-source-release.zip
+/maven-dependency-plugin-3.0.2-source-release.zip
+/maven-dependency-plugin-3.1.1-source-release.zip
+/maven-dependency-plugin-3.1.2-source-release.zip
+/maven-dependency-plugin-3.3.0-source-release.zip

.maven-dependency-plugin.metadata

@@ -1 +0,0 @@
-b67c99a838890d59661d5fa000f0c95a0d8f1b81 SOURCES/maven-dependency-plugin-3.6.1-source-release.zip

0001-Port-tests-to-maven-model-3.6.X.patch

@@ -0,0 +1,59 @@
+From eba97b2aff5bff0b67e62c1ffd87e02ccf28a7f2 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Tue, 25 Aug 2020 12:12:09 +0200
+Subject: [PATCH] Port tests to maven model 3.6.X
+
+---
+ .../plugins/dependency/analyze/TestAnalyzeDepMgt.java    | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
+index d3392a2..5e80388 100644
+--- a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
++++ b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
+@@ -119,33 +119,42 @@ public class TestAnalyzeDepMgt
+         // sure it's ok before
+         // testing the next one
+         dep.setType( "t" );
++        dep.clearManagementKey();
+         assertNotEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+ 
+         dep.setType( "type" );
++        dep.clearManagementKey();
+         assertEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+ 
+         dep.setArtifactId( "a" );
++        dep.clearManagementKey();
+         assertNotEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+ 
+         dep.setArtifactId( "artifact" );
++        dep.clearManagementKey();
+         assertEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+ 
+         dep.setClassifier( "c" );
++        dep.clearManagementKey();
+         assertNotEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+ 
+         dep.setClassifier( "class" );
++        dep.clearManagementKey();
+         assertEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+ 
+         dep.setGroupId( "g" );
++        dep.clearManagementKey();
+         assertNotEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+ 
+         dep.setGroupId( "group" );
+         dep.setClassifier( null );
+         artifact = stubFactory.createArtifact( "group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", null );
++        dep.clearManagementKey();
+         assertEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+ 
+         dep.setClassifier( "" );
+         artifact = stubFactory.createArtifact( "group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", "" );
++        dep.clearManagementKey();
+         assertEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+     }
+ 
+-- 
+2.35.1
+

SOURCES/0001-Port-tests-to-maven-model-3.6.X.patch

@@ -1,59 +0,0 @@
-From eba97b2aff5bff0b67e62c1ffd87e02ccf28a7f2 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Tue, 25 Aug 2020 12:12:09 +0200
-Subject: [PATCH] Port tests to maven model 3.6.X
-
----
- .../plugins/dependency/analyze/TestAnalyzeDepMgt.java    | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
-index 4fa55a5..32915ba 100644
---- a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
-+++ b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
-@@ -111,33 +111,42 @@ public class TestAnalyzeDepMgt extends TestCase {
-         // sure it's ok before
-         // testing the next one
-         dep.setType("t");
-+        dep.clearManagementKey();
-         assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
- 
-         dep.setType("type");
-+        dep.clearManagementKey();
-         assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
- 
-         dep.setArtifactId("a");
-+        dep.clearManagementKey();
-         assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
- 
-         dep.setArtifactId("artifact");
-+        dep.clearManagementKey();
-         assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
- 
-         dep.setClassifier("c");
-+        dep.clearManagementKey();
-         assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
- 
-         dep.setClassifier("class");
-+        dep.clearManagementKey();
-         assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
- 
-         dep.setGroupId("g");
-+        dep.clearManagementKey();
-         assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
- 
-         dep.setGroupId("group");
-         dep.setClassifier(null);
-         artifact = stubFactory.createArtifact("group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", null);
-+        dep.clearManagementKey();
-         assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
- 
-         dep.setClassifier("");
-         artifact = stubFactory.createArtifact("group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", "");
-+        dep.clearManagementKey();
-         assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
-     }
- 
--- 
-2.41.0
-

maven-dependency-plugin.spec

@@ -1,10 +1,10 @@
 %bcond_with bootstrap
 
 Name:           maven-dependency-plugin
-Version:        3.6.1
-Release:        4%{?dist}
+Version:        3.3.0
+Release:        2%{?dist}
 Summary:        Plugin to manipulate, copy and unpack local and remote artifacts
-License:        Apache-2.0
+License:        ASL 2.0
 URL:            https://maven.apache.org/plugins/%{name}
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
@@ -17,7 +17,9 @@ Patch0:         0001-Port-tests-to-maven-model-3.6.X.patch
 BuildRequires:  javapackages-bootstrap
 %else
 BuildRequires:  maven-local
+BuildRequires:  mvn(commons-beanutils:commons-beanutils)
 BuildRequires:  mvn(commons-collections:commons-collections)
+BuildRequires:  mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
@@ -37,9 +39,8 @@ BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-io)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.eclipse.aether:aether-api)
+BuildRequires:  mvn(org.eclipse.aether:aether-connector-wagon)
 BuildRequires:  mvn(org.eclipse.aether:aether-util)
-BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
-BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
 %endif
 
 %description
@@ -55,8 +56,12 @@ Summary:        API documentation for %{name}
 
 %prep
 %setup -q
-find src -name '*.java' -exec sed -i 's/\r//' {} +
-%patch 0 -p1
+%patch0 -p1
+
+%pom_remove_plugin :maven-enforcer-plugin
+
+# Not actually needed
+%pom_remove_dep :wagon-http-lightweight
 
 %pom_remove_dep :maven-reporting-impl
 %pom_remove_dep :commons-io
@@ -64,10 +69,7 @@ find src -name '*.java' -exec sed -i 's/\r//' {} +
 %pom_remove_dep :jetty-server
 %pom_remove_dep :jetty-util
 %pom_remove_dep :jetty-security
-
-%pom_remove_dep org.apache.maven.doxia:doxia-sink-api
-%pom_remove_dep org.apache.maven.reporting:maven-reporting-api
-%pom_remove_dep org.codehaus.plexus:plexus-i18n
+%pom_remove_dep :maven-plugin-testing-tools
 
 %pom_change_dep :commons-collections4 commons-collections:commons-collections
 sed -i '/import org.apache.commons.collections4/s/4//' src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
@@ -79,7 +81,7 @@ rm -r src/test/java/org/apache/maven/plugins/dependency/fromConfiguration
 rm src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
 
 # Requires org.apache.maven.reporting
-rm src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReport{Mojo,Renderer}.java
+rm src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReport{Mojo,View}.java
 sed -i '/doSpecialTest( "analyze-report" );/d' src/test/java/org/apache/maven/plugins/dependency/TestSkip.java
 
 %build
@@ -95,37 +97,6 @@ sed -i '/doSpecialTest( "analyze-report" );/d' src/test/java/org/apache/maven/pl
 %doc LICENSE NOTICE
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.6.1-4
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.6.1-3
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.6.1-2
-- Bump release for June 2024 mass rebuild
-
-* Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.1-1
-- Update to upstream version 3.6.1
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.0-2
-- Rebuild
-
-* Tue Aug 15 2023 Marian Koncek <mkoncek@redhat.com> - 3.6.0-1
-- Update to upstream version 3.6.0
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

sources

@@ -0,0 +1 @@
+SHA512 (maven-dependency-plugin-3.3.0-source-release.zip) = b0c650fa440078fcc63c7af70219e937be92ed16aeb6c12057e43c66e605c0d3c31f8f681b014fc0adffe1e20d5a73c5e4bbedc9c70d91637f7d85ea4d60c27c