Fixed #496 - Upgrade Maven 4.0.0 to rc-4

Author: khmarbaise

.github/workflows/pull-m4.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Set up Maven
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: 4.0.0-beta-4
+          maven-version: 4.0.0-rc-4
       - name: Build with Maven
         run: mvn verify -Prun-its -e -B -V --no-transfer-progress
 

.github/workflows/push-issue-m4.yml

@@ -39,6 +39,6 @@ jobs:
       - name: Set up Maven
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: 4.0.0-beta-4
+          maven-version: 4.0.0-rc-4
       - name: "Building with Maven."
         run: mvn verify -e -B -V --no-transfer-progress

itf-documentation/src/main/asciidoc/release-notes/_release-notes-0.14.0.adoc

@@ -47,6 +47,7 @@
 :issue-488: https://github.com/khmarbaise/maven-it-extension/issues/488[Fixed #488]
 :issue-492: https://github.com/khmarbaise/maven-it-extension/issues/492[Fixed #492]
 :issue-495: https://github.com/khmarbaise/maven-it-extension/issues/495[Fixed #495]
+:issue-496: https://github.com/khmarbaise/maven-it-extension/issues/496[Fixed #496]
 :issue-499: https://github.com/khmarbaise/maven-it-extension/issues/499[Fixed #499]
 :issue-502: https://github.com/khmarbaise/maven-it-extension/issues/502[Fixed #502]
 :issue-504: https://github.com/khmarbaise/maven-it-extension/issues/504[Fixed #504]
@@ -103,7 +104,7 @@
  * {issue-508} - Upgrade smpp to 7.0.4
  * {issue-511} - Upgrade JUnit-BOM 5.13.0
  * {issue-513} - Upgrade smpp to 7.0.5
-* {issue-???} - ?
+ * {issue-???} - ?
 
 *Build Improvements*
 
@@ -117,6 +118,7 @@
  * {issue-488} - Upgrade to Maven 4.0.0 Beta 4 + Maven 3.9.9
  * {issue-509} - Upgrade asciidoctor-maven-plugin 3.2.0
  * {issue-515} - Maven 4.0.X
+ * {issue-496} - Upgrade to Maven 4.0.0 rc-4
 
 *Documentation Improvements*
 

itf-examples/src/test/java/com/soebes/itf/examples/MvnDirectoryIT.java

@@ -72,7 +72,11 @@ void hidden_files_only(MavenExecutionResult result) {
     assertThat(result)
         .isSuccessful()
         .out()
-        .warn().isEmpty();
+        .warn()
+        //FIXME:This is currently required for Maven 4.0.0-rc-3 because the setup is not yet in alignment with Maven 4.0.0
+        .filteredOn(s -> !s.contains("Pre-Maven 4 legacy encrypted password detected"))
+        .filteredOn(s -> !s.contains("Some problems were encountered while building the effective settings"))
+        .isEmpty();
   }
 
 }

itf-examples/src/test/java/com/soebes/itf/examples/defaults/DefaultsForAllIT.java

@@ -45,10 +45,16 @@ void option_debug(MavenExecutionResult result) {
             "--- jar:3.4.2:jar (default-jar) @ kata-fraction ---",
             "--- site:3.21.0:attach-descriptor (attach-descriptor) @ kata-fraction ---"
         );
+
     assertThat(result)
         .isSuccessful()
         .out()
-        .warn().isEmpty();
+        .warn()
+        //FIXME:This is currently required for Maven 4.0.0-rc-3 because the setup is not yet in alignment with Maven 4.0.0
+        .filteredOn(s -> !s.startsWith("Pre-Maven 4"))
+        .filteredOn(s -> !s.contains("Some problems were encountered while building the effective settings"))
+        .isEmpty();
+
     assertThat(result)
         .isSuccessful()
         .out()

itf-examples/src/test/java/com/soebes/itf/examples/goals/GoalsIT.java

@@ -51,7 +51,11 @@ void no_goals_at_all(MavenExecutionResult result) {
     assertThat(result)
         .isSuccessful()
         .out()
-        .warn().isEmpty();
+        .warn()
+        //FIXME:This is currently required for Maven 4.0.0-rc-3 because the setup is not yet in alignment with Maven 4.0.0
+        .filteredOn(s -> !s.contains("Pre-Maven 4 legacy encrypted password detected"))
+        .filteredOn(s -> !s.contains("Some problems were encountered while building the effective settings"))
+        .isEmpty();
 
   }
 

itf-examples/src/test/java/com/soebes/itf/examples/goals/GoalsOnClassIT.java

@@ -47,7 +47,11 @@ void goal_clean(MavenExecutionResult result) {
     assertThat(result)
         .isSuccessful()
         .out()
-        .warn().isEmpty();
+        .warn()
+        //FIXME:This is currently required for Maven 4.0.0-rc-3 because the setup is not yet in alignment with Maven 4.0.0
+        .filteredOn(s -> !s.contains("Pre-Maven 4 legacy encrypted password detected"))
+        .filteredOn(s -> !s.contains("Some problems were encountered while building the effective settings"))
+        .isEmpty();
   }
 
 }

itf-examples/src/test/java/com/soebes/itf/examples/options/OptionsIT.java

@@ -59,7 +59,11 @@ void no_options_at_all(MavenExecutionResult result) {
     assertThat(result)
         .isSuccessful()
         .out()
-        .warn().isEmpty();
+        .warn()
+        //FIXME:This is currently required for Maven 4.0.0-rc-3 because the setup is not yet in alignment with Maven 4.0.0
+        .filteredOn(s -> !s.contains("Pre-Maven 4 legacy encrypted password detected"))
+        .filteredOn(s -> !s.contains("Some problems were encountered while building the effective settings"))
+        .isEmpty();
     assertThat(result)
         .isSuccessful()
         .out()

itf-examples/src/test/java/com/soebes/itf/examples/profiles/ProfileOnClassIT.java

@@ -46,7 +46,14 @@ void profile_1_2_3(MavenExecutionResult result) {
     assertThat(result)
         .isSuccessful()
         .out()
-        .warn().containsExactly("Message for Profile 1", "Message for Profile 2", "Message for Profile 3");
+        .warn().satisfies(s -> {
+          assertThat(s.get(0)).startsWith("Detected 8 pre-Maven 4 legacy encrypted password(s) - configure password encryption with the help of mvnenc for increased security. @ ");
+          assertThat(s).containsSequence(
+              "Message for Profile 1",
+              "Message for Profile 2",
+              "Message for Profile 3"
+          );
+        });
   }
 
   @MavenTest

pom.xml

@@ -210,7 +210,7 @@
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
-          <excludes combine.children="append">
+          <excludes>
             <exclude>.github/ISSUE_TEMPLATE/feature_request.md</exclude>
             <exclude>.github/ISSUE_TEMPLATE/bug_report.md</exclude>
             <exclude>.github/ISSUE_TEMPLATE/config.yml</exclude>