Use Maven 3.9.11 in dependencies, still requires 3.6.3 as minimum

Author: slawekjaranowski

archetype-common/pom.xml

@@ -138,16 +138,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-testing</groupId>
-      <artifactId>maven-plugin-testing-harness</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-connector-basic</artifactId>

archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java

@@ -29,7 +29,8 @@
 import org.apache.maven.archetype.ArchetypeGenerationResult;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.xml.XmlStreamReader;
@@ -39,7 +40,7 @@
 import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.LocalRepositoryManager;
 
-public class DefaultArchetypeGeneratorTest extends AbstractMojoTestCase {
+public class DefaultArchetypeGeneratorTest extends PlexusTestCase {
     // archetypes prepared by antrun execution (see pom.xml) from src/test/archetypes
     private static final Archetype ARCHETYPE_BASIC = new Archetype("archetypes", "basic", "1.0");
 
@@ -470,6 +471,11 @@ protected void tearDown() throws Exception {
         outputDirectory = null;
     }
 
+    @Override
+    protected void customizeContainerConfiguration(ContainerConfiguration configuration) {
+        configuration.setClassPathScanning("index");
+    }
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
@@ -482,9 +488,6 @@ protected void setUp() throws Exception {
 
         generator = (ArchetypeGenerator) lookup(ArchetypeGenerator.ROLE);
         assertNotNull(generator);
-        assertNotNull(getVariableValueFromObject(generator, "archetypeArtifactManager"));
-        assertNotNull(getVariableValueFromObject(generator, "oldArchetype"));
-        assertNotNull(getVariableValueFromObject(generator, "filesetGenerator"));
     }
 
     private ArchetypeGenerationRequest createArchetypeGenerationRequest(String project, Archetype archetype)

archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java

@@ -21,12 +21,19 @@
 import java.io.File;
 
 import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusTestCase;
 
 /**
  * @author  rafale
  */
-public class DefaultRepositoryCrawlerTest extends AbstractMojoTestCase {
+public class DefaultRepositoryCrawlerTest extends PlexusTestCase {
+
+    @Override
+    protected void customizeContainerConfiguration(ContainerConfiguration configuration) {
+        configuration.setClassPathScanning("index");
+    }
+
     /**
      * Test of crawl method, of class DefaultRepositoryCrawler.
      */

maven-archetype-plugin/pom.xml

@@ -39,7 +39,7 @@
   <name>Maven Archetype Plugin</name>
 
   <prerequisites>
-    <maven>${mavenVersion}</maven>
+    <maven>3.6.3</maven>
   </prerequisites>
 
   <dependencies>
@@ -64,18 +64,6 @@
       <artifactId>maven-settings</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.maven.archetype</groupId>
       <artifactId>archetype-catalog</artifactId>

pom.xml

@@ -71,9 +71,9 @@
 
   <properties>
     <maven.archetype.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-archetype.git</maven.archetype.scm.devConnection>
-    <mavenVersion>3.6.3</mavenVersion>
+    <mavenVersion>3.9.11</mavenVersion>
     <!-- provided by Maven core -->
-    <resolverVersion>1.4.1</resolverVersion>
+    <resolverVersion>1.9.24</resolverVersion>
     <javaVersion>8</javaVersion>
     <!-- TODO remove with next parent version update -->
     <version.maven-invoker-plugin>3.9.1</version.maven-invoker-plugin>
@@ -92,11 +92,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-compat</artifactId>
-        <version>${mavenVersion}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-catalog</artifactId>
@@ -198,18 +193,6 @@
         <artifactId>junit</artifactId>
         <version>4.13.2</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugin-testing</groupId>
-        <artifactId>maven-plugin-testing-harness</artifactId>
-        <version>3.3.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.resolver</groupId>
-        <artifactId>maven-resolver-api</artifactId>
-        <version>${resolverVersion}</version>
-        <scope>provided</scope>
-      </dependency>
-
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-matchers</artifactId>