From aecab758507ca9fbe34e31c65c48852fb8ad768a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 25 Apr 2022 00:56:32 +0200 Subject: [PATCH] Update to upstream version 3.3.0 --- .gitignore | 1 + ...0001-Port-tests-to-maven-model-3.6.X.patch | 8 ++-- maven-dependency-plugin.spec | 42 ++++++++----------- sources | 2 +- 4 files changed, 24 insertions(+), 29 deletions(-) rename 0000-Port-tests-to-maven-model-3.6.X.patch => 0001-Port-tests-to-maven-model-3.6.X.patch (94%) diff --git a/.gitignore b/.gitignore index cf0a0ae..a9b248b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /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 diff --git a/0000-Port-tests-to-maven-model-3.6.X.patch b/0001-Port-tests-to-maven-model-3.6.X.patch similarity index 94% rename from 0000-Port-tests-to-maven-model-3.6.X.patch rename to 0001-Port-tests-to-maven-model-3.6.X.patch index 58db4a0..414bab8 100644 --- a/0000-Port-tests-to-maven-model-3.6.X.patch +++ b/0001-Port-tests-to-maven-model-3.6.X.patch @@ -1,4 +1,4 @@ -From aaf7866aa8fcf1c7785f0aa875527c9b05a0e4e3 Mon Sep 17 00:00:00 2001 +From eba97b2aff5bff0b67e62c1ffd87e02ccf28a7f2 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 25 Aug 2020 12:12:09 +0200 Subject: [PATCH] Port tests to maven model 3.6.X @@ -8,10 +8,10 @@ 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 268ac1d..a54123c 100644 +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 -@@ -117,33 +117,42 @@ public class TestAnalyzeDepMgt +@@ -119,33 +119,42 @@ public class TestAnalyzeDepMgt // sure it's ok before // testing the next one dep.setType( "t" ); @@ -55,5 +55,5 @@ index 268ac1d..a54123c 100644 } -- -2.26.2 +2.35.1 diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index 102ed41..0138116 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: maven-dependency-plugin -Version: 3.1.2 -Release: 9%{?dist} +Version: 3.3.0 +Release: 1%{?dist} Summary: Plugin to manipulate, copy and unpack local and remote artifacts License: ASL 2.0 URL: https://maven.apache.org/plugins/%{name} @@ -10,36 +10,36 @@ BuildArch: noarch Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch0: 0000-Port-tests-to-maven-model-3.6.X.patch +Patch0: 0001-Port-tests-to-maven-model-3.6.X.patch BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: mvn(classworlds:classworlds) +BuildRequires: mvn(commons-beanutils:commons-beanutils) BuildRequires: mvn(commons-collections:commons-collections) -BuildRequires: mvn(junit:junit) 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:) -BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) -BuildRequires: mvn(org.apache.maven.shared:file-management) BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer) BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-dependency-analyzer) BuildRequires: mvn(org.apache.maven.shared:maven-dependency-tree) BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) +BuildRequires: mvn(org.apache.maven:maven-aether-provider) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-repository-metadata) +BuildRequires: mvn(org.apache.maven:maven-settings) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) -BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) BuildRequires: mvn(org.codehaus.plexus:plexus-io) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.eclipse.aether:aether-api) +BuildRequires: mvn(org.eclipse.aether:aether-connector-wagon) +BuildRequires: mvn(org.eclipse.aether:aether-util) %endif %description @@ -59,28 +59,20 @@ Summary: API documentation for %{name} %pom_remove_plugin :maven-enforcer-plugin -# We don't want to support legacy Maven versions (older than 3.1) -%pom_remove_dep org.sonatype.aether: - # Not actually needed %pom_remove_dep :wagon-http-lightweight -# Port to apache-commons-lang3 -%pom_change_dep commons-lang:commons-lang org.apache.commons:commons-lang3 -find . -name '*.java' -exec sed -i 's/org\.apache\.commons\.lang/org.apache.commons.lang3/' {} + - -%pom_remove_dep :maven-reporting-api %pom_remove_dep :maven-reporting-impl %pom_remove_dep :commons-io -%pom_remove_dep :doxia-core -%pom_remove_dep :doxia-sink-api -%pom_remove_dep :doxia-site-renderer %pom_remove_dep :jetty-server -%pom_remove_dep :jetty-servlet -%pom_remove_dep :jetty-webapp +%pom_remove_dep :jetty-util +%pom_remove_dep :jetty-security %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 + # Tests which require eclipse rm src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java rm -r src/test/java/org/apache/maven/plugins/dependency/fromDependencies @@ -92,8 +84,7 @@ rm src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReport{Mojo, sed -i '/doSpecialTest( "analyze-report" );/d' src/test/java/org/apache/maven/plugins/dependency/TestSkip.java %build -# Tests require legacy Maven -%mvn_build +%mvn_build -f %install %mvn_install @@ -105,6 +96,9 @@ sed -i '/doSpecialTest( "analyze-report" );/d' src/test/java/org/apache/maven/pl %doc LICENSE NOTICE %changelog +* Sun Apr 24 2022 Mikolaj Izdebski - 3.3.0-1 +- Update to upstream version 3.3.0 + * Sat Feb 05 2022 Jiri Vanek - 3.1.2-9 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index e36df25..9f82e10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-dependency-plugin-3.1.2-source-release.zip) = e06c1696842682e599c2b7e6a24c58ac0c01ae0d5bf57fcc7269a7fd11092143c598fa82f908ee181d905cb949f44515e14b7b899e5df1aa184d68d2d308f83f +SHA512 (maven-dependency-plugin-3.3.0-source-release.zip) = b0c650fa440078fcc63c7af70219e937be92ed16aeb6c12057e43c66e605c0d3c31f8f681b014fc0adffe1e20d5a73c5e4bbedc9c70d91637f7d85ea4d60c27c