From a80fc1e70d370c28ae8b9e73d27d9875e254581a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:48:42 +0000 Subject: [PATCH 01/13] Remove Group tags --- maven-dependency-plugin.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index 1640809..e9f1ad7 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -43,7 +43,6 @@ artifacts. It can copy and/or unpack artifacts from local or remote repositories to a specified location. %package javadoc -Group: Documentation Summary: API documentation for %{name} %description javadoc From 237168bd35c3fb50ac29c1daea25b1e0c9d1bc8e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 May 2019 08:26:50 +0200 Subject: [PATCH 02/13] Update to upstream version 3.1.1 --- .gitignore | 1 + maven-dependency-plugin.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6e0c5c2..fcc238b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ maven-dependency-plugin-2.2.tar.xz /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 diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index e9f1ad7..dbb794b 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -1,6 +1,6 @@ Name: maven-dependency-plugin -Version: 3.0.2 -Release: 2%{?dist} +Version: 3.1.1 +Release: 1%{?dist} Summary: Plugin to manipulate, copy and unpack local and remote artifacts License: ASL 2.0 URL: http://maven.apache.org/plugins/%{name} @@ -71,6 +71,9 @@ Summary: API documentation for %{name} %doc LICENSE NOTICE %changelog +* Tue May 14 2019 Mikolaj Izdebski - 3.1.1-1 +- Update to upstream version 3.1.1 + * Thu Feb 08 2018 Fedora Release Engineering - 3.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 3b62a64..cb32959 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-dependency-plugin-3.0.2-source-release.zip) = 8f3bdfaf71d18a1c03a593bf37b8b958d09ef52aa63a5b5ea6e874b02ffe1ff3a37a3eddea6717e4de1ef929ec2a55a02336e7ee05f5a7cff3bdf3050a45f6c5 +SHA512 (maven-dependency-plugin-3.1.1-source-release.zip) = b3315300afe59b5d1f297b52367c4a10e3cb349a0e27e112ebd217c5e252f326fdaa48406a8ba68da0538cacb24e56bb703e7f7a5e3ebecf2996c7e638fb9db8 From 94da6241ffed2cb98b1d59d7255bde09de1a9dc0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 15:01:55 +0200 Subject: [PATCH 03/13] Revert "Update to upstream version 3.1.1" This reverts commit 237168bd35c3fb50ac29c1daea25b1e0c9d1bc8e. --- .gitignore | 1 - maven-dependency-plugin.spec | 7 ++----- sources | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index fcc238b..6e0c5c2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,3 @@ maven-dependency-plugin-2.2.tar.xz /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 diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index dbb794b..e9f1ad7 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -1,6 +1,6 @@ Name: maven-dependency-plugin -Version: 3.1.1 -Release: 1%{?dist} +Version: 3.0.2 +Release: 2%{?dist} Summary: Plugin to manipulate, copy and unpack local and remote artifacts License: ASL 2.0 URL: http://maven.apache.org/plugins/%{name} @@ -71,9 +71,6 @@ Summary: API documentation for %{name} %doc LICENSE NOTICE %changelog -* Tue May 14 2019 Mikolaj Izdebski - 3.1.1-1 -- Update to upstream version 3.1.1 - * Thu Feb 08 2018 Fedora Release Engineering - 3.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index cb32959..3b62a64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-dependency-plugin-3.1.1-source-release.zip) = b3315300afe59b5d1f297b52367c4a10e3cb349a0e27e112ebd217c5e252f326fdaa48406a8ba68da0538cacb24e56bb703e7f7a5e3ebecf2996c7e638fb9db8 +SHA512 (maven-dependency-plugin-3.0.2-source-release.zip) = 8f3bdfaf71d18a1c03a593bf37b8b958d09ef52aa63a5b5ea6e874b02ffe1ff3a37a3eddea6717e4de1ef929ec2a55a02336e7ee05f5a7cff3bdf3050a45f6c5 From 4b509da21db26aae5ef2e5b04ebbca0ab90b5c76 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:02 +0200 Subject: [PATCH 04/13] Mass rebuild for javapackages-tools 201901 --- maven-dependency-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index e9f1ad7..cd56bdd 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -1,6 +1,6 @@ Name: maven-dependency-plugin Version: 3.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plugin to manipulate, copy and unpack local and remote artifacts License: ASL 2.0 URL: http://maven.apache.org/plugins/%{name} @@ -71,6 +71,9 @@ Summary: API documentation for %{name} %doc LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.0.2-3 +- Mass rebuild for javapackages-tools 201901 + * Thu Feb 08 2018 Fedora Release Engineering - 3.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 6a329dbccee6ed371ab6d516e281c050c00372c9 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 30 Oct 2018 17:20:02 +0100 Subject: [PATCH 05/13] Update to upstream version 3.1.1 --- .gitignore | 1 + maven-dependency-plugin.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6e0c5c2..fcc238b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ maven-dependency-plugin-2.2.tar.xz /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 diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index cd56bdd..9ffef77 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -1,6 +1,6 @@ Name: maven-dependency-plugin -Version: 3.0.2 -Release: 3%{?dist} +Version: 3.1.1 +Release: 1%{?dist} Summary: Plugin to manipulate, copy and unpack local and remote artifacts License: ASL 2.0 URL: http://maven.apache.org/plugins/%{name} @@ -71,6 +71,9 @@ Summary: API documentation for %{name} %doc LICENSE NOTICE %changelog +* Tue Jun 04 2019 Marian Koncek - 3.1.1-1 +- Update to upstream version 3.1.1 + * Fri May 24 2019 Mikolaj Izdebski - 3.0.2-3 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 3b62a64..cb32959 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-dependency-plugin-3.0.2-source-release.zip) = 8f3bdfaf71d18a1c03a593bf37b8b958d09ef52aa63a5b5ea6e874b02ffe1ff3a37a3eddea6717e4de1ef929ec2a55a02336e7ee05f5a7cff3bdf3050a45f6c5 +SHA512 (maven-dependency-plugin-3.1.1-source-release.zip) = b3315300afe59b5d1f297b52367c4a10e3cb349a0e27e112ebd217c5e252f326fdaa48406a8ba68da0538cacb24e56bb703e7f7a5e3ebecf2996c7e638fb9db8 From 478671dbca2c148ced9694a589cb6ddde572bfe0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 12:31:26 +0200 Subject: [PATCH 06/13] Remove BR on wagon-http-lightweight --- maven-dependency-plugin.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index 9ffef77..6a4b80d 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -15,14 +15,9 @@ BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) -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.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-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) BuildRequires: mvn(org.apache.maven.shared:file-management) @@ -30,7 +25,12 @@ 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.wagon:wagon-http-lightweight) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) +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.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.codehaus.plexus:plexus-io) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) @@ -57,6 +57,9 @@ Summary: API documentation for %{name} # 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 + %build # Tests require legacy Maven %mvn_build -f From 09bd64147a5c1f544e7a71387ada97bcdba56bb7 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 11 Sep 2019 12:17:34 +0200 Subject: [PATCH 07/13] Port to maven-artifact-transfer 0.11.0 --- ...de-maven-artifact-transfer-to-0.11.0.patch | 461 ++++++++++++++++++ maven-dependency-plugin.spec | 4 + 2 files changed, 465 insertions(+) create mode 100644 0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch diff --git a/0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch b/0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch new file mode 100644 index 0000000..d9088e3 --- /dev/null +++ b/0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch @@ -0,0 +1,461 @@ +From 8de4fc9f819388293b9e7b6113dbec57352e4761 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Wed, 11 Sep 2019 12:09:26 +0200 +Subject: [PATCH] [PATCH 05/10] [MDEP-625] - Upgrade maven-artifact-transfer to + 0.11.0 + +--- + .../maven/plugins/dependency/GetMojo.java | 16 +- + .../dependency/PurgeLocalRepositoryMojo.java | 17 +- + .../AbstractFromConfigurationMojo.java | 8 +- + .../fromConfiguration/ArtifactItem.java | 2 +- + .../AbstractDependencyFilterMojo.java | 10 +- + .../fromDependencies/BuildClasspathMojo.java | 28 ++-- + .../CopyDependenciesMojo.java | 8 +- + .../resolvers/AbstractResolveMojo.java | 6 +- + .../resolvers/ListRepositoriesMojo.java | 152 +++++++++--------- + .../resolvers/ResolvePluginsMojo.java | 6 +- + .../utils/translators/ArtifactTranslator.java | 2 +- + .../translators/ClassifierTypeTranslator.java | 4 +- + .../TestClassifierTypeTranslator.java | 4 +- + 13 files changed, 132 insertions(+), 131 deletions(-) + +diff --git a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java +index a734f94..d434e64 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java +@@ -41,14 +41,14 @@ import org.apache.maven.plugins.annotations.Mojo; + import org.apache.maven.plugins.annotations.Parameter; + import org.apache.maven.project.DefaultProjectBuildingRequest; + import org.apache.maven.project.ProjectBuildingRequest; +-import org.apache.maven.shared.artifact.ArtifactCoordinate; +-import org.apache.maven.shared.artifact.DefaultArtifactCoordinate; +-import org.apache.maven.shared.artifact.resolve.ArtifactResolver; +-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; +-import org.apache.maven.shared.dependencies.DefaultDependableCoordinate; +-import org.apache.maven.shared.dependencies.DependableCoordinate; +-import org.apache.maven.shared.dependencies.resolve.DependencyResolver; +-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; ++import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate; ++import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; ++import org.apache.maven.shared.transfer.dependencies.DefaultDependableCoordinate; ++import org.apache.maven.shared.transfer.dependencies.DependableCoordinate; ++import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver; ++import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException; + import org.codehaus.plexus.util.StringUtils; + + /** +diff --git a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java +index da2a11d..22f16f3 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java +@@ -39,16 +39,13 @@ import org.apache.maven.execution.MavenSession; + import org.apache.maven.model.Dependency; + import org.apache.maven.plugin.AbstractMojo; + import org.apache.maven.plugin.MojoExecution; ++import org.apache.maven.plugin.MojoExecution.Source; + import org.apache.maven.plugin.MojoExecutionException; + import org.apache.maven.plugin.MojoFailureException; +-import org.apache.maven.plugin.MojoExecution.Source; + import org.apache.maven.plugins.annotations.Component; + import org.apache.maven.plugins.annotations.Mojo; + import org.apache.maven.plugins.annotations.Parameter; + import org.apache.maven.project.MavenProject; +-import org.apache.maven.shared.dependencies.resolve.DependencyResolver; +-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; +-import org.apache.maven.shared.artifact.DefaultArtifactCoordinate; + import org.apache.maven.shared.artifact.filter.resolve.AbstractFilter; + import org.apache.maven.shared.artifact.filter.resolve.AndFilter; + import org.apache.maven.shared.artifact.filter.resolve.Node; +@@ -57,9 +54,13 @@ import org.apache.maven.shared.artifact.filter.resolve.PatternInclusionsFilter; + import org.apache.maven.shared.artifact.filter.resolve.ScopeFilter; + import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter; + import org.apache.maven.shared.artifact.filter.resolve.transform.ArtifactIncludeFilterTransformer; +-import org.apache.maven.shared.artifact.resolve.ArtifactResolver; +-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; +-import org.apache.maven.shared.artifact.resolve.ArtifactResult; ++import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate; ++import org.apache.maven.shared.transfer.artifact.TransferUtils; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult; ++import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver; ++import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException; + import org.codehaus.plexus.util.FileUtils; + import org.codehaus.plexus.util.StringUtils; + +@@ -666,7 +667,7 @@ public class PurgeLocalRepositoryMojo + { + //CHECKSTYLE_OFF: LineLength + artifactResolver.resolveArtifact( session.getProjectBuildingRequest(), +- org.apache.maven.shared.artifact.TransferUtils.toArtifactCoordinate( artifact ) ); ++ TransferUtils.toArtifactCoordinate( artifact ) ); + //CHECKSTYLE_ON: LineLength + } + catch ( ArtifactResolverException e ) +diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java +index 3bebdee..377923c 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java +@@ -36,11 +36,11 @@ import org.apache.maven.plugins.dependency.utils.DependencyUtil; + import org.apache.maven.plugins.dependency.utils.filters.ArtifactItemFilter; + import org.apache.maven.project.MavenProject; + import org.apache.maven.project.ProjectBuildingRequest; +-import org.apache.maven.shared.artifact.DefaultArtifactCoordinate; + import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException; +-import org.apache.maven.shared.repository.RepositoryManager; +-import org.apache.maven.shared.artifact.resolve.ArtifactResolver; +-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; ++import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; ++import org.apache.maven.shared.transfer.repository.RepositoryManager; + import org.codehaus.plexus.util.StringUtils; + + /** +diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java +index db215ce..2e978c3 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java +@@ -24,7 +24,7 @@ import java.io.File; + import org.apache.maven.artifact.Artifact; + import org.apache.maven.artifact.ArtifactUtils; + import org.apache.maven.plugins.dependency.utils.DependencyUtil; +-import org.apache.maven.shared.dependencies.DependableCoordinate; ++import org.apache.maven.shared.transfer.dependencies.DependableCoordinate; + import org.codehaus.plexus.util.StringUtils; + + /** +diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java +index ae68cb3..03c6c54 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java +@@ -39,7 +39,6 @@ import org.apache.maven.project.MavenProject; + import org.apache.maven.project.ProjectBuilder; + import org.apache.maven.project.ProjectBuildingException; + import org.apache.maven.project.ProjectBuildingRequest; +-import org.apache.maven.shared.artifact.ArtifactCoordinate; + import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException; + import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter; + import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; +@@ -49,10 +48,11 @@ import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter; + import org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter; + import org.apache.maven.shared.artifact.filter.collection.ScopeFilter; + import org.apache.maven.shared.artifact.filter.collection.TypeFilter; +-import org.apache.maven.shared.repository.RepositoryManager; +-import org.apache.maven.shared.artifact.resolve.ArtifactResolver; +-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; +-import org.apache.maven.shared.dependencies.resolve.DependencyResolver; ++import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; ++import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver; ++import org.apache.maven.shared.transfer.repository.RepositoryManager; + import org.codehaus.plexus.util.StringUtils; + + /** +diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java +index d6458b3..f0a7cfd 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java +@@ -19,20 +19,6 @@ package org.apache.maven.plugins.dependency.fromDependencies; + * under the License. + */ + +-import org.apache.maven.artifact.Artifact; +-import org.apache.maven.plugin.MojoExecutionException; +-import org.apache.maven.plugins.dependency.utils.DependencyUtil; +-import org.apache.maven.plugins.annotations.Component; +-import org.apache.maven.plugins.annotations.LifecyclePhase; +-import org.apache.maven.plugins.annotations.Mojo; +-import org.apache.maven.plugins.annotations.Parameter; +-import org.apache.maven.plugins.annotations.ResolutionScope; +-import org.apache.maven.project.MavenProjectHelper; +-import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; +-import org.apache.maven.shared.repository.RepositoryManager; +-import org.codehaus.plexus.util.IOUtil; +-import org.codehaus.plexus.util.StringUtils; +- + import java.io.BufferedReader; + import java.io.BufferedWriter; + import java.io.File; +@@ -48,6 +34,20 @@ import java.util.Set; + import java.util.regex.Matcher; + import java.util.regex.Pattern; + ++import org.apache.maven.artifact.Artifact; ++import org.apache.maven.plugin.MojoExecutionException; ++import org.apache.maven.plugins.annotations.Component; ++import org.apache.maven.plugins.annotations.LifecyclePhase; ++import org.apache.maven.plugins.annotations.Mojo; ++import org.apache.maven.plugins.annotations.Parameter; ++import org.apache.maven.plugins.annotations.ResolutionScope; ++import org.apache.maven.plugins.dependency.utils.DependencyUtil; ++import org.apache.maven.project.MavenProjectHelper; ++import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; ++import org.apache.maven.shared.transfer.repository.RepositoryManager; ++import org.codehaus.plexus.util.IOUtil; ++import org.codehaus.plexus.util.StringUtils; ++ + /** + * This goal will output a classpath string of dependencies from the local repository to a file or log. + * +diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java +index 239f1c9..ec0ae60 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java +@@ -31,11 +31,11 @@ import org.apache.maven.plugins.annotations.Mojo; + import org.apache.maven.plugins.annotations.Parameter; + import org.apache.maven.plugins.annotations.ResolutionScope; + import org.apache.maven.project.ProjectBuildingRequest; +-import org.apache.maven.shared.artifact.DefaultArtifactCoordinate; + import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; +-import org.apache.maven.shared.artifact.install.ArtifactInstaller; +-import org.apache.maven.shared.artifact.install.ArtifactInstallerException; +-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; ++import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate; ++import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller; ++import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; + + import java.io.File; + import java.util.Collections; +diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java +index 8e50105..6947b59 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java +@@ -34,9 +34,9 @@ import org.apache.maven.shared.artifact.filter.collection.ClassifierFilter; + import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts; + import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter; + import org.apache.maven.shared.artifact.filter.collection.TypeFilter; +-import org.apache.maven.shared.artifact.resolve.ArtifactResult; +-import org.apache.maven.shared.dependencies.DependableCoordinate; +-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult; ++import org.apache.maven.shared.transfer.dependencies.DependableCoordinate; ++import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException; + + /** + * @author Brian Fox +diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java +index b930c3f..d1e525a 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java +@@ -1,76 +1,76 @@ +-package org.apache.maven.plugins.dependency.resolvers; +- +-/* +- * Licensed to the Apache Software Foundation (ASF) under one +- * or more contributor license agreements. See the NOTICE file +- * distributed with this work for additional information +- * regarding copyright ownership. The ASF licenses this file +- * to you under the Apache License, Version 2.0 (the +- * "License"); you may not use this file except in compliance +- * with the License. You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, +- * software distributed under the License is distributed on an +- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +- * KIND, either express or implied. See the License for the +- * specific language governing permissions and limitations +- * under the License. +- */ +- +-import org.apache.maven.artifact.repository.ArtifactRepository; +-import org.apache.maven.plugin.MojoExecutionException; +-import org.apache.maven.plugins.dependency.AbstractDependencyMojo; +-import org.apache.maven.plugins.annotations.Component; +-import org.apache.maven.plugins.annotations.Mojo; +-import org.apache.maven.plugins.annotations.ResolutionScope; +-import org.apache.maven.shared.dependencies.collect.CollectorResult; +-import org.apache.maven.shared.dependencies.collect.DependencyCollector; +-import org.apache.maven.shared.dependencies.collect.DependencyCollectorException; +- +-/** +- * Goal that resolves all project dependencies and then lists the repositories used by the build and by the transitive +- * dependencies +- * +- * @author Brian Fox +- * @since 2.2 +- */ +-@Mojo( name = "list-repositories", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true ) +-public class ListRepositoriesMojo +- extends AbstractDependencyMojo +-{ +- /** +- * Dependency collector, needed to resolve dependencies. +- */ +- @Component( role = DependencyCollector.class ) +- private DependencyCollector dependencyCollector; +- +- /** +- * Displays a list of the repositories used by this build. +- * +- * @throws MojoExecutionException with a message if an error occurs. +- */ +- @Override +- protected void doExecute() +- throws MojoExecutionException +- { +- try +- { +- CollectorResult collectResult = +- dependencyCollector.collectDependencies( session.getProjectBuildingRequest(), getProject().getModel() ); +- +- this.getLog().info( "Repositories used by this build:" ); +- +- for ( ArtifactRepository repo : collectResult.getRemoteRepositories() ) +- { +- this.getLog().info( repo.toString() ); +- } +- } +- catch ( DependencyCollectorException e ) +- { +- throw new MojoExecutionException( "Unable to resolve artifacts", e ); +- } +- } +- +-} ++package org.apache.maven.plugins.dependency.resolvers; ++ ++/* ++ * Licensed to the Apache Software Foundation (ASF) under one ++ * or more contributor license agreements. See the NOTICE file ++ * distributed with this work for additional information ++ * regarding copyright ownership. The ASF licenses this file ++ * to you under the Apache License, Version 2.0 (the ++ * "License"); you may not use this file except in compliance ++ * with the License. You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, ++ * software distributed under the License is distributed on an ++ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ++ * KIND, either express or implied. See the License for the ++ * specific language governing permissions and limitations ++ * under the License. ++ */ ++ ++import org.apache.maven.artifact.repository.ArtifactRepository; ++import org.apache.maven.plugin.MojoExecutionException; ++import org.apache.maven.plugins.dependency.AbstractDependencyMojo; ++import org.apache.maven.plugins.annotations.Component; ++import org.apache.maven.plugins.annotations.Mojo; ++import org.apache.maven.plugins.annotations.ResolutionScope; ++import org.apache.maven.shared.transfer.dependencies.collect.CollectorResult; ++import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollector; ++import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException; ++ ++/** ++ * Goal that resolves all project dependencies and then lists the repositories used by the build and by the transitive ++ * dependencies ++ * ++ * @author Brian Fox ++ * @since 2.2 ++ */ ++@Mojo( name = "list-repositories", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true ) ++public class ListRepositoriesMojo ++ extends AbstractDependencyMojo ++{ ++ /** ++ * Dependency collector, needed to resolve dependencies. ++ */ ++ @Component( role = DependencyCollector.class ) ++ private DependencyCollector dependencyCollector; ++ ++ /** ++ * Displays a list of the repositories used by this build. ++ * ++ * @throws MojoExecutionException with a message if an error occurs. ++ */ ++ @Override ++ protected void doExecute() ++ throws MojoExecutionException ++ { ++ try ++ { ++ CollectorResult collectResult = ++ dependencyCollector.collectDependencies( session.getProjectBuildingRequest(), getProject().getModel() ); ++ ++ this.getLog().info( "Repositories used by this build:" ); ++ ++ for ( ArtifactRepository repo : collectResult.getRemoteRepositories() ) ++ { ++ this.getLog().info( repo.toString() ); ++ } ++ } ++ catch ( DependencyCollectorException e ) ++ { ++ throw new MojoExecutionException( "Unable to resolve artifacts", e ); ++ } ++ } ++ ++} +diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java +index c0aad2b..e7874ec 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java +@@ -36,9 +36,9 @@ import org.apache.maven.project.ProjectBuildingRequest; + import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException; + import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; + import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts; +-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; +-import org.apache.maven.shared.dependencies.DefaultDependableCoordinate; +-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; ++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; ++import org.apache.maven.shared.transfer.dependencies.DefaultDependableCoordinate; ++import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException; + + /** + * Goal that resolves all project plugins and reports and their dependencies. +diff --git a/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java b/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java +index c51d9fc..ec9f6d5 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java +@@ -23,7 +23,7 @@ import java.util.Set; + + import org.apache.maven.artifact.Artifact; + import org.apache.maven.plugin.logging.Log; +-import org.apache.maven.shared.artifact.ArtifactCoordinate; ++import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate; + + /** + * @author Brian Fox +diff --git a/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java b/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java +index f31f523..41f51bc 100644 +--- a/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java ++++ b/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java +@@ -26,8 +26,8 @@ import org.apache.maven.artifact.Artifact; + import org.apache.maven.artifact.handler.ArtifactHandler; + import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; + import org.apache.maven.plugin.logging.Log; +-import org.apache.maven.shared.artifact.ArtifactCoordinate; +-import org.apache.maven.shared.artifact.DefaultArtifactCoordinate; ++import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate; ++import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate; + import org.codehaus.plexus.util.StringUtils; + + /** +diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java +index cec0197..add9dd3 100644 +--- a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java ++++ b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java +@@ -38,8 +38,8 @@ import org.apache.maven.plugin.testing.stubs.StubArtifactRepository; + import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase; + import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory; + import org.apache.maven.project.ProjectBuildingRequest; +-import org.apache.maven.shared.artifact.ArtifactCoordinate; +-import org.apache.maven.shared.repository.RepositoryManager; ++import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate; ++import org.apache.maven.shared.transfer.repository.RepositoryManager; + import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager; + import org.sonatype.aether.util.DefaultRepositorySystemSession; + +-- +2.21.0 + diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index 6a4b80d..9897e25 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -8,6 +8,8 @@ BuildArch: noarch Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip +Patch0: 0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch + BuildRequires: maven-local BuildRequires: mvn(classworlds:classworlds) BuildRequires: mvn(commons-collections:commons-collections) @@ -52,6 +54,8 @@ Summary: API documentation for %{name} %prep %setup -q +%patch0 -p1 + %pom_remove_plugin :maven-enforcer-plugin # We don't want to support legacy Maven versions (older than 3.1) From 6787523ab8517be06ee94e3950a44c52d8447e88 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 31 Oct 2019 15:49:38 +0100 Subject: [PATCH 08/13] Port to apache-commons-lang3 --- maven-dependency-plugin.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index 9897e25..a4b6281 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -14,7 +14,7 @@ BuildRequires: maven-local BuildRequires: mvn(classworlds:classworlds) BuildRequires: mvn(commons-collections:commons-collections) BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(commons-lang:commons-lang) +BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) @@ -64,6 +64,10 @@ Summary: API documentation for %{name} # 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/' {} + + %build # Tests require legacy Maven %mvn_build -f From e6b3a71c8dfc4e33359d2acec01b189c5532ad46 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 09/13] Mass rebuild for javapackages-tools 201902 --- maven-dependency-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index a4b6281..f360eb3 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -1,6 +1,6 @@ Name: maven-dependency-plugin Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plugin to manipulate, copy and unpack local and remote artifacts License: ASL 2.0 URL: http://maven.apache.org/plugins/%{name} @@ -82,6 +82,9 @@ find . -name '*.java' -exec sed -i 's/org\.apache\.commons\.lang/org.apache.comm %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.1.1-2 +- Mass rebuild for javapackages-tools 201902 + * Tue Jun 04 2019 Marian Koncek - 3.1.1-1 - Update to upstream version 3.1.1 From d77b0399bba3323db5978e1db26404450066875a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 27 Apr 2020 12:38:26 +0200 Subject: [PATCH 10/13] Remove reporting MOJO --- maven-dependency-plugin.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index f360eb3..1093c7d 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -13,15 +13,10 @@ Patch0: 0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch BuildRequires: maven-local BuildRequires: mvn(classworlds:classworlds) BuildRequires: mvn(commons-collections:commons-collections) -BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) -BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) 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.reporting:maven-reporting-api) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) 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) @@ -68,6 +63,14 @@ Summary: API documentation for %{name} %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-sink-api +%pom_remove_dep :doxia-site-renderer + +rm src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReport{Mojo,View}.java + %build # Tests require legacy Maven %mvn_build -f From 6cc7dfa6c07c5dc7b04b92d3689200786ac16782 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 25 Aug 2020 12:30:27 +0200 Subject: [PATCH 11/13] Update to upstream version 3.1.2 --- .gitignore | 1 + 0000-Port-tests-to-maven-model-3.6.X.patch | 59 +++ ...de-maven-artifact-transfer-to-0.11.0.patch | 461 ------------------ maven-dependency-plugin.spec | 37 +- sources | 2 +- 5 files changed, 88 insertions(+), 472 deletions(-) create mode 100644 0000-Port-tests-to-maven-model-3.6.X.patch delete mode 100644 0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch diff --git a/.gitignore b/.gitignore index fcc238b..a5690dc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ maven-dependency-plugin-2.2.tar.xz /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 diff --git a/0000-Port-tests-to-maven-model-3.6.X.patch b/0000-Port-tests-to-maven-model-3.6.X.patch new file mode 100644 index 0000000..58db4a0 --- /dev/null +++ b/0000-Port-tests-to-maven-model-3.6.X.patch @@ -0,0 +1,59 @@ +From aaf7866aa8fcf1c7785f0aa875527c9b05a0e4e3 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 + +--- + .../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 268ac1d..a54123c 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 + // 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.26.2 + diff --git a/0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch b/0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch deleted file mode 100644 index d9088e3..0000000 --- a/0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch +++ /dev/null @@ -1,461 +0,0 @@ -From 8de4fc9f819388293b9e7b6113dbec57352e4761 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Wed, 11 Sep 2019 12:09:26 +0200 -Subject: [PATCH] [PATCH 05/10] [MDEP-625] - Upgrade maven-artifact-transfer to - 0.11.0 - ---- - .../maven/plugins/dependency/GetMojo.java | 16 +- - .../dependency/PurgeLocalRepositoryMojo.java | 17 +- - .../AbstractFromConfigurationMojo.java | 8 +- - .../fromConfiguration/ArtifactItem.java | 2 +- - .../AbstractDependencyFilterMojo.java | 10 +- - .../fromDependencies/BuildClasspathMojo.java | 28 ++-- - .../CopyDependenciesMojo.java | 8 +- - .../resolvers/AbstractResolveMojo.java | 6 +- - .../resolvers/ListRepositoriesMojo.java | 152 +++++++++--------- - .../resolvers/ResolvePluginsMojo.java | 6 +- - .../utils/translators/ArtifactTranslator.java | 2 +- - .../translators/ClassifierTypeTranslator.java | 4 +- - .../TestClassifierTypeTranslator.java | 4 +- - 13 files changed, 132 insertions(+), 131 deletions(-) - -diff --git a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java -index a734f94..d434e64 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java -@@ -41,14 +41,14 @@ import org.apache.maven.plugins.annotations.Mojo; - import org.apache.maven.plugins.annotations.Parameter; - import org.apache.maven.project.DefaultProjectBuildingRequest; - import org.apache.maven.project.ProjectBuildingRequest; --import org.apache.maven.shared.artifact.ArtifactCoordinate; --import org.apache.maven.shared.artifact.DefaultArtifactCoordinate; --import org.apache.maven.shared.artifact.resolve.ArtifactResolver; --import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; --import org.apache.maven.shared.dependencies.DefaultDependableCoordinate; --import org.apache.maven.shared.dependencies.DependableCoordinate; --import org.apache.maven.shared.dependencies.resolve.DependencyResolver; --import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; -+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate; -+import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; -+import org.apache.maven.shared.transfer.dependencies.DefaultDependableCoordinate; -+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate; -+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver; -+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException; - import org.codehaus.plexus.util.StringUtils; - - /** -diff --git a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java -index da2a11d..22f16f3 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java -@@ -39,16 +39,13 @@ import org.apache.maven.execution.MavenSession; - import org.apache.maven.model.Dependency; - import org.apache.maven.plugin.AbstractMojo; - import org.apache.maven.plugin.MojoExecution; -+import org.apache.maven.plugin.MojoExecution.Source; - import org.apache.maven.plugin.MojoExecutionException; - import org.apache.maven.plugin.MojoFailureException; --import org.apache.maven.plugin.MojoExecution.Source; - import org.apache.maven.plugins.annotations.Component; - import org.apache.maven.plugins.annotations.Mojo; - import org.apache.maven.plugins.annotations.Parameter; - import org.apache.maven.project.MavenProject; --import org.apache.maven.shared.dependencies.resolve.DependencyResolver; --import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; --import org.apache.maven.shared.artifact.DefaultArtifactCoordinate; - import org.apache.maven.shared.artifact.filter.resolve.AbstractFilter; - import org.apache.maven.shared.artifact.filter.resolve.AndFilter; - import org.apache.maven.shared.artifact.filter.resolve.Node; -@@ -57,9 +54,13 @@ import org.apache.maven.shared.artifact.filter.resolve.PatternInclusionsFilter; - import org.apache.maven.shared.artifact.filter.resolve.ScopeFilter; - import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter; - import org.apache.maven.shared.artifact.filter.resolve.transform.ArtifactIncludeFilterTransformer; --import org.apache.maven.shared.artifact.resolve.ArtifactResolver; --import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; --import org.apache.maven.shared.artifact.resolve.ArtifactResult; -+import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate; -+import org.apache.maven.shared.transfer.artifact.TransferUtils; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult; -+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver; -+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException; - import org.codehaus.plexus.util.FileUtils; - import org.codehaus.plexus.util.StringUtils; - -@@ -666,7 +667,7 @@ public class PurgeLocalRepositoryMojo - { - //CHECKSTYLE_OFF: LineLength - artifactResolver.resolveArtifact( session.getProjectBuildingRequest(), -- org.apache.maven.shared.artifact.TransferUtils.toArtifactCoordinate( artifact ) ); -+ TransferUtils.toArtifactCoordinate( artifact ) ); - //CHECKSTYLE_ON: LineLength - } - catch ( ArtifactResolverException e ) -diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java -index 3bebdee..377923c 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java -@@ -36,11 +36,11 @@ import org.apache.maven.plugins.dependency.utils.DependencyUtil; - import org.apache.maven.plugins.dependency.utils.filters.ArtifactItemFilter; - import org.apache.maven.project.MavenProject; - import org.apache.maven.project.ProjectBuildingRequest; --import org.apache.maven.shared.artifact.DefaultArtifactCoordinate; - import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException; --import org.apache.maven.shared.repository.RepositoryManager; --import org.apache.maven.shared.artifact.resolve.ArtifactResolver; --import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; -+import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; -+import org.apache.maven.shared.transfer.repository.RepositoryManager; - import org.codehaus.plexus.util.StringUtils; - - /** -diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java -index db215ce..2e978c3 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java -@@ -24,7 +24,7 @@ import java.io.File; - import org.apache.maven.artifact.Artifact; - import org.apache.maven.artifact.ArtifactUtils; - import org.apache.maven.plugins.dependency.utils.DependencyUtil; --import org.apache.maven.shared.dependencies.DependableCoordinate; -+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate; - import org.codehaus.plexus.util.StringUtils; - - /** -diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java -index ae68cb3..03c6c54 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java -@@ -39,7 +39,6 @@ import org.apache.maven.project.MavenProject; - import org.apache.maven.project.ProjectBuilder; - import org.apache.maven.project.ProjectBuildingException; - import org.apache.maven.project.ProjectBuildingRequest; --import org.apache.maven.shared.artifact.ArtifactCoordinate; - import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException; - import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter; - import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; -@@ -49,10 +48,11 @@ import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter; - import org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter; - import org.apache.maven.shared.artifact.filter.collection.ScopeFilter; - import org.apache.maven.shared.artifact.filter.collection.TypeFilter; --import org.apache.maven.shared.repository.RepositoryManager; --import org.apache.maven.shared.artifact.resolve.ArtifactResolver; --import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; --import org.apache.maven.shared.dependencies.resolve.DependencyResolver; -+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; -+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver; -+import org.apache.maven.shared.transfer.repository.RepositoryManager; - import org.codehaus.plexus.util.StringUtils; - - /** -diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java -index d6458b3..f0a7cfd 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java -@@ -19,20 +19,6 @@ package org.apache.maven.plugins.dependency.fromDependencies; - * under the License. - */ - --import org.apache.maven.artifact.Artifact; --import org.apache.maven.plugin.MojoExecutionException; --import org.apache.maven.plugins.dependency.utils.DependencyUtil; --import org.apache.maven.plugins.annotations.Component; --import org.apache.maven.plugins.annotations.LifecyclePhase; --import org.apache.maven.plugins.annotations.Mojo; --import org.apache.maven.plugins.annotations.Parameter; --import org.apache.maven.plugins.annotations.ResolutionScope; --import org.apache.maven.project.MavenProjectHelper; --import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; --import org.apache.maven.shared.repository.RepositoryManager; --import org.codehaus.plexus.util.IOUtil; --import org.codehaus.plexus.util.StringUtils; -- - import java.io.BufferedReader; - import java.io.BufferedWriter; - import java.io.File; -@@ -48,6 +34,20 @@ import java.util.Set; - import java.util.regex.Matcher; - import java.util.regex.Pattern; - -+import org.apache.maven.artifact.Artifact; -+import org.apache.maven.plugin.MojoExecutionException; -+import org.apache.maven.plugins.annotations.Component; -+import org.apache.maven.plugins.annotations.LifecyclePhase; -+import org.apache.maven.plugins.annotations.Mojo; -+import org.apache.maven.plugins.annotations.Parameter; -+import org.apache.maven.plugins.annotations.ResolutionScope; -+import org.apache.maven.plugins.dependency.utils.DependencyUtil; -+import org.apache.maven.project.MavenProjectHelper; -+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; -+import org.apache.maven.shared.transfer.repository.RepositoryManager; -+import org.codehaus.plexus.util.IOUtil; -+import org.codehaus.plexus.util.StringUtils; -+ - /** - * This goal will output a classpath string of dependencies from the local repository to a file or log. - * -diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java -index 239f1c9..ec0ae60 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java -@@ -31,11 +31,11 @@ import org.apache.maven.plugins.annotations.Mojo; - import org.apache.maven.plugins.annotations.Parameter; - import org.apache.maven.plugins.annotations.ResolutionScope; - import org.apache.maven.project.ProjectBuildingRequest; --import org.apache.maven.shared.artifact.DefaultArtifactCoordinate; - import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; --import org.apache.maven.shared.artifact.install.ArtifactInstaller; --import org.apache.maven.shared.artifact.install.ArtifactInstallerException; --import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; -+import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate; -+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller; -+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; - - import java.io.File; - import java.util.Collections; -diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java -index 8e50105..6947b59 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java -@@ -34,9 +34,9 @@ import org.apache.maven.shared.artifact.filter.collection.ClassifierFilter; - import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts; - import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter; - import org.apache.maven.shared.artifact.filter.collection.TypeFilter; --import org.apache.maven.shared.artifact.resolve.ArtifactResult; --import org.apache.maven.shared.dependencies.DependableCoordinate; --import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult; -+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate; -+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException; - - /** - * @author Brian Fox -diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java -index b930c3f..d1e525a 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java -@@ -1,76 +1,76 @@ --package org.apache.maven.plugins.dependency.resolvers; -- --/* -- * Licensed to the Apache Software Foundation (ASF) under one -- * or more contributor license agreements. See the NOTICE file -- * distributed with this work for additional information -- * regarding copyright ownership. The ASF licenses this file -- * to you under the Apache License, Version 2.0 (the -- * "License"); you may not use this file except in compliance -- * with the License. You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, -- * software distributed under the License is distributed on an -- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -- * KIND, either express or implied. See the License for the -- * specific language governing permissions and limitations -- * under the License. -- */ -- --import org.apache.maven.artifact.repository.ArtifactRepository; --import org.apache.maven.plugin.MojoExecutionException; --import org.apache.maven.plugins.dependency.AbstractDependencyMojo; --import org.apache.maven.plugins.annotations.Component; --import org.apache.maven.plugins.annotations.Mojo; --import org.apache.maven.plugins.annotations.ResolutionScope; --import org.apache.maven.shared.dependencies.collect.CollectorResult; --import org.apache.maven.shared.dependencies.collect.DependencyCollector; --import org.apache.maven.shared.dependencies.collect.DependencyCollectorException; -- --/** -- * Goal that resolves all project dependencies and then lists the repositories used by the build and by the transitive -- * dependencies -- * -- * @author Brian Fox -- * @since 2.2 -- */ --@Mojo( name = "list-repositories", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true ) --public class ListRepositoriesMojo -- extends AbstractDependencyMojo --{ -- /** -- * Dependency collector, needed to resolve dependencies. -- */ -- @Component( role = DependencyCollector.class ) -- private DependencyCollector dependencyCollector; -- -- /** -- * Displays a list of the repositories used by this build. -- * -- * @throws MojoExecutionException with a message if an error occurs. -- */ -- @Override -- protected void doExecute() -- throws MojoExecutionException -- { -- try -- { -- CollectorResult collectResult = -- dependencyCollector.collectDependencies( session.getProjectBuildingRequest(), getProject().getModel() ); -- -- this.getLog().info( "Repositories used by this build:" ); -- -- for ( ArtifactRepository repo : collectResult.getRemoteRepositories() ) -- { -- this.getLog().info( repo.toString() ); -- } -- } -- catch ( DependencyCollectorException e ) -- { -- throw new MojoExecutionException( "Unable to resolve artifacts", e ); -- } -- } -- --} -+package org.apache.maven.plugins.dependency.resolvers; -+ -+/* -+ * Licensed to the Apache Software Foundation (ASF) under one -+ * or more contributor license agreements. See the NOTICE file -+ * distributed with this work for additional information -+ * regarding copyright ownership. The ASF licenses this file -+ * to you under the Apache License, Version 2.0 (the -+ * "License"); you may not use this file except in compliance -+ * with the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, -+ * software distributed under the License is distributed on an -+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -+ * KIND, either express or implied. See the License for the -+ * specific language governing permissions and limitations -+ * under the License. -+ */ -+ -+import org.apache.maven.artifact.repository.ArtifactRepository; -+import org.apache.maven.plugin.MojoExecutionException; -+import org.apache.maven.plugins.dependency.AbstractDependencyMojo; -+import org.apache.maven.plugins.annotations.Component; -+import org.apache.maven.plugins.annotations.Mojo; -+import org.apache.maven.plugins.annotations.ResolutionScope; -+import org.apache.maven.shared.transfer.dependencies.collect.CollectorResult; -+import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollector; -+import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException; -+ -+/** -+ * Goal that resolves all project dependencies and then lists the repositories used by the build and by the transitive -+ * dependencies -+ * -+ * @author Brian Fox -+ * @since 2.2 -+ */ -+@Mojo( name = "list-repositories", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true ) -+public class ListRepositoriesMojo -+ extends AbstractDependencyMojo -+{ -+ /** -+ * Dependency collector, needed to resolve dependencies. -+ */ -+ @Component( role = DependencyCollector.class ) -+ private DependencyCollector dependencyCollector; -+ -+ /** -+ * Displays a list of the repositories used by this build. -+ * -+ * @throws MojoExecutionException with a message if an error occurs. -+ */ -+ @Override -+ protected void doExecute() -+ throws MojoExecutionException -+ { -+ try -+ { -+ CollectorResult collectResult = -+ dependencyCollector.collectDependencies( session.getProjectBuildingRequest(), getProject().getModel() ); -+ -+ this.getLog().info( "Repositories used by this build:" ); -+ -+ for ( ArtifactRepository repo : collectResult.getRemoteRepositories() ) -+ { -+ this.getLog().info( repo.toString() ); -+ } -+ } -+ catch ( DependencyCollectorException e ) -+ { -+ throw new MojoExecutionException( "Unable to resolve artifacts", e ); -+ } -+ } -+ -+} -diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java -index c0aad2b..e7874ec 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java -@@ -36,9 +36,9 @@ import org.apache.maven.project.ProjectBuildingRequest; - import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException; - import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; - import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts; --import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; --import org.apache.maven.shared.dependencies.DefaultDependableCoordinate; --import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; -+import org.apache.maven.shared.transfer.dependencies.DefaultDependableCoordinate; -+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException; - - /** - * Goal that resolves all project plugins and reports and their dependencies. -diff --git a/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java b/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java -index c51d9fc..ec9f6d5 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java -@@ -23,7 +23,7 @@ import java.util.Set; - - import org.apache.maven.artifact.Artifact; - import org.apache.maven.plugin.logging.Log; --import org.apache.maven.shared.artifact.ArtifactCoordinate; -+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate; - - /** - * @author Brian Fox -diff --git a/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java b/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java -index f31f523..41f51bc 100644 ---- a/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java -+++ b/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java -@@ -26,8 +26,8 @@ import org.apache.maven.artifact.Artifact; - import org.apache.maven.artifact.handler.ArtifactHandler; - import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; - import org.apache.maven.plugin.logging.Log; --import org.apache.maven.shared.artifact.ArtifactCoordinate; --import org.apache.maven.shared.artifact.DefaultArtifactCoordinate; -+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate; -+import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate; - import org.codehaus.plexus.util.StringUtils; - - /** -diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java -index cec0197..add9dd3 100644 ---- a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java -+++ b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java -@@ -38,8 +38,8 @@ import org.apache.maven.plugin.testing.stubs.StubArtifactRepository; - import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase; - import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory; - import org.apache.maven.project.ProjectBuildingRequest; --import org.apache.maven.shared.artifact.ArtifactCoordinate; --import org.apache.maven.shared.repository.RepositoryManager; -+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate; -+import org.apache.maven.shared.transfer.repository.RepositoryManager; - import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager; - import org.sonatype.aether.util.DefaultRepositorySystemSession; - --- -2.21.0 - diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index 1093c7d..1bb9593 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -1,22 +1,24 @@ Name: maven-dependency-plugin -Version: 3.1.1 -Release: 2%{?dist} +Version: 3.1.2 +Release: 1%{?dist} Summary: Plugin to manipulate, copy and unpack local and remote artifacts License: ASL 2.0 -URL: http://maven.apache.org/plugins/%{name} +URL: https://maven.apache.org/plugins/%{name} BuildArch: noarch -Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch0: 0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch +Patch0: 0000-Port-tests-to-maven-model-3.6.X.patch BuildRequires: maven-local BuildRequires: mvn(classworlds:classworlds) 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) @@ -29,12 +31,12 @@ 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.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) %description - The dependency plugin provides the capability to manipulate artifacts. It can copy and/or unpack artifacts from local or remote repositories to a specified location. @@ -45,10 +47,8 @@ Summary: API documentation for %{name} %description javadoc %{summary}. - %prep %setup -q - %patch0 -p1 %pom_remove_plugin :maven-enforcer-plugin @@ -66,14 +66,28 @@ find . -name '*.java' -exec sed -i 's/org\.apache\.commons\.lang/org.apache.comm %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 :maven-plugin-testing-tools + +# 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 +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 +sed -i '/doSpecialTest( "analyze-report" );/d' src/test/java/org/apache/maven/plugins/dependency/TestSkip.java %build # Tests require legacy Maven -%mvn_build -f +%mvn_build %install %mvn_install @@ -85,6 +99,9 @@ rm src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReport{Mojo, %doc LICENSE NOTICE %changelog +* Tue Aug 25 2020 Marian Koncek - 3.1.2-1 +- Update to upstream version 3.1.2 + * Tue Nov 05 2019 Mikolaj Izdebski - 3.1.1-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index cb32959..e36df25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-dependency-plugin-3.1.1-source-release.zip) = b3315300afe59b5d1f297b52367c4a10e3cb349a0e27e112ebd217c5e252f326fdaa48406a8ba68da0538cacb24e56bb703e7f7a5e3ebecf2996c7e638fb9db8 +SHA512 (maven-dependency-plugin-3.1.2-source-release.zip) = e06c1696842682e599c2b7e6a24c58ac0c01ae0d5bf57fcc7269a7fd11092143c598fa82f908ee181d905cb949f44515e14b7b899e5df1aa184d68d2d308f83f From 1d73b3d7522b3448cc2187c649e2d973e4b6ff44 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 12/13] Conditionalize buildrequires in bootstrap mode --- maven-dependency-plugin.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index 1bb9593..3f8068e 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-dependency-plugin Version: 3.1.2 Release: 1%{?dist} @@ -11,6 +13,9 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/ Patch0: 0000-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-collections:commons-collections) BuildRequires: mvn(junit:junit) @@ -35,6 +40,7 @@ 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) +%endif %description The dependency plugin provides the capability to manipulate From a6abd8e475f334a78c8beb54f3be2a17ba642caa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 13/13] Turn off bootstrap mode by default --- maven-dependency-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index 3f8068e..4ef525f 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-dependency-plugin Version: 3.1.2