You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2021/04/29 16:55:30 UTC
[maven-shared-utils] branch drop-plexus-container created (now
ff91dca)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch drop-plexus-container
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git.
at ff91dca Drop plexus container default
This branch includes the following new commits:
new ff91dca Drop plexus container default
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-shared-utils] 01/01: Drop plexus container default
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch drop-plexus-container
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
commit ff91dca0ae08aaeb7ccb635e31514e329ba80dfe
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Thu Apr 29 18:53:38 2021 +0200
Drop plexus container default
The complete container was only here to make use of AbstractLogEnabled
ancient class, that uses ancient logging.
Drop it.
---
pom.xml | 24 ++++++++++++----------
.../utils/cli/javatool/AbstractJavaTool.java | 10 +++++++--
2 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index ff9236c..0554a86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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}
*/