diff --git a/pom.xml b/pom.xml index ff9236c4..daf55b01 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ maven-shared-utils - 3.3.5-SNAPSHOT + 4.0.0-SNAPSHOT Apache Maven Shared Utils Shared utilities for use by Maven core and plugins @@ -67,12 +67,25 @@ + + org.slf4j + slf4j-api + 1.7.25 + + org.fusesource.jansi jansi 2.2.0 true + + + commons-io + commons-io + 2.6 + + junit junit @@ -85,11 +98,6 @@ 2.2 test - - commons-io - commons-io - 2.6 - org.apache.commons commons-text @@ -111,12 +119,6 @@ ${mavenVersion} test - - org.codehaus.plexus - plexus-container-default - 2.1.0 - provided - org.codehaus.plexus plexus-utils diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java index 738f660d..971b9626 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java @@ -25,7 +25,8 @@ import org.apache.maven.shared.utils.cli.CommandLineUtils; import org.apache.maven.shared.utils.cli.Commandline; import org.apache.maven.shared.utils.cli.StreamConsumer; -import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.InputStream; @@ -41,9 +42,9 @@ * @param Tool-specific request type */ public abstract class AbstractJavaTool - extends AbstractLogEnabled implements JavaTool { + private final Logger logger = LoggerFactory.getLogger( getClass() ); /** * The java tool name to find out in the jdk. @@ -79,6 +80,11 @@ protected AbstractJavaTool( String javaToolName ) protected abstract Commandline createCommandLine( Request request, String javaToolFileLocation ) throws JavaToolException; + protected Logger getLogger() + { + return logger; + } + /** * {@inheritDoc} */