This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch try
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit eaad8d604fd3b8c284a894ebe67e1797afd9b85a
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Sat Nov 16 07:35:14 2024 -0500
Rollback bad commit
---
pom.xml | 6 ++++
.../apache/maven/plugins/dependency/GetMojo.java | 7 ++---
.../dependency/analyze/AbstractAnalyzeMojo.java | 6 ++--
.../plugins/dependency/analyze/AnalyzeDepMgt.java | 7 ++---
.../AbstractFromConfigurationMojo.java | 17 +++++------
.../dependency/fromConfiguration/UnpackMojo.java | 2 +-
.../fromDependencies/BuildClasspathMojo.java | 3 +-
.../plugins/dependency/utils/DependencyUtil.java | 7 ++---
.../plugins/dependency/utils/StringUtils.java | 33 ----------------------
.../dependency/utils/filters/DestFileFilter.java | 6 ++--
.../utils/markers/UnpackFileMarkerHandler.java | 2 +-
.../TestCopyDependenciesMojo2.java | 3 +-
.../stubs/StubUnpackFileMarkerHandler.java | 2 +-
.../dependency/utils/TestDependencyUtil.java | 2 +-
14 files changed, 36 insertions(+), 67 deletions(-)
diff --git a/pom.xml b/pom.xml
index d02c0181..53e8daa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,6 +243,12 @@ under the License.
<version>3.4.2</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.13.0</version>
+ </dependency>
+
<!-- dependencies to annotations -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
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 73b3eb31..61fb05fd 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
@@ -24,6 +24,7 @@ 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;
@@ -37,7 +38,6 @@ import org.apache.maven.plugin.MojoFailureException;
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.plugins.dependency.utils.StringUtils;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.repository.RepositorySystem;
@@ -130,7 +130,7 @@ public class GetMojo extends AbstractMojo {
+ "e.g.
-Dartifact=org.apache.maven.plugins:maven-downloader-plugin:1.0");
}
if (artifact != null) {
- String[] tokens = artifact.split("\\s*:+\\s*");
+ String[] tokens = StringUtils.split(artifact, ":");
if (tokens.length < 3 || tokens.length > 5) {
throw new MojoFailureException("Invalid artifact, you must
specify "
+ "groupId:artifactId:version[:packaging[:classifier]]
" + artifact);
@@ -157,7 +157,7 @@ public class GetMojo extends AbstractMojo {
if (remoteRepositories != null) {
// Use the same format as in the deploy plugin id::layout::url
- String[] repos = remoteRepositories.split("\\s*,+\\s*");
+ String[] repos = StringUtils.split(remoteRepositories, ",");
for (String repo : repos) {
repoList.add(parseRepository(repo, always));
}
@@ -214,7 +214,6 @@ public class GetMojo extends AbstractMojo {
}
id = matcher.group(1).trim();
-
if (!StringUtils.isEmpty(matcher.group(2))) {
layout = getLayout(matcher.group(2).trim());
}
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 ebff3dce..1d5d2553 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
@@ -29,6 +29,7 @@ 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;
@@ -36,7 +37,6 @@ import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.dependency.utils.StringUtils;
import org.apache.maven.project.MavenProject;
import
org.apache.maven.shared.artifact.filter.StrictPatternExcludesArtifactFilter;
import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalysis;
@@ -512,9 +512,9 @@ public abstract class AbstractAnalyzeMojo extends
AbstractMojo {
writer.startElement("version");
writer.writeText(artifact.getBaseVersion());
String classifier = artifact.getClassifier();
- if (!StringUtils.isEmpty(classifier)) {
+ if (StringUtils.isNotBlank(classifier)) {
writer.startElement("classifier");
- writer.writeText(classifier);
+ writer.writeText(artifact.getClassifier());
writer.endElement();
}
writer.endElement();
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 b118183e..a96b4f04 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
@@ -26,6 +26,7 @@ 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;
@@ -143,8 +144,7 @@ public class AnalyzeDepMgt extends AbstractMojo {
// log exclusion errors
List<Artifact> exclusionErrors = getExclusionErrors(exclusions,
allDependencyArtifacts);
for (Artifact exclusion : exclusionErrors) {
- String artifactManagementKey =
getArtifactManagementKey(exclusion);
-
getLog().info(artifactManagementKey.substring(artifactManagementKey.lastIndexOf(":"))
+
getLog().info(StringUtils.stripEnd(getArtifactManagementKey(exclusion), ":")
+ " was excluded in DepMgt, but version " +
exclusion.getVersion()
+ " has been found in the dependency tree.");
foundError = true;
@@ -247,8 +247,7 @@ public class AnalyzeDepMgt extends AbstractMojo {
"Invalid params: Artifact: " + dependencyArtifact + "
Dependency: " + dependencyFromDepMgt);
}
- String managementKey = dependencyFromDepMgt.getManagementKey();
- getLog().info("\tDependency: " +
managementKey.substring(managementKey.lastIndexOf(":")));
+ getLog().info("\tDependency: " +
StringUtils.stripEnd(dependencyFromDepMgt.getManagementKey(), ":"));
getLog().info("\t\tDepMgt : " + dependencyFromDepMgt.getVersion());
getLog().info("\t\tResolved: " + dependencyArtifact.getBaseVersion());
}
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 7fbedc4a..770f86c2 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
@@ -23,6 +23,7 @@ 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;
@@ -33,7 +34,6 @@ import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.dependency.AbstractDependencyMojo;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
-import org.apache.maven.plugins.dependency.utils.StringUtils;
import org.apache.maven.plugins.dependency.utils.filters.ArtifactItemFilter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
@@ -145,12 +145,13 @@ public abstract class AbstractFromConfigurationMojo
extends AbstractDependencyMo
protected List<ArtifactItem>
getProcessedArtifactItems(ProcessArtifactItemsRequest
processArtifactItemsRequest)
throws MojoExecutionException {
- boolean removeVersion = processArtifactItemsRequest.isRemoveVersion();
- boolean prependGroupId =
processArtifactItemsRequest.isPrependGroupId();
- boolean useBaseVersion =
processArtifactItemsRequest.isUseBaseVersion();
+ boolean removeVersion = processArtifactItemsRequest.isRemoveVersion(),
+ prependGroupId =
processArtifactItemsRequest.isPrependGroupId(),
+ useBaseVersion =
processArtifactItemsRequest.isUseBaseVersion();
+
boolean removeClassifier =
processArtifactItemsRequest.isRemoveClassifier();
- if (artifactItems == null || artifactItems.isEmpty()) {
+ if (artifactItems == null || artifactItems.size() < 1) {
throw new MojoExecutionException("There are no artifactItems
configured.");
}
@@ -183,8 +184,8 @@ public abstract class AbstractFromConfigurationMojo extends
AbstractDependencyMo
return artifactItems;
}
- private boolean checkIfProcessingNeeded(ArtifactItem item) throws
ArtifactFilterException {
- return Boolean.parseBoolean(item.getOverWrite())
+ private boolean checkIfProcessingNeeded(ArtifactItem item) throws
MojoExecutionException, ArtifactFilterException {
+ return StringUtils.equalsIgnoreCase(item.getOverWrite(), "true")
|| getMarkedArtifactFilter(item).isArtifactIncluded(item);
}
@@ -366,7 +367,7 @@ public abstract class AbstractFromConfigurationMojo extends
AbstractDependencyMo
if (artifact != null) {
String packaging = "jar";
String classifier;
- String[] tokens = artifact.split(":");
+ String[] tokens = StringUtils.split(artifact, ":");
if (tokens.length < 3 || tokens.length > 5) {
throw new MojoFailureException("Invalid artifact, "
+ "you must specify
groupId:artifactId:version[:packaging[:classifier]] " + artifact);
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 60c4f297..979ed507 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
@@ -21,13 +21,13 @@ 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.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.dependency.utils.StringUtils;
import org.apache.maven.plugins.dependency.utils.UnpackUtil;
import org.apache.maven.plugins.dependency.utils.filters.ArtifactItemFilter;
import org.apache.maven.plugins.dependency.utils.filters.MarkerFileFilter;
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 698c2739..d43f9692 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.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+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;
@@ -266,7 +267,7 @@ public class BuildClasspathMojo extends
AbstractDependencyFilterMojo implements
ProjectBuildingRequest projectBuildingRequest =
session.getProjectBuildingRequest();
File localBasedir =
repositoryManager.getLocalRepositoryBasedir(projectBuildingRequest);
- file = file.replace(localBasedir.getAbsolutePath(),
localRepoProperty);
+ file = StringUtils.replace(file,
localBasedir.getAbsolutePath(), localRepoProperty);
}
sb.append(file);
} else {
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 bdccfee9..6dad61eb 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
@@ -29,6 +29,7 @@ import java.nio.file.OpenOption;
import java.nio.file.StandardOpenOption;
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;
@@ -265,11 +266,7 @@ public final class DependencyUtil {
* @return the result items
*/
public static String[] tokenizer(String str) {
- String s = cleanToBeTokenizedString(str);
- if (s.isEmpty()) {
- return new String[0];
- }
- return cleanToBeTokenizedString(str).split(",");
+ return StringUtils.split(cleanToBeTokenizedString(str), ",");
}
/**
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/utils/StringUtils.java
b/src/main/java/org/apache/maven/plugins/dependency/utils/StringUtils.java
deleted file mode 100644
index e238a669..00000000
--- a/src/main/java/org/apache/maven/plugins/dependency/utils/StringUtils.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugins.dependency.utils;
-
-import static java.util.Objects.isNull;
-
-public final class StringUtils {
- private StringUtils() {}
-
- public static boolean isEmpty(String s) {
- return isNull(s) || s.isEmpty();
- }
-
- public static boolean isNotEmpty(String s) {
- return !isEmpty(s);
- }
-}
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 46909a98..be52f1f5 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
@@ -24,14 +24,13 @@ 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 static org.apache.maven.plugins.dependency.utils.StringUtils.isEmpty;
-
/**
* @author <a href="mailto:bri...@apache.org";>Brian Fox</a>
*/
@@ -285,8 +284,7 @@ public class DestFileFilter extends AbstractArtifactsFilter
implements ArtifactI
}
File destFile;
-
- if (isEmpty(item.getDestFileName())) {
+ if (StringUtils.isEmpty(item.getDestFileName())) {
String formattedFileName = DependencyUtil.getFormattedFileName(
artifact, removeVersion, prependGroupId, useBaseVersion,
removeClassifier);
destFile = new File(destFolder, formattedFileName);
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 95684a3c..00c7be06 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
@@ -20,8 +20,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.apache.maven.plugins.dependency.utils.StringUtils;
/**
* @author <a href="mailto:dbradic...@comcast.net";>Damian Bradicich</a>
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 f3a1f8b4..aaf07685 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
@@ -27,6 +27,7 @@ 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;
@@ -282,7 +283,7 @@ public class TestCopyDependenciesMojo2 extends
AbstractDependencyMojoTestCase {
snapshot.setBuildNumber(1);
RepositoryMetadata metadata = new
SnapshotArtifactRepositoryMetadata(expandedSnapshot, snapshot);
String newVersion = snapshot.getTimestamp() + "-" +
snapshot.getBuildNumber();
-
expandedSnapshot.setResolvedVersion(baseVersion.replace(Artifact.SNAPSHOT_VERSION,
newVersion));
+ expandedSnapshot.setResolvedVersion(StringUtils.replace(baseVersion,
Artifact.SNAPSHOT_VERSION, newVersion));
expandedSnapshot.addMetadata(metadata);
return expandedSnapshot;
}
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 9262470d..411aa048 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
@@ -20,8 +20,8 @@ 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.StringUtils;
import
org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
public class StubUnpackFileMarkerHandler extends UnpackFileMarkerHandler {
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 ceaa05a7..3e2d9ccd 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
@@ -325,7 +325,7 @@ class TestDependencyUtil {
String[] tokens = DependencyUtil.tokenizer(" alpha,bravo, charlie ,
delta kappa, theta");
String[] expected = new String[] {"alpha", "bravo", "charlie", "delta
kappa", "theta"};
// easier to see in the JUnit reports
- assertEquals(String.join(", ", expected), String.join(", ", tokens));
+ assertEquals(StringUtils.join(expected, ", "),
StringUtils.join(tokens, ", "));
assertEquals(expected.length, tokens.length);
tokens = DependencyUtil.tokenizer(" \r\n a, \t \n \r b \t \n \r");
