[maven-shared-utils] branch master updated: [MSHARED-983] Drop plexus container default (#87)

[elharo]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git


The following commit(s) were added to refs/heads/master by this push:
     new 1e6748c  [MSHARED-983] Drop plexus container default (#87)
1e6748c is described below

commit 1e6748cc36464c6899c43d6acaea8156d0956391
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Sat May 1 20:56:24 2021 +0200

    [MSHARED-983] Drop plexus container default (#87)
    
    * Drop plexus container default
    
    The complete container was only here to make use of AbstractLogEnabled
    ancient class, that uses ancient logging.
    
    Drop it.
    
    * Up major version
    
    As this change is not API compatible
---
 pom.xml                                            | 26 ++++++++++++----------
 .../utils/cli/javatool/AbstractJavaTool.java       | 10 +++++++--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index ff9236c..daf55b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>maven-shared-utils</artifactId>
-  <version>3.3.5-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
 
   <name>Apache Maven Shared Utils</name>
   <description>Shared utilities for use by Maven core and plugins</description>
@@ -68,11 +68,24 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi</artifactId>
       <version>2.2.0</version>
       <optional>true</optional>
     </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.6</version>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -86,11 +99,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.6</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>
       <version>1.3</version>
@@ -113,12 +121,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <version>2.1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>3.3.0</version>
       <scope>test</scope>
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 738f660..971b962 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.CommandLineException;
 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 @@ import java.util.Map;
  * @param <Request> Tool-specific request type
  */
 public abstract class AbstractJavaTool<Request extends JavaToolRequest>
-    extends AbstractLogEnabled
     implements JavaTool<Request>
 {
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
 
     /**
      * The java tool name to find out in the jdk.
@@ -79,6 +80,11 @@ public abstract class AbstractJavaTool<Request extends 
JavaToolRequest>
     protected abstract Commandline createCommandLine( Request request, String 
javaToolFileLocation )
         throws JavaToolException;
 
+    protected Logger getLogger()
+    {
+        return logger;
+    }
+
     /**
      * {@inheritDoc}
      */