You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/01/25 20:18:16 UTC
[maven-enforcer] 03/04: [MENFORCER-371] Update dependency to
maven-compat
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit d0349eb6844452714d09b009536f93a1294bf0af
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jan 23 10:03:19 2021 +0100
[MENFORCER-371] Update dependency to maven-compat
---
enforcer-rules/pom.xml | 2 ++
.../java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java | 3 +--
pom.xml | 8 ++------
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/enforcer-rules/pom.xml b/enforcer-rules/pom.xml
index 3fb4426..349d713 100644
--- a/enforcer-rules/pom.xml
+++ b/enforcer-rules/pom.xml
@@ -103,9 +103,11 @@
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
</dependency>
+ <!-- needed for ArtifactCollector and maven-dependency-tree 2.2 -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
index f87a348..763a2a5 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
@@ -36,7 +36,6 @@ import org.apache.maven.plugins.enforcer.utils.MockEnforcerExpressionEvaluator;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.eclipse.aether.RepositorySystemSession;
/**
* The Class EnforcerTestUtils.
@@ -62,7 +61,7 @@ public final class EnforcerTestUtils
when( mer.getSystemProperties() ).thenReturn( systemProperties );
MavenExecutionResult meresult = mock( MavenExecutionResult.class );
- return new MavenSession( mock, (RepositorySystemSession) null, mer, meresult );
+ return new MavenSession( mock, null, mer, meresult );
}
/**
diff --git a/pom.xml b/pom.xml
index 8c27143..fb9de5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
<version>34</version>
+ <relativePath />
</parent>
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer</artifactId>
@@ -107,14 +108,9 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${maven.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>0.9.0.M2</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
<version>3.1.0</version>