[WIP] Use junit platform runner to run junit 3, junit 4 and TestNG tests via vintage engine and testng engine

surefire-its/src/test/resources/testng-parallel-suites/src/test/resources/testng1.xml → .mvn/extensions.xml

@@ -16,15 +16,20 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="Suite 1 Test" verbose="4">
-
-  <test name="Sample Test 1">
-    <classes>
-      <class name="testng.suiteXml.TestNGSuiteTest"/>
-    </classes>
-  </test>
-
-</suite>
+<extensions>
+  <extension>
+    <groupId>eu.maveniverse.maven.mimir</groupId>
+    <artifactId>extension3</artifactId>
+    <version>0.11.2</version>
+  </extension>
+  <extension>
+    <groupId>org.apache.maven.extensions</groupId>
+    <artifactId>maven-build-cache-extension</artifactId>
+    <version>1.2.1</version>
+  </extension>
+  <extension>
+    <groupId>eu.maveniverse.maven.turbo-builder</groupId>
+    <artifactId>maven-turbo-builder</artifactId>
+    <version>0.13</version>
+  </extension>
+</extensions>

.mvn/maven-build-cache-config.xml

@@ -0,0 +1,92 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<cache xmlns="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0 https://maven.apache.org/xsd/build-cache-config-1.0.0.xsd">
+    <configuration>
+        <enabled>true</enabled>
+        <!-- activated via cli -->
+        <!-- to disable it just use -Dmaven.build.cache.enabled=false -->
+    </configuration>
+    <input>
+        <global>
+            <glob>{*.java,*.xml,*.properties,*.mod,*.adoc}</glob>
+            <excludes>
+                <exclude>*Jenkinsfile*</exclude>
+                <exclude>./idea/*</exclude>
+            </excludes>
+        </global>
+        <plugins>
+            <plugin groupId="org.apache.maven.plugins" artifactId="maven-surefire-plugin">
+                <effectivePom>
+                    <excludeProperties>
+                        <excludeProperty>systemPropertyVariables</excludeProperty>
+                    </excludeProperties>
+                </effectivePom>
+            </plugin>
+        </plugins>
+    </input>
+    <executionControl>
+        <runAlways>
+            <goalsLists>
+                <goalsList artifactId="maven-install-plugin">
+                    <goals>
+                        <goal>install</goal>
+                    </goals>
+                </goalsList>
+                <goalsList artifactId="maven-deploy-plugin">
+                    <goals>
+                        <goal>deploy</goal>
+                    </goals>
+                </goalsList>
+                <goalsList artifactId="docker-maven-plugin">
+                    <goals>
+                        <goal>build</goal>
+                        <goal>push</goal>
+                    </goals>
+                </goalsList>
+            </goalsLists>
+        </runAlways>
+        <reconcile>
+            <plugins>
+                <plugin artifactId="maven-surefire-plugin" goal="test">
+                    <reconciles>
+                      <reconcile propertyName="skip" skipValue="true"/>
+                      <reconcile propertyName="skipExec" skipValue="true"/>
+                      <reconcile propertyName="skipTests" skipValue="true"/>
+                      <reconcile propertyName="test" skipValue="true"/>
+                    </reconciles>
+                    <nologs>
+                        <nolog propertyName="systemPropertyVariables"/>
+                    </nologs>
+                </plugin>
+              <plugin artifactId="maven-failsafe-plugin" goal="integration-test">
+                <reconciles>
+                  <reconcile propertyName="skip" skipValue="true"/>
+                  <reconcile propertyName="skipExec" skipValue="true"/>
+                  <reconcile propertyName="skipTests" skipValue="true"/>
+                  <reconcile propertyName="test" skipValue="true"/>
+                </reconciles>
+                <nologs>
+                  <nolog propertyName="systemPropertyVariables"/>
+                </nologs>
+              </plugin>
+            </plugins>
+        </reconcile>
+    </executionControl>
+</cache>

.mvn/maven.config

@@ -0,0 +1 @@
+-Daether.dependencyCollector.impl=bf

Jenkinsfile

@@ -49,7 +49,7 @@ oses.eachWithIndex { osMapping, indexOfOs ->
             final String stageKey = "${os}-jdk${jdk}-maven${maven}"
 
             def mavenOpts = '-Xms64m -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-            mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
+            mavenOpts += (os == 'linux' ? ' -Xmx2g' : ' -Xmx512m')
 
             if (label == null || jdkName == null || mvnName == null) {
                 println "Skipping ${stageKey} as unsupported by Jenkins Environment."
@@ -64,14 +64,11 @@ oses.eachWithIndex { osMapping, indexOfOs ->
                         boolean first = indexOfOs == 0 && indexOfMaven == 0 && indexOfJdk == 0
                         def failsafeItPort = 8000 + 100 * indexOfMaven + 10 * indexOfJdk
                         def allOptions = options + ['-Djava.awt.headless=true', "-Dfailsafe-integration-test-port=${failsafeItPort}", "-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"]
-
-                        if (!maven.startsWith('3.2') && !maven.startsWith('3.3') && !maven.startsWith('3.5')) {
-                            allOptions += '--no-transfer-progress'
-                        }
+                        allOptions += '--no-transfer-progress'
                         ws(dir: "${os == 'windows' ? "${TEMP}\\${BUILD_TAG}" : pwd()}") {
                             buildProcess(stageKey, jdkName, mvnName,
                                 first  && env.BRANCH_NAME == 'master' ? goalsDepl : goals,
-                                allOptions, mavenOpts, first)
+                                allOptions, mavenOpts, true)
                         }
                     }
                 }
@@ -83,33 +80,6 @@ oses.eachWithIndex { osMapping, indexOfOs ->
 timeout(time: 12, unit: 'HOURS') {
     try {
         parallel(stages)
-        // JENKINS-34376 seems to make it hard to detect the aborted builds
-    } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) {
-        println "org.jenkinsci.plugins.workflow.steps.FlowInterruptedException: ${e}"
-        // this ambiguous condition means a user probably aborted
-        if (e.causes.size() == 0) {
-            currentBuild.result = 'ABORTED'
-        } else {
-            currentBuild.result = 'FAILURE'
-        }
-        throw e
-    } catch (hudson.AbortException e) {
-        println "hudson.AbortException: ${e}"
-        // this ambiguous condition means during a shell step, user probably aborted
-        if (e.getMessage().contains('script returned exit code 143')) {
-            currentBuild.result = 'ABORTED'
-        } else {
-            currentBuild.result = 'FAILURE'
-        }
-        throw e
-    } catch (InterruptedException e) {
-        println "InterruptedException: ${e}"
-        currentBuild.result = 'ABORTED'
-        throw e
-    } catch (Throwable e) {
-        println "Throwable: ${e}"
-        currentBuild.result = 'FAILURE'
-        throw e
     } finally {
         if (env.BRANCH_NAME == 'master') {
             jenkinsNotify()            
@@ -168,10 +138,6 @@ def buildProcess(String stageKey, String jdkName, String mvnName, goals, options
                 unstable(" executing command status= " + errorStatus)
             }
         }
-
-    } catch (Throwable e) {
-        println "Throwable: ${e}"
-        throw e
     } finally {
         try {
             if (makeReports) {
@@ -184,10 +150,6 @@ def buildProcess(String stageKey, String jdkName, String mvnName, goals, options
                         allowEmptyResults: true,
                         keepLongStdio: true,
                         testResults: testReportsPatternCsv())
-
-                if (currentBuild.result == 'UNSTABLE') {
-                    currentBuild.result = 'FAILURE'
-                }
             }
 
             if (errorStatus != 0) {
@@ -213,7 +175,6 @@ static def sourcesPatternCsv() {
             '**/surefire-booter/src/main/java,' +
             '**/surefire-extensions-api/src/main/java,' +
             '**/surefire-extensions-spi/src/main/java,' +
-            '**/surefire-grouper/src/main/java,' +
             '**/surefire-its/src/main/java,' +
             '**/surefire-logger-api/src/main/java,' +
             '**/surefire-providers/**/src/main/java,' +
@@ -230,7 +191,6 @@ static def classPatternCsv() {
             '**/surefire-booter/target/classes,' +
             '**/surefire-extensions-api/target/classes,' +
             '**/surefire-extensions-spi/target/classes,' +
-            '**/surefire-grouper/target/classes,' +
             '**/surefire-its/target/classes,' +
             '**/surefire-logger-api/target/classes,' +
             '**/surefire-providers/**/target/classes,' +
@@ -245,7 +205,6 @@ static def testReportsPatternCsv() {
             '**/maven-surefire-report-plugin/target/surefire-reports/*.xml,' +
             '**/surefire-api/target/surefire-reports/*.xml,' +
             '**/surefire-booter/target/surefire-reports/*.xml,' +
-            '**/surefire-grouper/target/surefire-reports/*.xml,' +
             '**/surefire-its/target/surefire-reports/*.xml,' +
             '**/surefire-logger-api/target/surefire-reports/*.xml,' +
             '**/surefire-providers/**/target/surefire-reports/*.xml,' +

README.md

@@ -70,16 +70,11 @@ Build the Surefire project using **Maven 3.6.3+** and **JDK 8+**.
     ```
     mvn install -P ide-development -f surefire-shared-utils/pom.xml
     ```
-  * Build module `surefire-grouper` in order to generate and compile sources into `target/generated-sources/javacc` using this Maven command:
-    ```
-    mvn compile -f surefire-grouper/pom.xml
-    ```
+
   * In Eclipse, select _File > Import ... > Maven Project_
 
      * Select all projects (poms) except `surefire-shared-utils`,
        enter profile `ide-development` in _Advanced -> Profiles_
-     * Check module `surefire-grouper` has source folder `target/generated-sources/javacc`.
-       If not, add it manually in the module's project properties
   * In IntelliJ, select _Maven > Profiles_ and check `ide-development`
 
 ### Deploying web site

maven-failsafe-plugin/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>3.5.5-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.maven.plugins</groupId>

maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml

@@ -36,7 +36,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml

@@ -36,7 +36,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml

@@ -35,7 +35,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

maven-failsafe-plugin/src/it/multiple-summaries/pom.xml

@@ -35,7 +35,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

maven-failsafe-plugin/src/it/working-directory/pom.xml

@@ -35,7 +35,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>