From 09bd64147a5c1f544e7a71387ada97bcdba56bb7 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 11 Sep 2019 12:17:34 +0200 Subject: [PATCH] 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)