You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2022/11/27 21:54:45 UTC
[maven-dependency-plugin] branch string updated: remove commons-lang3
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch string
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
The following commit(s) were added to refs/heads/string by this push:
new cb103dd7 remove commons-lang3
cb103dd7 is described below
commit cb103dd7ef2390f7e7b00a564fccc7f7acb1d6e2
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Nov 27 16:54:38 2022 -0500
remove commons-lang3
---
.../org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java | 3 +--
.../apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java | 5 +++--
.../plugins/dependency/resolvers/ResolveDependencySourcesMojo.java | 3 +--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java b/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
index 4c2ea9ea..32bd32ef 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
@@ -19,7 +19,6 @@ package org.apache.maven.plugins.dependency;
* under the License.
*/
-import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -62,7 +61,7 @@ public class DisplayAncestorsMojo
}
else
{
- getLog().info( String.format( Locale.US, "Ancestor POMs: %s", StringUtils.join( ancestors, " <- " ) ) );
+ getLog().info( String.format( Locale.US, "Ancestor POMs: %s", String.join( " <- " ), ancestors ) );
}
}
diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
index e069bd46..d196c0fb 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
@@ -30,7 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.plugin.AbstractMojo;
@@ -42,6 +41,7 @@ import org.apache.maven.shared.artifact.filter.StrictPatternExcludesArtifactFilt
import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalysis;
import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzer;
import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzerException;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.context.Context;
@@ -582,7 +582,8 @@ public abstract class AbstractAnalyzeMojo
writer.endElement();
writer.startElement( "version" );
writer.writeText( artifact.getBaseVersion() );
- if ( !StringUtils.isBlank( artifact.getClassifier() ) )
+ String classifier = artifact.getClassifier();
+ if ( StringUtils.isNotBlank( classifier ) )
{
writer.startElement( "classifier" );
writer.writeText( artifact.getClassifier() );
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependencySourcesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependencySourcesMojo.java
index 95d16880..79976150 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependencySourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependencySourcesMojo.java
@@ -19,7 +19,6 @@ package org.apache.maven.plugins.dependency.resolvers;
* under the License.
*/
-import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -49,7 +48,7 @@ public class ResolveDependencySourcesMojo
protected void doExecute()
throws MojoExecutionException
{
- if ( StringUtils.isEmpty( this.classifier ) )
+ if ( this.classifier == null || this.classifier.length() == 0 )
{
this.classifier = SOURCE_CLASSIFIER;
}