Fixes

Author: cstamas

.github/workflows/maven-verify-3.10.x.yml

@@ -26,8 +26,7 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v5
     with:
-      maven-args: '-D"maven.test.redirectTestOutputToFile=false -Pmaven3.10"'
       maven4-enabled: false
-      ff-goal: '-P run-its verify javadoc:jar'
-      verify-goal: '-P run-its verify javadoc:jar'
+      ff-goal: '-P run-its,maven3.10 verify javadoc:jar'
+      verify-goal: '-P run-its,maven3.10 verify javadoc:jar'
 

.github/workflows/maven-verify-4.0.x.yml

@@ -26,9 +26,8 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v5
     with:
-      maven-args: '-D"maven.test.redirectTestOutputToFile=false -Pmaven4.0"'
       maven4-enabled: true
       matrix-exclude: '[ {"jdk": "8"} ]'
-      ff-goal: '-P run-its verify javadoc:jar'
-      verify-goal: '-P run-its verify javadoc:jar'
+      ff-goal: '-P run-its,maven4.0 verify javadoc:jar'
+      verify-goal: '-P run-its,maven4.0 verify javadoc:jar'
 

.github/workflows/maven-verify.yml

@@ -26,7 +26,6 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v5
     with:
-      maven-args: '-D"maven.test.redirectTestOutputToFile=false"'
       maven4-enabled: false
       ff-goal: '-P run-its verify javadoc:jar'
       verify-goal: '-P run-its verify javadoc:jar'

pom.xml

@@ -65,8 +65,10 @@ under the License.
     <minimalJavaBuildVersion>11</minimalJavaBuildVersion>
     <classWorldsVersion>2.6.0</classWorldsVersion>
 
-    <!-- default maven version, will be overridden by mavenX profile -->
+    <!-- default maven version we build against -->
     <mavenVersion>3.9.16</mavenVersion>
+    <!-- default maven version we test against, will be overridden by mavenX profile -->
+    <maven.version>${mavenVersion}</maven.version>
     <maven.dir>maven3.9</maven.dir>
     <maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>
 
@@ -469,7 +471,7 @@ under the License.
                 <artifactItem>
                   <groupId>org.apache.maven</groupId>
                   <artifactId>apache-maven</artifactId>
-                  <version>${mavenVersion}</version>
+                  <version>${maven.version}</version>
                   <classifier>bin</classifier>
                   <type>tar.gz</type>
                   <overWrite>false</overWrite>
@@ -573,15 +575,15 @@ under the License.
     <profile>
       <id>maven3.10</id>
       <properties>
-        <mavenVersion>3.10.0-rc-1</mavenVersion>
+        <maven.version>3.10.0-rc-1</maven.version>
         <maven.dir>maven3.10</maven.dir>
         <maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>
       </properties>
     </profile>
     <profile>
       <id>maven4.0</id>
       <properties>
-        <mavenVersion>4.0.0-rc-5</mavenVersion>
+        <maven.version>4.0.0-rc-5</maven.version>
         <maven.dir>maven4.0</maven.dir>
         <maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>
       </properties>

src/test/java/org/apache/maven/buildcache/its/BuildExtensionTest.java

@@ -60,7 +60,7 @@ void skipSaving(Verifier verifier) throws VerificationException, IOException {
         verifier.getCliOptions().clear();
         verifier.addCliOption("-D" + CACHE_LOCATION_PROPERTY_NAME + "=" + tempDirectory.toAbsolutePath());
         verifier.addCliOption("-D" + SKIP_SAVE + "=true");
-        verifier.addCliOption("--debug");
+        verifier.addCliOption("--verbose"); // --debug means REMOTE DEBUGGING with Maven 4 (and always was)
 
         verifier.setLogFileName("../log-1.txt");
         verifier.executeGoal("verify");

src/test/java/org/apache/maven/buildcache/its/MandatoryCleanTest.java

@@ -52,7 +52,7 @@ void simple(Verifier verifier) throws VerificationException, IOException {
         Path tempDirectory = Files.createTempDirectory("simple-mandatory-clean");
         verifier.getCliOptions().clear();
         verifier.addCliOption("-D" + CACHE_LOCATION_PROPERTY_NAME + "=" + tempDirectory.toAbsolutePath());
-        verifier.addCliOption("--debug");
+        verifier.addCliOption("--verbose"); // --debug means REMOTE DEBUGGING with Maven 4 (and always was)
 
         verifier.setLogFileName("../log-1.txt");
         verifier.executeGoal("verify");
@@ -100,7 +100,7 @@ void simple(Verifier verifier) throws VerificationException, IOException {
     void disabledViaProperty(Verifier verifier) throws VerificationException {
 
         verifier.setAutoclean(false);
-        verifier.addCliOption("--debug");
+        verifier.addCliOption("--verbose"); // --debug means REMOTE DEBUGGING with Maven 4 (and always was)
 
         verifier.setLogFileName("../log-1.txt");
         verifier.executeGoal("verify");
@@ -120,7 +120,7 @@ void disabledViaProperty(Verifier verifier) throws VerificationException {
 
         verifier.setLogFileName("../log-2.txt");
         verifier.getCliOptions().clear();
-        verifier.addCliOption("--debug");
+        verifier.addCliOption("--verbose"); // --debug means REMOTE DEBUGGING with Maven 4 (and always was)
         // With "true", we do not change the initially expected behaviour
         verifier.addCliOption("-D" + CacheConfigImpl.MANDATORY_CLEAN + "=true");
         verifier.executeGoal("verify");
@@ -140,7 +140,7 @@ void disabledViaProperty(Verifier verifier) throws VerificationException {
 
         // With "false", we remove the need for the clean phase
         verifier.getCliOptions().clear();
-        verifier.addCliOption("--debug");
+        verifier.addCliOption("--verbose"); // --debug means REMOTE DEBUGGING with Maven 4 (and always was)
         verifier.addCliOption("-D" + CacheConfigImpl.MANDATORY_CLEAN + "=false");
         verifier.setLogFileName("../log-3.txt");
         verifier.executeGoal("verify");