This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch string2
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit c4fb2743fbd2721b7305a73b623228b97a957e88
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Sun Mar 5 18:43:55 2023 -0500
replace Codehaus Plexus utils with Apache Commons
---
.../org/apache/maven/plugins/dependency/AbstractDependencyMojo.java | 2 +-
src/main/java/org/apache/maven/plugins/dependency/GetMojo.java | 2 +-
.../org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java | 2 +-
.../java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java | 2 +-
.../dependency/fromConfiguration/AbstractFromConfigurationMojo.java | 2 +-
.../apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java | 2 +-
.../dependency/fromDependencies/AbstractDependencyFilterMojo.java | 2 +-
.../maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java | 2 +-
.../java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java | 2 +-
.../apache/maven/plugins/dependency/utils/filters/DestFileFilter.java | 2 +-
.../maven/plugins/dependency/utils/markers/UnpackFileMarkerHandler.java | 2 +-
.../plugins/dependency/utils/translators/ClassifierTypeTranslator.java | 2 +-
.../plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java | 2 +-
.../plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java | 2 +-
.../plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java | 2 +-
.../plugins/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java | 2 +-
.../org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
index 66c64c8e..ade8347c 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
@@ -43,7 +44,6 @@ import
org.codehaus.plexus.components.io.filemappers.FileMapper;
import
org.codehaus.plexus.components.io.fileselectors.IncludeExcludeFileSelector;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.ReflectionUtils;
-import org.codehaus.plexus.util.StringUtils;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
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 1d727048..b5e3dd01 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -48,7 +49,6 @@ 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;
/**
* Resolves a single artifact, eventually transitively, from the specified
remote repositories. Caveat: will always
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 01be0639..a2438ac9 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -61,7 +62,6 @@ import
org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverE
import org.apache.maven.shared.utils.logging.MessageBuilder;
import org.apache.maven.shared.utils.logging.MessageUtils;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
/**
* When run on a project, remove the project dependencies from the local
repository, and optionally re-resolve them.
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java
b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java
index afb52f99..aff848f2 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
@@ -36,7 +37,6 @@ 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.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
/**
* This mojo looks at the dependencies after final resolution and looks for
mismatches in your dependencyManagement
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 6e6dd527..401a6f3c 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
@@ -22,6 +22,7 @@ import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -40,7 +41,6 @@ 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;
/**
* Abstract parent class used by mojos that get Artifact information from the
plugin configuration as an ArrayList of
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java
index b76add1e..40eeb8ce 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.dependency.fromConfiguration;
import java.io.File;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -30,7 +31,6 @@ import
org.apache.maven.plugins.dependency.utils.filters.MarkerFileFilter;
import org.apache.maven.plugins.dependency.utils.markers.MarkerHandler;
import
org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
import org.codehaus.plexus.components.io.filemappers.FileMapper;
-import org.codehaus.plexus.util.StringUtils;
/**
* Goal that retrieves a list of artifacts from the repository and unpacks
them in a defined location.
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 ee2151a7..8899bda0 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
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.plugin.MojoExecutionException;
@@ -51,7 +52,6 @@ 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;
/**
* Class that encapsulates the plugin parameters, and contains methods that
handle dependency filtering
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 8424f708..564b878c 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
@@ -35,6 +35,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
@@ -47,7 +48,6 @@ import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
import org.apache.maven.shared.transfer.repository.RepositoryManager;
-import org.codehaus.plexus.util.StringUtils;
/**
* This goal outputs 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/utils/DependencyUtil.java
b/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
index 2c7c2c2a..ae7a00ea 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
@@ -26,10 +26,10 @@ import java.io.OutputStreamWriter;
import java.io.StringReader;
import java.io.Writer;
import java.util.Objects;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugin.logging.Log;
-import org.codehaus.plexus.util.StringUtils;
/**
* Utility class with static helper methods.
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/utils/filters/DestFileFilter.java
b/src/main/java/org/apache/maven/plugins/dependency/utils/filters/DestFileFilter.java
index 4c4bbbfd..50edd77b 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/utils/filters/DestFileFilter.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/utils/filters/DestFileFilter.java
@@ -23,12 +23,12 @@ import java.io.IOException;
import java.nio.file.Files;
import java.util.LinkedHashSet;
import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugins.dependency.fromConfiguration.ArtifactItem;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import
org.apache.maven.shared.artifact.filter.collection.AbstractArtifactsFilter;
import
org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
-import org.codehaus.plexus.util.StringUtils;
/**
* @author <a href="mailto:bri...@apache.org";>Brian Fox</a>
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/utils/markers/UnpackFileMarkerHandler.java
b/src/main/java/org/apache/maven/plugins/dependency/utils/markers/UnpackFileMarkerHandler.java
index 9dadf452..3e62f960 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/utils/markers/UnpackFileMarkerHandler.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/utils/markers/UnpackFileMarkerHandler.java
@@ -19,8 +19,8 @@
package org.apache.maven.plugins.dependency.utils.markers;
import java.io.File;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugins.dependency.fromConfiguration.ArtifactItem;
-import org.codehaus.plexus.util.StringUtils;
/**
* @author <a href="mailto:dbradic...@comcast.net";>Damian Bradicich</a>
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 d9cf3caf..431a59ce 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
@@ -20,13 +20,13 @@ package
org.apache.maven.plugins.dependency.utils.translators;
import java.util.LinkedHashSet;
import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
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.transfer.artifact.ArtifactCoordinate;
import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate;
-import org.codehaus.plexus.util.StringUtils;
/**
* @author <a href="mailto:bri...@apache.org";>Brian Fox</a>
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
index bb92b2f6..5b7bac70 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
@@ -33,7 +34,6 @@ import
org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import
org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase {
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
index 5ef9062e..369199a0 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
@@ -26,6 +26,7 @@ import java.nio.file.Paths;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
@@ -44,7 +45,6 @@ import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase {
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
index 708832b1..75dfbe5e 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
@@ -36,7 +37,6 @@ import
org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFacto
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import
org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase
{
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java
b/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java
index dab1ebec..4988c4cd 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java
@@ -19,9 +19,9 @@
package org.apache.maven.plugins.dependency.testUtils.stubs;
import java.io.File;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugins.dependency.fromConfiguration.ArtifactItem;
import
org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
-import org.codehaus.plexus.util.StringUtils;
public class StubUnpackFileMarkerHandler extends UnpackFileMarkerHandler {
public StubUnpackFileMarkerHandler(ArtifactItem artifactItem, File
markerFilesDirectory) {
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java
b/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java
index 8302b70f..ac0caa60 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import junit.framework.TestCase;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
@@ -30,7 +31,6 @@ import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.testing.SilentLog;
import org.apache.maven.plugin.testing.stubs.DefaultArtifactHandlerStub;
-import org.codehaus.plexus.util.StringUtils;
/**
* @author brianf
