commit d0349eb6844452714d09b009536f93a1294bf0af
author Sylwester Lachiewicz <slachiewicz@apache.org> Sat Jan 23 10:03:19 2021 +0100
committer Sylwester Lachiewicz <slachiewicz@apache.org> Mon Jan 25 21:16:07 2021 +0100
tree 75e61427229cf776a357723426ae84fc69fbc36a
parent 2742cb4ff124d5225eed92fad1e586e14c3fbd6e

[MENFORCER-371] Update dependency to maven-compat

enforcer-rules/pom.xml

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>

enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java

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.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 @@
         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 );
     }
 
     /**

pom.xml

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>