.gitattributes

@@ -10,3 +10,4 @@
 *.css    text
 *.js     text
 *.sql    text
+*.png    binary

.travis.yml

@@ -10,8 +10,3 @@ install: true
 branches:
     except:
         - gh-pages
-
-
-notifications:
-    email:
-        - olamy@apache.org

Jenkinsfile

@@ -30,9 +30,9 @@ properties(
     ]
 )
 
-final def oses = ['linux':'ubuntu', 'windows':'Windows && !windows-2012-3']
+final def oses = ['linux':'ubuntu && !H24', 'windows':'Windows']
 final def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = [7, 8, 9, 10]
+final def jdks = [7, 8, 9, 10, 11]
 
 final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
@@ -48,8 +48,10 @@ oses.eachWithIndex { osMapping, indexOfOs ->
             final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
             final String stageKey = "${os}-jdk${jdk}-maven${maven}"
 
+// Referenses for TLS:
+// https://central.sonatype.org/articles/2018/May/04/discontinued-support-for-tlsv11-and-below/?__hstc=31049440.ab2fd229e7f8b6176196d9f78621e1f5.1534324377408.1534324377408.1534324377408.1&__hssc=31049440.1.1534324377409&__hsfp=2729160845
             def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+UseNUMA \
--Xms64m -Djava.awt.headless=true'
+-Xms64m -Djava.awt.headless=true -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2'
             if (jdk > 7) {
                 mavenOpts += ' -XX:+UseStringDeduplication'
             }
@@ -69,6 +71,9 @@ oses.eachWithIndex { osMapping, indexOfOs ->
                         def boolean makeReports = os == 'linux' && indexOfMaven == mavens.size() - 1 && jdk == 9
                         def failsafeItPort = 8000 + 100 * indexOfMaven + 10 * indexOfJdk
                         def allOptions = options + ["-Dfailsafe-integration-test-port=${failsafeItPort}", "-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"]
+                        if (jdk == 11) {
+                            allOptions += ['-DskipUnitTests=true']
+                        }
                         buildProcess(stageKey, jdkName, jdkTestName, mvnName, goals, allOptions, mavenOpts, makeReports)
                     }
                 }

README.md

@@ -22,7 +22,7 @@ Usage of [maven-surefire-plugin], [maven-failsafe-plugin], [maven-surefire-repor
 
 [![dependencies](https://www.versioneye.com/java/org.apache.maven.plugins:maven-surefire-plugin/badge.svg?style=plastic)](https://builds.apache.org/job/maven-wip/job/maven-surefire/depgraph-view/) Maven 2.2.1 Plugin API
 
-[![license](http://img.shields.io/:license-apache-red.svg?style=plastic)](http://www.apache.org/licenses/LICENSE-2.0.html) [![tests](https://img.shields.io/jenkins/t/https/builds.apache.org/job/maven-wip/job/maven-surefire/job/master.svg?style=plastic)](https://builds.apache.org/job/maven-wip/job/maven-surefire/job/master/lastBuild/testReport/) [![Build Status](https://builds.apache.org/job/maven-wip/job/maven-surefire/job/master/badge/icon?style=plastic)](https://builds.apache.org/job/maven-wip/job/maven-surefire/job/master/)
+[![license](http://img.shields.io/:license-apache-red.svg?style=plastic)](http://www.apache.org/licenses/LICENSE-2.0.html) [![tests](https://img.shields.io/jenkins/t/https/builds.apache.org/job/maven-box/job/maven-surefire/job/master.svg?style=plastic)](https://builds.apache.org/job/maven-box/job/maven-surefire/job/master/lastBuild/testReport/) [![Build Status](https://builds.apache.org/job/maven-box/job/maven-surefire/job/master/badge/icon?style=plastic)](https://builds.apache.org/job/maven-box/job/maven-surefire/job/master/)
 
 # Development Information
 

debian/changelog

+surefire (2.22.1-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+    - Ignore the new test dependencies
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 23 Oct 2018 11:36:49 +0200
+
 surefire (2.22.0-1) unstable; urgency=medium
 
   * Team upload.

debian/libsurefire-java.poms

@@ -47,5 +47,4 @@ maven-failsafe-plugin/pom.xml --ignore
 maven-surefire-common/pom.xml --has-package-version
 maven-surefire-plugin/pom.xml --has-package-version --relocate=org.apache.maven.plugins:maven-surefire-plugin:2.12.4,org.apache.maven.plugins:maven-surefire-plugin:2.17
 maven-surefire-report-plugin/pom.xml --has-package-version
-surefire-setup-integration-tests/pom.xml --ignore
 surefire-its/pom.xml --ignore

debian/maven.ignoreRules

+net.bytebuddy * * * * *
 org.apache.maven maven-plugin-descriptor * * * *
 org.apache.maven maven-toolchain * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
@@ -11,3 +12,4 @@ org.apache.rat apache-rat-plugin * * * *
 org.codehaus.mojo animal-sniffer-maven-plugin * * * *
 org.jacoco jacoco-maven-plugin * * * *
 org.powermock * * * * *
+org.xmlunit xmlunit-core * * * *

debian/patches/bypass-testng-version-check.patch

@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
-@@ -1364,7 +1364,7 @@
+@@ -1349,7 +1349,7 @@
                  return "org.apache.maven.surefire.testng.conf.TestNG60Configurator";
              }
  
@@ -14,7 +14,7 @@ Forwarded: not-needed
          }
          catch ( InvalidVersionSpecificationException invsex )
          {
-@@ -2032,13 +2032,6 @@
+@@ -2057,13 +2057,6 @@
  
          if ( artifact != null )
          {

debian/patches/fix-junit-provider-selection.patch

@@ -9,7 +9,7 @@ Forwarded: not-needed
 
 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
-@@ -1577,12 +1577,14 @@
+@@ -1562,12 +1562,14 @@
  
      private boolean isJunit47Compatible( Artifact artifact )
      {

debian/patches/jdk-8186647-workaround.patch

 Description: Workaround for a javac regression
 Author: Emmanuel Bourg <ebourg@apache.org>
 Bug: http://bugs.java.com/bugdatabase/view_bug.do?bug_id=JDK-8186647
---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
-@@ -2438,11 +2438,11 @@
-      * Generate the test classpath.
-      *
-      * @return List containing the classpath elements
--     * @throws InvalidVersionSpecificationException
-+     * throws InvalidVersionSpecificationException
-      *                                     when it happens
--     * @throws MojoFailureException        when it happens
--     * @throws ArtifactNotFoundException   when it happens
--     * @throws ArtifactResolutionException when it happens
-+     * throws MojoFailureException        when it happens
-+     * throws ArtifactNotFoundException   when it happens
-+     * throws ArtifactResolutionException when it happens
-      */
-     private Classpath generateTestClasspath()
-         throws InvalidVersionSpecificationException, MojoFailureException, ArtifactResolutionException,
 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
 +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
 @@ -56,7 +56,7 @@

debian/patches/maven-compatibility.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
 +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
-@@ -206,7 +206,7 @@
+@@ -255,7 +255,7 @@
      {
          try
          {

debian/patches/maven-shared-utils-compatibility.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
 +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
-@@ -237,6 +237,10 @@
+@@ -238,6 +238,10 @@
              }
              ppw.endElement(); // TestSuite
          }
@@ -14,7 +14,7 @@ Forwarded: no
          finally
          {
              closeQuietly( fw );
-@@ -323,7 +327,7 @@
+@@ -324,7 +328,7 @@
      }
  
      private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, String reportNameSuffix,
@@ -23,7 +23,7 @@ Forwarded: no
      {
          ppw.startElement( "testcase" );
          ppw.addAttribute( "name", report.getReportName() );
-@@ -346,7 +350,7 @@
+@@ -347,7 +351,7 @@
      }
  
      private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats,
@@ -32,7 +32,7 @@ Forwarded: no
      {
          ppw.startElement( "testsuite" );
  
-@@ -373,7 +377,7 @@
+@@ -374,7 +378,7 @@
  
      private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
                                           WrappedReportEntry report, boolean trimStackTrace, OutputStream fw,
@@ -41,7 +41,7 @@ Forwarded: no
      {
          ppw.startElement( testErrorType );
  
-@@ -418,7 +422,7 @@
+@@ -431,7 +435,7 @@
  
      // Create system-out and system-err elements
      private static void createOutErrElements( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
@@ -50,7 +50,7 @@ Forwarded: no
      {
          EncodingOutputStream eos = new EncodingOutputStream( fw );
          addOutputStreamElement( outputStreamWriter, eos, ppw, report.getStdout(), "system-out" );
-@@ -428,7 +432,7 @@
+@@ -441,7 +445,7 @@
      private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter,
                                           EncodingOutputStream eos, XMLWriter xmlWriter,
                                           Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream,
@@ -59,7 +59,7 @@ Forwarded: no
      {
          if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 )
          {
-@@ -458,7 +462,7 @@
+@@ -471,7 +475,7 @@
       *
       * @param xmlWriter The test suite to report to
       */

debian/patches/maven-shared-utils-dependency.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/maven-surefire-common/pom.xml
 +++ b/maven-surefire-common/pom.xml
-@@ -150,25 +150,6 @@
+@@ -160,25 +160,6 @@
          </executions>
        </plugin>
        <plugin>
@@ -31,7 +31,7 @@ Forwarded: not-needed
            <includes>
 --- a/maven-surefire-report-plugin/pom.xml
 +++ b/maven-surefire-report-plugin/pom.xml
-@@ -148,24 +148,6 @@
+@@ -154,24 +154,6 @@
          </executions>
        </plugin>
        <plugin>

debian/patches/pom.patch

-Description: Disable Maven artifacts not available in Debian
-Author: Miguel Landaeta <miguel@miguel.cc>
-Forwarded: no
-Last-Update: 2011-10-10
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -20,13 +20,6 @@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-   <modelVersion>4.0.0</modelVersion>
- 
--  <parent>
--    <artifactId>maven-parent</artifactId>
--    <groupId>org.apache.maven</groupId>
--    <version>23</version>
--    <relativePath>../pom/maven/pom.xml</relativePath>
--  </parent>
--
-   <groupId>org.apache.maven.surefire</groupId>
-   <artifactId>surefire</artifactId>
-   <version>2.17</version>
-@@ -279,7 +272,7 @@
-     </dependency>
-   </dependencies>
- 
--  <build>
-+<!--  <build>
-     <pluginManagement>
-       <plugins>
-         <plugin>
-@@ -290,8 +283,9 @@
-         <plugin>
-           <artifactId>maven-surefire-plugin</artifactId>
-           <version>${shadedVersion}</version>
--          <configuration>
-+          <configuration>-->
-             <!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! -->
-+            <!--
-             <useSystemClassLoader>false</useSystemClassLoader>
-           </configuration>
-         </plugin>
-@@ -351,7 +345,7 @@
-         </plugin>
-       </plugins>
-     </pluginManagement>
--  </build>
-+  </build>-->
- 
-   <reporting>
-     <plugins>

maven-failsafe-plugin/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>2.22.0</version>
+    <version>2.22.1</version>
   </parent>
 
   <groupId>org.apache.maven.plugins</groupId>
@@ -227,7 +227,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>${mavenPluginPluginVersion}</version>
       </plugin>
     </plugins>
   </reporting>
@@ -318,6 +317,7 @@
             <configuration>
               <javaHome>${jdk.home}</javaHome>
               <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+              <mavenOpts>-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2</mavenOpts>
             </configuration>
           </plugin>
         </plugins>

maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java

@@ -35,6 +35,7 @@
 
 import static java.lang.Boolean.parseBoolean;
 import static java.lang.Integer.parseInt;
+import static java.lang.String.format;
 import static org.apache.commons.lang3.StringEscapeUtils.escapeXml10;
 import static org.apache.commons.lang3.StringEscapeUtils.unescapeXml;
 import static org.apache.maven.surefire.util.internal.StringUtils.UTF_8;
@@ -49,8 +50,11 @@ public final class FailsafeSummaryXmlUtils
     private static final String FAILSAFE_SUMMARY_XML_SCHEMA_LOCATION =
             "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/failsafe-summary.xsd";
 
-    private static final String FAILSAFE_SUMMARY_XML_NIL_ATTR =
-            " xsi:nil=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
+    private static final String MESSAGE_NIL_ELEMENT =
+            "<failureMessage xsi:nil=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>";
+
+    private static final String MESSAGE_ELEMENT =
+            "<failureMessage>%s</failureMessage>";
 
     private static final String FAILSAFE_SUMMARY_XML_TEMPLATE =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -61,7 +65,7 @@ public final class FailsafeSummaryXmlUtils
                     + "    <errors>%d</errors>\n"
                     + "    <failures>%d</failures>\n"
                     + "    <skipped>%d</skipped>\n"
-                    + "    <failureMessage%s>%s</failureMessage>\n"
+                    + "    %s\n"
                     + "</failsafe-summary>";
 
     private FailsafeSummaryXmlUtils()
@@ -102,16 +106,15 @@ public static void fromRunResultToFile( RunResult fromRunResult, File toFailsafe
             throws IOException
     {
         String failure = fromRunResult.getFailure();
-        String xml = String.format( Locale.ROOT, FAILSAFE_SUMMARY_XML_TEMPLATE,
+        String msg = isBlank( failure ) ? MESSAGE_NIL_ELEMENT : format( MESSAGE_ELEMENT, escapeXml10( failure ) );
+        String xml = format( Locale.ROOT, FAILSAFE_SUMMARY_XML_TEMPLATE,
                 fromRunResult.getFailsafeCode(),
                 String.valueOf( fromRunResult.isTimeout() ),
                 fromRunResult.getCompletedCount(),
                 fromRunResult.getErrors(),
                 fromRunResult.getFailures(),
                 fromRunResult.getSkipped(),
-                                          isBlank( failure ) ? FAILSAFE_SUMMARY_XML_NIL_ATTR : "",
-                                          isBlank( failure ) ? "" : escapeXml10( failure )
-        );
+                msg );
 
         FileOutputStream os = new FileOutputStream( toFailsafeSummaryXml );
         try

maven-surefire-common/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>2.22.0</version>
+    <version>2.22.1</version>
   </parent>
 
   <artifactId>maven-surefire-common</artifactId>
@@ -127,6 +127,16 @@
       <artifactId>powermock-api-mockito2</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>net.bytebuddy</groupId>
+      <artifactId>byte-buddy</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.bytebuddy</groupId>
+      <artifactId>byte-buddy-agent</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ClasspathCache.java

@@ -19,7 +19,12 @@
  * under the License.
  */
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.surefire.booter.Classpath;
 
 import javax.annotation.Nonnull;
@@ -41,4 +46,16 @@ public static void setCachedClasspath( @Nonnull String key, @Nonnull Classpath c
     {
         CLASSPATHS.put( key, classpath );
     }
+
+    public static Classpath setCachedClasspath( @Nonnull String key, @Nonnull Set<Artifact> artifacts )
+    {
+        Collection<String> files = new ArrayList<String>();
+        for ( Artifact artifact : artifacts )
+        {
+            files.add( artifact.getFile().getAbsolutePath() );
+        }
+        Classpath classpath = new Classpath( files );
+        setCachedClasspath( key, classpath );
+        return classpath;
+    }
 }

maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java

@@ -72,7 +72,7 @@ private Object createStartupReportConfiguration( @Nonnull StartupReportConfigura
         Constructor<?> constructor = getConstructor( startupReportConfiguration, boolean.class, boolean.class,
                                                            String.class, boolean.class, boolean.class, File.class,
                                                            boolean.class, String.class, File.class, boolean.class,
-                                                           int.class, String.class, String.class );
+                                                           int.class, String.class, String.class, boolean.class );
         //noinspection BooleanConstructorCall
         Object[] params = { reporterConfiguration.isUseFile(), reporterConfiguration.isPrintSummary(),
             reporterConfiguration.getReportFormat(), reporterConfiguration.isRedirectTestOutputToFile(),
@@ -80,7 +80,7 @@ private Object createStartupReportConfiguration( @Nonnull StartupReportConfigura
             reporterConfiguration.isTrimStackTrace(), reporterConfiguration.getReportNameSuffix(),
             reporterConfiguration.getStatisticsFile(), reporterConfiguration.isRequiresRunHistory(),
             reporterConfiguration.getRerunFailingTestsCount(), reporterConfiguration.getXsdSchemaLocation(),
-            reporterConfiguration.getEncoding().name() };
+            reporterConfiguration.getEncoding().name(), reporterConfiguration.isForkMode() };
         return newInstance( constructor, params );
     }