Remove remaining references to maven-compat

apache · Sep 24, 2021 · 7790bcf · 7790bcf
1 parent 76fa713
commit 7790bcf
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 29 deletions.
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
@@ -47,10 +47,6 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.plexus</artifactId>

diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -147,7 +147,6 @@ under the License.
     <exportedArtifact>org.apache.maven:maven-aether-provider</exportedArtifact>
     <exportedArtifact>org.apache.maven:maven-resolver-provider</exportedArtifact>
     <exportedArtifact>org.apache.maven:maven-artifact-manager</exportedArtifact>
-    <exportedArtifact>org.apache.maven:maven-compat</exportedArtifact>
     <exportedArtifact>org.apache.maven:maven-core</exportedArtifact>
     <exportedArtifact>org.apache.maven:maven-error-diagnostics</exportedArtifact>
     <exportedArtifact>org.apache.maven:maven-lifecycle</exportedArtifact>

diff --git a/.../src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java b/.../src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
@@ -83,7 +83,7 @@ public void testExcludeGroupIdWildcardNoMatch()
     {
         Exclusion exclusion = new Exclusion();
         exclusion.setGroupId( "*" );
-        exclusion.setArtifactId( "maven-compat" );
+        exclusion.setArtifactId( "maven-settings" );
         ExclusionArtifactFilter filter = new ExclusionArtifactFilter( Collections.singletonList( exclusion ) );
 
         assertThat( filter.include( artifact ), is( true ) );

diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
@@ -245,7 +245,6 @@ under the License.
     <module>maven-mercury</module>
     <module>maven-embedder</module>
     <module>maven-toolchain</module>
-    <module>maven-compat</module>
     <module>maven-repository</module>
     <module>maven-repository-mercury</module>
   </modules>
@@ -323,11 +322,6 @@ under the License.
         <artifactId>maven-repository</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-compat</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <!--end-->
       <!--  Plexus -->
       <dependency>

diff --git a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
@@ -245,7 +245,6 @@ under the License.
     <module>maven-mercury</module>
     <module>maven-embedder</module>
     <module>maven-toolchain</module>
-    <module>maven-compat</module>
     <module>maven-repository</module>
     <module>maven-repository-mercury</module>
   </modules>
@@ -323,11 +322,6 @@ under the License.
         <artifactId>maven-repository</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-compat</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <!--end-->
       <!--  Plexus -->
       <dependency>

diff --git a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
@@ -245,7 +245,6 @@ under the License.
     <module>maven-mercury</module>
     <module>maven-embedder</module>
     <module>maven-toolchain</module>
-    <module>maven-compat</module>
     <module>maven-repository</module>
     <module>maven-repository-mercury</module>
   </modules>
@@ -323,11 +322,6 @@ under the License.
         <artifactId>maven-repository</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-compat</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <!--end-->
       <!--  Plexus -->
       <dependency>

diff --git a/pom.xml b/pom.xml
@@ -187,11 +187,6 @@ under the License.
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-compat</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-slf4j-provider</artifactId>