From 3064ceb7b6ba875182c799768c5f608e3eb5aa52 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 30 Jun 2022 19:12:15 +0000 Subject: [PATCH] import maven-dependency-plugin-3.1.1-2.module+el8.3.0+7256+fe62c937 --- .gitignore | 1 + .maven-dependency-plugin.metadata | 1 + ...de-maven-artifact-transfer-to-0.11.0.patch | 461 ++++++++++++++++++ SPECS/maven-dependency-plugin.spec | 198 ++++++++ 4 files changed, 661 insertions(+) create mode 100644 .gitignore create mode 100644 .maven-dependency-plugin.metadata create mode 100644 SOURCES/0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch create mode 100644 SPECS/maven-dependency-plugin.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d60f7c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-dependency-plugin-3.1.1-source-release.zip diff --git a/.maven-dependency-plugin.metadata b/.maven-dependency-plugin.metadata new file mode 100644 index 0000000..8f33009 --- /dev/null +++ b/.maven-dependency-plugin.metadata @@ -0,0 +1 @@ +b0df263c6ff7feee141ca5f6b0172795952d2a5c SOURCES/maven-dependency-plugin-3.1.1-source-release.zip diff --git a/SOURCES/0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch b/SOURCES/0000-Upgrade-maven-artifact-transfer-to-0.11.0.patch new file mode 100644 index 0000000..d9088e3 --- /dev/null +++ b/SOURCES/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/SPECS/maven-dependency-plugin.spec b/SPECS/maven-dependency-plugin.spec new file mode 100644 index 0000000..f360eb3 --- /dev/null +++ b/SPECS/maven-dependency-plugin.spec @@ -0,0 +1,198 @@ +Name: maven-dependency-plugin +Version: 3.1.1 +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} +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) +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) +BuildRequires: mvn(org.apache.maven.shared:maven-dependency-analyzer) +BuildRequires: mvn(org.apache.maven.shared:maven-dependency-tree) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) +BuildRequires: mvn(org.apache.maven:maven-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) + + +%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. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +%{summary}. + + +%prep +%setup -q + +%patch0 -p1 + +%pom_remove_plugin :maven-enforcer-plugin + +# We don't want to support legacy Maven versions (older than 3.1) +%pom_remove_dep org.sonatype.aether: + +# Not actually needed +%pom_remove_dep :wagon-http-lightweight + +# Port to apache-commons-lang3 +%pom_change_dep commons-lang:commons-lang org.apache.commons:commons-lang3 +find . -name '*.java' -exec sed -i 's/org\.apache\.commons\.lang/org.apache.commons.lang3/' {} + + +%build +# Tests require legacy Maven +%mvn_build -f + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%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 + +* 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 + +* Thu Sep 14 2017 Mikolaj Izdebski - 3.0.2-1 +- Update to upstream version 3.0.2 + +* Mon Sep 11 2017 Mikolaj Izdebski - 3.0.1-1 +- Update to upstream version 3.0.1 + +* Wed Jul 26 2017 Fedora Release Engineering - 3.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Dec 14 2016 Mikolaj Izdebski - 3.0.0-1 +- Update to upstream version 3.0.0 + +* Mon Nov 07 2016 Michael Simacek - 3.0.0-0.5.20160823svn1756544 +- Regenerate BuildRequires + +* Tue Aug 23 2016 Mikolaj Izdebski - 3.0.0-0.4.20160823svn1756544 +- Update to latest upstream snapshot + +* Thu Feb 04 2016 Fedora Release Engineering - 3.0-0.3.20160119svn1722372 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jan 19 2016 Mikolaj Izdebski - 3.0-0.2.20160119svn1722372 +- Update to latest upstream snapshot (svn revision 1722372) + +* Mon Oct 12 2015 Mikolaj Izdebski - 3.0-0.1.20151012svn1707940 +- Update to upstream 3.0 snapshot (svn revision 1707940) + +* Wed Jun 17 2015 Fedora Release Engineering - 2.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Feb 2 2015 Mikolaj Izdebski - 2.10-1 +- Update to upstream version 2.10 + +* Mon Sep 22 2014 Mikolaj Izdebski - 2.9-1 +- Update to upstream version 2.9 + +* Wed Jun 11 2014 Alexander Kurtakov 2.8-4 +- Fix building by dropping useless BRs. + +* Sat Jun 07 2014 Fedora Release Engineering - 2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 2.8-2 +- Use Requires: java-headless rebuild (#1067528) + +* Tue May 21 2013 Mikolaj Izdebski - 2.8-1 +- Update to upstream version 2.8 + +* Fri Mar 15 2013 Michal Srb - 2.7-1 +- Update to upstream version 2.7 + +* Thu Feb 14 2013 Fedora Release Engineering - 2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jan 23 2013 Mikolaj Izdebski - 2.6-1 +- Update to upstream version 2.6 +- Build with xmvn +- Install license files + +* Tue Jan 22 2013 Mikolaj Izdebski - 2.5.1-2 +- Remove unneeded BR: asm2 + +* Tue Aug 28 2012 Mikolaj Izdebski - 2.5.1-1 +- Update to upstream version 2.5.1 + +* Thu Jul 19 2012 Fedora Release Engineering - 2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 21 2012 Tomas Radej - 2.4-1 +- Updated to the upstream version +- Partially removed a test because of a legacy class use +- Removed exception checking as it has already been done + +* Fri Jan 13 2012 Alexander Kurtakov 2.3-3 +- Add missing BR. + +* Fri Jan 13 2012 Fedora Release Engineering - 2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jul 11 2011 Stanislav Ochotnicky - 2.3-1 +- Update to latest upstream + +* Tue Jun 28 2011 Alexander Kurtakov 2.2-2 +- BR/R maven-shared-file-management. + +* Tue Apr 26 2011 Alexander Kurtakov 2.2-1 +- Update to 2.2 final release. + +* Tue Feb 08 2011 Fedora Release Engineering - 2.2-0.4.svn949573 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Sep 7 2010 Stanislav Ochotnicky - 2.2-0.3.svn949573 +- Fix test case to expect new classworlds + +* Tue Jun 15 2010 Alexander Kurtakov 2.2-0.2.svn949573 +- Add missing Requires. + +* Thu Jun 3 2010 Stanislav Ochotnicky - 2.2-0.1.svn949573 +- Initial package