This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/maven-common-artifact-filters.git
The following commit(s) were added to refs/heads/master by this push:
new 24d1add [MSHARED-988] Drop uses of Plexus Logger
24d1add is described below
commit 24d1add2d95de2460bc54fd2b0e2e6b43215bb0d
Author: Tamas Cservenak <[email protected]>
AuthorDate: Mon May 3 09:06:02 2021 +0200
[MSHARED-988] Drop uses of Plexus Logger
Replace it with Slf4j, that logger we use in maven.
---
pom.xml | 23 +++++++++++++++++-----
.../filter/PatternIncludesArtifactFilter.java | 2 +-
.../artifact/filter/ScopeArtifactFilter.java | 2 +-
.../filter/StatisticsReportingArtifactFilter.java | 2 +-
.../filter/OldPatternIncludesArtifactFilter.java | 2 +-
.../filter/collection/TestScopeFilter.java | 4 ----
6 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index de4d1fa..5cf9eb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,12 @@
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.25</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven.version}</version>
@@ -108,11 +114,23 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -130,11 +148,6 @@
<version>${aether.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
- <version>0.0.0.M5</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<version>1.4.2</version>
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
index 48489bf..02e4d1b 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
@@ -36,7 +36,7 @@ import
org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
/**
* TODO: include in maven-artifact in future
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
index 7bdd6ba..e8bce30 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
/**
* <p>
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/StatisticsReportingArtifactFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/StatisticsReportingArtifactFilter.java
index b3e3429..fe755da 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/StatisticsReportingArtifactFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/StatisticsReportingArtifactFilter.java
@@ -19,7 +19,7 @@ package org.apache.maven.shared.artifact.filter;
* under the License.
*/
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
/**
* StatisticsReportingArtifactFilter interface.
diff --git
a/src/test/java/org/apache/maven/shared/artifact/filter/OldPatternIncludesArtifactFilter.java
b/src/test/java/org/apache/maven/shared/artifact/filter/OldPatternIncludesArtifactFilter.java
index df492bb..ffd1b53 100644
---
a/src/test/java/org/apache/maven/shared/artifact/filter/OldPatternIncludesArtifactFilter.java
+++
b/src/test/java/org/apache/maven/shared/artifact/filter/OldPatternIncludesArtifactFilter.java
@@ -31,7 +31,7 @@ import
org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
/**
* TODO: include in maven-artifact in future
diff --git
a/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestScopeFilter.java
b/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestScopeFilter.java
index 2a8a243..c99a1c6 100644
---
a/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestScopeFilter.java
+++
b/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestScopeFilter.java
@@ -21,9 +21,7 @@ package org.apache.maven.shared.artifact.filter.collection;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.testing.ArtifactStubFactory;
-import org.apache.maven.plugin.testing.SilentLog;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -37,8 +35,6 @@ public class TestScopeFilter
{
Set<Artifact> artifacts;
- Log log = new SilentLog();
-
@Before
public void setUp()
throws Exception
