This is an automated email from the ASF dual-hosted git repository. bmarwell pushed a commit to branch MJLINK-72_remove_cl3 in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git
commit fac8e014e425e405ebe369caa3c8fc6ff00432c7 Author: Benjamin Marwell <bmarw...@apache.org> AuthorDate: Wed Jul 26 21:58:01 2023 +0200 [MJLINK-72] remove commons-lang3 --- pom.xml | 5 ----- src/main/java/org/apache/maven/plugins/jlink/JLinkExecutor.java | 9 ++++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 6d53936..d9a5157 100644 --- a/pom.xml +++ b/pom.xml @@ -122,11 +122,6 @@ <artifactId>plexus-java</artifactId> <version>1.1.2</version> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.12.0</version> - </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> diff --git a/src/main/java/org/apache/maven/plugins/jlink/JLinkExecutor.java b/src/main/java/org/apache/maven/plugins/jlink/JLinkExecutor.java index e8e72fb..6beddbf 100644 --- a/src/main/java/org/apache/maven/plugins/jlink/JLinkExecutor.java +++ b/src/main/java/org/apache/maven/plugins/jlink/JLinkExecutor.java @@ -45,7 +45,6 @@ import java.util.List; import java.util.Optional; import java.util.spi.ToolProvider; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.logging.Log; import org.apache.maven.toolchain.Toolchain; @@ -88,10 +87,10 @@ class JLinkExecutor extends AbstractJLinkToolchainExecutor { err.flush(); String outAsString = strOut.toString(); - String output = (StringUtils.isEmpty(outAsString) ? null : '\n' + outAsString.trim()); + String output = outAsString.isBlank() ? null : '\n' + outAsString.trim(); if (exitCode != 0) { - if (StringUtils.isNotEmpty(output)) { + if (output != null && !output.isBlank()) { // Reconsider to use WARN / ERROR ? // getLog().error( output ); for (String outputLine : output.split("\n")) { @@ -102,7 +101,7 @@ class JLinkExecutor extends AbstractJLinkToolchainExecutor { StringBuilder msg = new StringBuilder("\nExit code: "); msg.append(exitCode); String errAsString = strErr.toString(); - if (StringUtils.isNotEmpty(errAsString)) { + if (errAsString != null && !errAsString.isBlank()) { msg.append(" - ").append(errAsString); } msg.append('\n'); @@ -116,7 +115,7 @@ class JLinkExecutor extends AbstractJLinkToolchainExecutor { throw new MojoExecutionException(msg.toString()); } - if (StringUtils.isNotEmpty(output)) { + if (output != null && !output.isBlank()) { // getLog().info( output ); for (String outputLine : output.split("\n")) { getLog().info(outputLine);