Skip to content

[MDEP-952] Cut another dependency on commons-lang3 #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2024
Merged

[MDEP-952] Cut another dependency on commons-lang3 #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8211c1
Cut another dependency on commons-lang3
elharo Nov 19, 2024
a5f6e36
compile
elharo Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,11 @@ under the License.
<artifactId>org.eclipse.sisu.plexus</artifactId>
<scope>provided</scope>
</dependency>
<!-- MNG-6607: needs to be overriden for commons-compress otherwise it will appear earlier in the tree -->
<!-- MNG-6607: needs to be overridden for commons-compress otherwise it will appear earlier in the tree -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.17.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down Expand Up @@ -258,12 +257,6 @@ 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>
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
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;
Expand Down Expand Up @@ -130,7 +129,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
+ "e.g. -Dartifact=org.apache.maven.plugins:maven-downloader-plugin:1.0");
}
if (artifact != null) {
String[] tokens = StringUtils.split(artifact, ":");
String[] tokens = artifact.split(":");
if (tokens.length < 3 || tokens.length > 5) {
throw new MojoFailureException("Invalid artifact, you must specify "
+ "groupId:artifactId:version[:packaging[:classifier]] " + artifact);
Expand All @@ -157,7 +156,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {

if (remoteRepositories != null) {
// Use the same format as in the deploy plugin id::layout::url
String[] repos = StringUtils.split(remoteRepositories, ",");
String[] repos = remoteRepositories.split(",");
for (String repo : repos) {
repoList.add(parseRepository(repo, always));
}
Expand Down Expand Up @@ -214,7 +213,7 @@ ArtifactRepository parseRepository(String repo, ArtifactRepositoryPolicy policy)
}

id = matcher.group(1).trim();
if (!StringUtils.isEmpty(matcher.group(2))) {
if (matcher.group(2) != null && !matcher.group(2).isEmpty()) {
layout = getLayout(matcher.group(2).trim());
}
url = matcher.group(3).trim();
Expand Down