This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MDEP-923-move-methods
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 630908f9d9709bcfe4f965366079649e83469b97
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Thu Jun 6 22:15:22 2024 +0200
[MDEP-923] Move methods in place where are used
---
.../dependency/fromConfiguration/CopyMojo.java | 6 --
.../fromDependencies/CopyDependenciesMojo.java | 6 --
.../dependency/resolvers/AbstractResolveMojo.java | 78 +---------------------
.../dependency/resolvers/ResolvePluginsMojo.java | 64 ++++++++++++++++++
4 files changed, 65 insertions(+), 89 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/CopyMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/CopyMojo.java
index b4d5bcab..d7a3ba61 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/CopyMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/CopyMojo.java
@@ -79,12 +79,6 @@ public class CopyMojo extends AbstractFromConfigurationMojo {
@Parameter(property = "artifact")
private String artifact;
- /**
- * <i>not used in this goal</i>
- */
- @Parameter
- protected boolean ignorePermissions;
-
/**
* Main entry into mojo. This method gets the ArtifactItems and iterates
through each one passing it to
* copyArtifact.
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 d92f5674..97956ec7 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
@@ -97,12 +97,6 @@ public class CopyDependenciesMojo extends
AbstractFromDependenciesMojo {
@Parameter(property = "mdep.addParentPoms", defaultValue = "false")
protected boolean addParentPoms;
- /**
- * <i>not used in this goal</i>
- */
- @Parameter
- protected boolean ignorePermissions;
-
/**
* Main entry into mojo. Gets the list of dependencies and iterates
through calling copyArtifact.
*
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 9ed8d961..a452968e 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
@@ -19,28 +19,15 @@
package org.apache.maven.plugins.dependency.resolvers;
import java.io.File;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugins.annotations.Parameter;
import
org.apache.maven.plugins.dependency.fromDependencies.AbstractDependencyFilterMojo;
-import org.apache.maven.plugins.dependency.utils.DependencyUtil;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter;
-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.ScopeFilter;
-import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
-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 <a href="mailto:bri...@apache.org";>Brian Fox</a>
*/
public abstract class AbstractResolveMojo extends AbstractDependencyFilterMojo
{
+
/**
* If specified, this parameter causes the dependencies to be written to
the path specified instead of
* the console.
@@ -65,67 +52,4 @@ public abstract class AbstractResolveMojo extends
AbstractDependencyFilterMojo {
*/
@Parameter(property = "excludeReactor", defaultValue = "true")
protected boolean excludeReactor;
-
- /**
- * <i>not used in this goal</i>
- */
- @Parameter
- protected boolean ignorePermissions;
-
- /**
- * @return {@link FilterArtifacts}
- */
- protected FilterArtifacts getArtifactsFilter() {
- final FilterArtifacts filter = new FilterArtifacts();
-
- if (excludeReactor) {
-
- filter.addFilter(new
ExcludeReactorProjectsArtifactFilter(reactorProjects, getLog()));
- }
-
- filter.addFilter(new ScopeFilter(
- DependencyUtil.cleanToBeTokenizedString(this.includeScope),
- DependencyUtil.cleanToBeTokenizedString(this.excludeScope)));
-
- filter.addFilter(new TypeFilter(
- DependencyUtil.cleanToBeTokenizedString(this.includeTypes),
- DependencyUtil.cleanToBeTokenizedString(this.excludeTypes)));
-
- filter.addFilter(new ClassifierFilter(
-
DependencyUtil.cleanToBeTokenizedString(this.includeClassifiers),
-
DependencyUtil.cleanToBeTokenizedString(this.excludeClassifiers)));
-
- filter.addFilter(new GroupIdFilter(
- DependencyUtil.cleanToBeTokenizedString(this.includeGroupIds),
-
DependencyUtil.cleanToBeTokenizedString(this.excludeGroupIds)));
-
- filter.addFilter(new ArtifactIdFilter(
-
DependencyUtil.cleanToBeTokenizedString(this.includeArtifactIds),
-
DependencyUtil.cleanToBeTokenizedString(this.excludeArtifactIds)));
-
- return filter;
- }
-
- /**
- * This method resolves all transitive dependencies of an artifact.
- *
- * @param artifact the artifact used to retrieve dependencies
- * @return resolved set of dependencies
- * @throws DependencyResolverException in case of error while resolving
artifacts.
- */
- protected Set<Artifact> resolveArtifactDependencies(final
DependableCoordinate artifact)
- throws DependencyResolverException {
- ProjectBuildingRequest buildingRequest =
newResolveArtifactProjectBuildingRequest();
-
- Iterable<ArtifactResult> artifactResults =
- getDependencyResolver().resolveDependencies(buildingRequest,
artifact, null);
-
- Set<Artifact> artifacts = new LinkedHashSet<>();
-
- for (final ArtifactResult artifactResult : artifactResults) {
- artifacts.add(artifactResult.getArtifact());
- }
-
- return artifacts;
- }
}
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 69994d96..525c680a 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
@@ -31,10 +31,17 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.project.ProjectBuildingRequest;
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;
+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.ScopeFilter;
+import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
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.DefaultDependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
import
org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
/**
@@ -137,6 +144,63 @@ public class ResolvePluginsMojo extends
AbstractResolveMojo {
}
}
+ /**
+ * This method resolves all transitive dependencies of an artifact.
+ *
+ * @param artifact the artifact used to retrieve dependencies
+ * @return resolved set of dependencies
+ * @throws DependencyResolverException in case of error while resolving
artifacts.
+ */
+ protected Set<Artifact> resolveArtifactDependencies(final
DependableCoordinate artifact)
+ throws DependencyResolverException {
+ ProjectBuildingRequest buildingRequest =
newResolveArtifactProjectBuildingRequest();
+
+ Iterable<ArtifactResult> artifactResults =
+ getDependencyResolver().resolveDependencies(buildingRequest,
artifact, null);
+
+ Set<Artifact> artifacts = new LinkedHashSet<>();
+
+ for (final ArtifactResult artifactResult : artifactResults) {
+ artifacts.add(artifactResult.getArtifact());
+ }
+
+ return artifacts;
+ }
+
+ /**
+ * @return {@link FilterArtifacts}
+ */
+ protected FilterArtifacts getArtifactsFilter() {
+ final FilterArtifacts filter = new FilterArtifacts();
+
+ if (excludeReactor) {
+
+ filter.addFilter(new
ExcludeReactorProjectsArtifactFilter(reactorProjects, getLog()));
+ }
+
+ filter.addFilter(new ScopeFilter(
+ DependencyUtil.cleanToBeTokenizedString(this.includeScope),
+ DependencyUtil.cleanToBeTokenizedString(this.excludeScope)));
+
+ filter.addFilter(new TypeFilter(
+ DependencyUtil.cleanToBeTokenizedString(this.includeTypes),
+ DependencyUtil.cleanToBeTokenizedString(this.excludeTypes)));
+
+ filter.addFilter(new ClassifierFilter(
+
DependencyUtil.cleanToBeTokenizedString(this.includeClassifiers),
+
DependencyUtil.cleanToBeTokenizedString(this.excludeClassifiers)));
+
+ filter.addFilter(new GroupIdFilter(
+ DependencyUtil.cleanToBeTokenizedString(this.includeGroupIds),
+
DependencyUtil.cleanToBeTokenizedString(this.excludeGroupIds)));
+
+ filter.addFilter(new ArtifactIdFilter(
+
DependencyUtil.cleanToBeTokenizedString(this.includeArtifactIds),
+
DependencyUtil.cleanToBeTokenizedString(this.excludeArtifactIds)));
+
+ return filter;
+ }
+
/**
* This method resolves the plugin artifacts from the project.
*
