[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-suite-xml/src/test-data/testng2.xml → .mvn/extensions.xml

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

Jenkinsfile

@@ -213,7 +213,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 +229,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 +243,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>

maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java

@@ -20,8 +20,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import org.apache.maven.plugin.MojoExecutionException;
@@ -86,13 +84,12 @@ public class IntegrationTestMojo extends AbstractSurefireMojo {
      * <code>**{@literal /}${it.test}.java</code>, so you can just type {@code -Dit.test=MyIT} to run
      * a single test file called "foo/MyIT.java". The test patterns prefixed with a <em>!</em> will be excluded.
      * <br>
-     * This parameter overrides the parameter {@code includes} and {@code excludes}, and the TestNG parameter
-     * {@code suiteXmlFiles}.
+     * This parameter overrides the parameter {@code includes} and {@code excludes}.
      * <br>
      * Since 2.7.3 You can execute a limited number of methods in the test with adding <i>#myMethod</i> or
      * <i>#my*ethod</i>. E.g. type {@code -Dit.test=MyIT#myMethod} <b>supported for junit 4.x and TestNg.</b>
      * <br>
-     * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):
+     * Since 2.19 a complex syntax is supported in one parameter:
      * <pre><code>"-Dit.test=???IT, !Unstable*, pkg{@literal /}**{@literal /}Ci*leIT.java, *IT#test*One+testTwo?????, #fast*+slowTest"</code></pre>
      * or e.g.
      * <br>
@@ -231,7 +228,6 @@ public class IntegrationTestMojo extends AbstractSurefireMojo {
      * {@literal <include>}%regex[.*[Cat|Dog].*], !%regex[pkg.*Slow.*.class], pkg{@literal /}**{@literal /}*Fast*.java{@literal </include>}
      * </code></pre>
      * <br>
-     * This parameter is ignored if the TestNG {@code suiteXmlFiles} parameter is specified.<br>
      * <br>
      * <b>Notice that</b> these values are relative to the directory containing generated test classes of the project
      * being tested. This directory is declared by the parameter {@code testClassesDirectory} which defaults
@@ -252,8 +248,6 @@ public class IntegrationTestMojo extends AbstractSurefireMojo {
      * </code></pre>
      * (which excludes all inner classes).
      * <br>
-     * This parameter is ignored if the TestNG {@code suiteXmlFiles} parameter is specified.
-     * <br>
      * Each exclude item may also contain a comma-separated sub-list of items, which will be treated as multiple
      * {@literal <exclude>} entries.<br>
      * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):
@@ -314,6 +308,7 @@ public class IntegrationTestMojo extends AbstractSurefireMojo {
     private int rerunFailingTestsCount;
 
     /**
+     * @deprecated not supported after 3.6.0, please use groups or Junit suite support
      * (TestNG) List of &lt;suiteXmlFile&gt; elements specifying TestNG suite xml file locations. Note that
      * {@code suiteXmlFiles} is incompatible with several other parameters of this plugin, like
      * {@code includes} and {@code excludes}.<br>
@@ -898,17 +893,6 @@ public void setExcludes(List<String> excludes) {
         this.excludes = excludes;
     }
 
-    @Override
-    public File[] getSuiteXmlFiles() {
-        return suiteXmlFiles.clone();
-    }
-
-    @Override
-    @SuppressWarnings("UnusedDeclaration")
-    public void setSuiteXmlFiles(File[] suiteXmlFiles) {
-        this.suiteXmlFiles = suiteXmlFiles.clone();
-    }
-
     @Override
     public String getRunOrder() {
         return runOrder;
@@ -950,16 +934,6 @@ protected void setUseModulePath(boolean useModulePath) {
         this.useModulePath = useModulePath;
     }
 
-    @Override
-    protected final List<File> suiteXmlFiles() {
-        return hasSuiteXmlFiles() ? Arrays.asList(suiteXmlFiles) : Collections.<File>emptyList();
-    }
-
-    @Override
-    protected final boolean hasSuiteXmlFiles() {
-        return suiteXmlFiles != null && suiteXmlFiles.length != 0;
-    }
-
     @Override
     protected final ForkNodeFactory getForkNode() {
         return forkNode;

maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java

@@ -161,14 +161,14 @@ public class VerifyMojo extends AbstractMojo implements SurefireReportParameters
     @Parameter(defaultValue = "${session}", readonly = true)
     private MavenSession session;
 
-    private final Logger logger;
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private Collection<CommandLineOption> cli;
 
-    private volatile PluginConsoleLogger consoleLogger;
+    private volatile PluginConsoleLogger consoleLogger = new PluginConsoleLogger(logger);
 
     public VerifyMojo() {
-        this.logger = LoggerFactory.getLogger(getClass());
+        //
     }
 
     public VerifyMojo(Logger logger) {

maven-surefire-common/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>
 
   <artifactId>maven-surefire-common</artifactId>
@@ -178,6 +178,12 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.jacoco</groupId>