Update to upstream version 3.6.0

.gitignore

@@ -18,3 +18,4 @@
 /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-3.6.0-source-release.zip

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

@@ -8,52 +8,52 @@ Subject: [PATCH] Port tests to maven model 3.6.X
  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
+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
-@@ -119,33 +119,42 @@ public class TestAnalyzeDepMgt
+@@ -111,33 +111,42 @@ public class TestAnalyzeDepMgt extends TestCase {
          // sure it's ok before
          // testing the next one
-         dep.setType( "t" );
+         dep.setType("t");
 +        dep.clearManagementKey();
-         assertNotEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+         assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
  
-         dep.setType( "type" );
+         dep.setType("type");
 +        dep.clearManagementKey();
-         assertEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+         assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
  
-         dep.setArtifactId( "a" );
+         dep.setArtifactId("a");
 +        dep.clearManagementKey();
-         assertNotEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+         assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
  
-         dep.setArtifactId( "artifact" );
+         dep.setArtifactId("artifact");
 +        dep.clearManagementKey();
-         assertEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+         assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
  
-         dep.setClassifier( "c" );
+         dep.setClassifier("c");
 +        dep.clearManagementKey();
-         assertNotEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+         assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
  
-         dep.setClassifier( "class" );
+         dep.setClassifier("class");
 +        dep.clearManagementKey();
-         assertEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+         assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
  
-         dep.setGroupId( "g" );
+         dep.setGroupId("g");
 +        dep.clearManagementKey();
-         assertNotEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+         assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
  
-         dep.setGroupId( "group" );
+         dep.setGroupId("group");
-         dep.setClassifier( null );
+         dep.setClassifier(null);
-         artifact = stubFactory.createArtifact( "group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", null );
+         artifact = stubFactory.createArtifact("group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", null);
 +        dep.clearManagementKey();
-         assertEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+         assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
  
-         dep.setClassifier( "" );
+         dep.setClassifier("");
-         artifact = stubFactory.createArtifact( "group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", "" );
+         artifact = stubFactory.createArtifact("group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", "");
 +        dep.clearManagementKey();
-         assertEquals( dep.getManagementKey(), mojo.getArtifactManagementKey( artifact ) );
+         assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
      }
  
 -- 
-2.35.1
+2.41.0
 

maven-dependency-plugin.spec

@@ -1,8 +1,8 @@
 %bcond_with bootstrap
 
 Name:           maven-dependency-plugin
-Version:        3.3.0
+Version:        3.6.0
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Plugin to manipulate, copy and unpack local and remote artifacts
 License:        Apache-2.0
 URL:            https://maven.apache.org/plugins/%{name}
@@ -17,7 +17,6 @@ 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)
@@ -39,8 +38,9 @@ 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
@@ -56,12 +56,8 @@ Summary:        API documentation for %{name}
 
 %prep
 %setup -q
-%patch0 -p1
+find src -name '*.java' -exec sed -i 's/\r//' {} +
-
+%patch 0 -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
@@ -69,7 +65,10 @@ Summary:        API documentation for %{name}
 %pom_remove_dep :jetty-server
 %pom_remove_dep :jetty-util
 %pom_remove_dep :jetty-security
-%pom_remove_dep :maven-plugin-testing-tools
+
+%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_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
@@ -81,7 +80,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,View}.java
+rm src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReport{Mojo,Renderer}.java
 sed -i '/doSpecialTest( "analyze-report" );/d' src/test/java/org/apache/maven/plugins/dependency/TestSkip.java
 
 %build
@@ -97,6 +96,9 @@ sed -i '/doSpecialTest( "analyze-report" );/d' src/test/java/org/apache/maven/pl
 %doc LICENSE NOTICE
 
 %changelog
+* 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
 

sources

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