Fixed #331 - Build failure with Maven 4.0.0-alpha-4

khmarbaise · Dec 20, 2023 · 80f88c1 · 80f88c1
1 parent 4d693d6
commit 80f88c1
Show file tree

Hide file tree

Showing 6 changed files with 336 additions and 454 deletions.
diff --git a/itf-documentation/src/main/asciidoc/release-notes/_release-notes-0.13.0.adoc b/itf-documentation/src/main/asciidoc/release-notes/_release-notes-0.13.0.adoc
@@ -24,6 +24,7 @@
 :issue-323: https://github.com/khmarbaise/maven-it-extension/issues/323[Fixed #323]
 :issue-326: https://github.com/khmarbaise/maven-it-extension/issues/326[Fixed #326]
 :issue-329: https://github.com/khmarbaise/maven-it-extension/issues/329[Fixed #329]
+:issue-331: https://github.com/khmarbaise/maven-it-extension/issues/331[Fixed #331]
 :issue-332: https://github.com/khmarbaise/maven-it-extension/issues/332[Fixed #332]
 :issue-334: https://github.com/khmarbaise/maven-it-extension/issues/334[Fixed #334]
 :issue-342: https://github.com/khmarbaise/maven-it-extension/issues/342[Fixed #342]
@@ -127,6 +128,7 @@
  * {issue-382} - Fixed output directory for html/pdf files.
  * {issue-398} - Make Build working with JDK21.
  * {issue-401} - Upgrade Build Minimum to Maven 3.9.6
+ * {issue-331} - Build failure with Maven 4.0.0-alpha-4
 
 
 The full release notes can be found here {release_0_13_0}[Release 0.13.0].
diff --git a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/MavenVersion.java b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/MavenVersion.java
@@ -33,26 +33,97 @@
 @API(status = EXPERIMENTAL, since = "0.1.0")
 public enum MavenVersion {
   UNKNOWN("UNKOWN"), //TODO: Need to reconsider?
+  /**
+   * Apache Maven Version 3.0.X
+   * Do not use those, because Maven 3.0.X is very old!
+   */
+  @Deprecated
+  M3_0("3.0"),
+  @Deprecated
   M3_0_5("3.0.5"),
+  /**
+   * Apache Maven Version 3.2.X
+   */
+  @Deprecated
+  M3_1("3.1"),
+  @Deprecated
+  M3_1_0("3.1.0"),
+  @Deprecated
   M3_1_1("3.1.1"),
+  /**
+   * Apache Maven Version 3.2.X
+   */
+  @Deprecated
+  M3_2("3.2"),
+  @Deprecated
+  M3_2_1("3.2.1"),
+  @Deprecated
+  M3_2_2("3.2.2"),
+  @Deprecated
+  M3_2_3("3.2.3"),
+  @Deprecated
   M3_2_5("3.2.5"),
+  /**
+   * Apache Maven Version 3.3.X
+   */
+  @Deprecated
+  M3_3("3.3"),
+  @Deprecated
   M3_3_1("3.3.1"),
+  @Deprecated
+  M3_3_3("3.3.3"),
+  @Deprecated
   M3_3_9("3.3.9"),
+  /**
+   * Apache Maven Version 3.5.X
+   */
+  @Deprecated
+  M3_5("3.5"),
+  @Deprecated
   M3_5_0("3.5.0"),
+  @Deprecated
   M3_5_2("3.5.2"),
+  @Deprecated
   M3_5_3("3.5.3"),
+  @Deprecated
   M3_5_4("3.5.4"),
+  /**
+   * Apache Maven Version 3.6.X
+   */
+  M3_6("3.6"),
   M3_6_0("3.6.0"),
   M3_6_1("3.6.1"),
   M3_6_2("3.6.2"),
   M3_6_3("3.6.3"),
+  /**
+   * Apache Maven Version 3.8.X
+   */
+  M3_8("3.8"),
   M3_8_1("3.8.1"),
   M3_8_2("3.8.2"),
   M3_8_3("3.8.3"),
   M3_8_4("3.8.4"),
   M3_8_5("3.8.5"),
   M3_8_6("3.8.6"),
-  M3_9_0("3.9.0");
+  M3_8_7("3.8.7"),
+  M3_8_8("3.8.8"),
+  /**
+   * Apache Maven Version 3.9.X
+   */
+  M3_9("3.9"),
+  M3_9_0("3.9.0"),
+  M3_9_1("3.9.1"),
+  M3_9_2("3.9.2"),
+  M3_9_3("3.9.3"),
+  M3_9_4("3.9.4"),
+  M3_9_5("3.9.5"),
+  M3_9_6("3.9.6"),
+  /**
+   * Apache Maven Version 4.0.X
+   */
+  M4_0("4.0"),
+  M4_0_0("4.0.0"),
+  M4_0_1("4.0.1");
 
   private static final MavenVersion CURRENT_MAVEN_VERSION = determineCurrentVersion();
 

diff --git a/itf-maven-plugin/pom.xml b/itf-maven-plugin/pom.xml
@@ -50,13 +50,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
+      <artifactId>maven-core</artifactId>
       <version>${mavenMinimumVersion}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
+      <artifactId>maven-model</artifactId>
       <version>${mavenMinimumVersion}</version>
       <scope>provided</scope>
     </dependency>
@@ -73,9 +73,20 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-artifact-transfer</artifactId>
-      <version>0.13.1</version>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>3.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-interpolation</artifactId>
+      <version>1.26</version>
+    </dependency>
+    <!-- Need to reconsider this -->
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-aether-provider</artifactId>
+      <version>${mavenMinimumVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
@@ -85,7 +96,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-shared-utils</artifactId>
-      <version>3.3.4</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>