Skip to content

Commit

Permalink
[MSHARED-983] Drop plexus container default (#87)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
cstamas committed May 1, 2021
1 parent 1285a15 commit 1e6748c
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 14 deletions.
26 changes: 14 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -67,12 +67,25 @@
</properties>

<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>
Expand All @@ -85,11 +98,6 @@
<version>2.2</version>
<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>
Expand All @@ -111,12 +119,6 @@
<version>${mavenVersion}</version>
<scope>test</scope>
</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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -41,9 +42,9 @@
* @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.
Expand Down Expand Up @@ -79,6 +80,11 @@ protected AbstractJavaTool( String javaToolName )
protected abstract Commandline createCommandLine( Request request, String javaToolFileLocation )
throws JavaToolException;

protected Logger getLogger()
{
return logger;
}

/**
* {@inheritDoc}
*/
Expand Down

0 comments on commit 1e6748c

Please sign in to comment.