.travis.yml

+language: java
+jdk:
+  - oraclejdk8
+#  - oraclejdk9
+
+script: "rm -rf .repository && mvn --show-version --errors --batch-mode -Prun-its clean install -Dmaven.repo.local=.repository -Denforcer.skip=true -e"
+
+install: true
+
+branches:
+    except:
+        - gh-pages
+
+
+notifications:
+    email:
+        - olamy@apache.org

Jenkinsfile

-pipeline {
-    agent none
-    stages {
-        stage('Parallel Unix and Windows Build') {
-            steps {
-                parallel unix: {
-                    node("${env.NIX_LABEL}") {
-                        checkout scm
-                        withEnv(["JAVA_HOME=${tool('JDK 1.8.0_144')}", "PATH+MAVEN=${tool('Maven 3.5.0')}/bin:${env.JAVA_HOME}/bin"]) {
-                            sh "mvn clean install jacoco:report -B -U -e -fae -V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false -Dintegration-test-port=8084   \\\"-Djdk.home=${tool('JDK 9 b181')}\\\""
-                        }
-                        jacoco changeBuildStatus: false, execPattern: '**/*.exec', sourcePattern: '**/src/main/java', exclusionPattern: 'pkg/*.class,plexusConflict/*.class,**/surefire570/**/*.class,siblingAggregator/*.class,surefire257/*.class,surefire979/*.class,org/apache/maven/surefire/crb/*.class,org/apache/maven/plugins/surefire/selfdestruct/*.class,org/apache/maven/plugins/surefire/dumppid/*.class,org/apache/maven/plugin/surefire/*.class,org/apache/maven/plugin/failsafe/*.class,jiras/**/*.class,org/apache/maven/surefire/testng/*.class,org/apache/maven/surefire/testprovider/*.class,**/test/*.class,**/org/apache/maven/surefire/group/parse/*.class'
-                        junit healthScaleFactor: 0.0, allowEmptyResults: true, keepLongStdio: true, testResults: '**/surefire-integration-tests/target/failsafe-reports/**/*.xml,**/surefire-integration-tests/target/surefire-reports/**/*.xml,**/maven-*/target/surefire-reports/**/*.xml,**/surefire-*/target/surefire-reports/**/*.xml,**/common-*/target/surefire-reports/**/*.xml'
-                    }
-                },
-                windows: {
-                    node("${env.WIN_LABEL}") {
-                        checkout scm
-                        withEnv(["JAVA_HOME=${tool('JDK 1.8_121 (Windows Only)')}", "PATH+MAVEN=${tool('Maven 3.5.0 (Windows)')}\\bin;${env.JAVA_HOME}\\bin"]) {
-                            bat "mvn clean install jacoco:report -B -U -e -fae -V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false -Dintegration-test-port=8084"
-                        }
+#!/usr/bin/env groovy
+
+/*
+ * 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.
+ */
+
+properties(
+    [
+        buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '0', daysToKeepStr: env.BRANCH_NAME == 'master' ? '30' : '7', numToKeepStr: '5')),
+        disableConcurrentBuilds()
+    ]
+)
+
+final def oses = ['linux', 'windows']
+final def mavens = ['3.2.x', '3.3.x', '3.5.x']//env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
+final def jdks = [7, 8, 9, 10]//env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] : [9, 10]
+
+final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
+final def goals = ['clean', 'install', 'jacoco:report']
+final Map stages = [:]
+
+oses.eachWithIndex { os, indexOfOs ->
+    mavens.eachWithIndex { maven, indexOfMaven ->
+        jdks.eachWithIndex { jdk, indexOfJdk ->
+            final String label = jenkinsEnv.labelForOS(os);
+            final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk.toString())
+            final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+            final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+            final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+
+            def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+            if (jdk > 7) {
+                mavenOpts += ' -XX:+UseStringDeduplication'
+            }
+            mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
+
+            if (label == null || jdkTestName == null || mvnName == null) {
+                println "Skipping ${stageKey} as unsupported by Jenkins Environment."
+                return;
+            }
+
+            println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, Maven: ${mvnName}."
+
+            stages[stageKey] = {
+                node(label) {
+                    timestamps {
+                        //https://github.com/jacoco/jacoco/issues/629
+                        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}"]
+                        buildProcess(stageKey, jdkName, jdkTestName, mvnName, goals, allOptions, mavenOpts, makeReports)
                     }
                 }
             }
         }
     }
-    options {
-        buildDiscarder(logRotator(numToKeepStr:'3'))
-        timeout(time: 10, unit: 'HOURS')
+}
+
+timeout(time: 10, 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) {
+        // 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) {
+        // 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) {
+        currentBuild.result = "ABORTED"
+        throw e
+    } catch (Throwable e) {
+        currentBuild.result = "FAILURE"
+        throw e
+    } finally {
+        stage("notifications") {
+            //jenkinsNotify()
+        }
+    }
+}
+
+def buildProcess(String stageKey, String jdkName, String jdkTestName, String mvnName, goals, options, mavenOpts, boolean makeReports) {
+    cleanWs()
+    try {
+        if (isUnix()) {
+            sh 'mkdir -p .m2'
+        } else {
+            bat 'mkdir .m2'
+        }
+
+        def mvnLocalRepoDir = null
+        dir('.m2') {
+            mvnLocalRepoDir = "${pwd()}"
+        }
+        println "Maven Local Repository = ${mvnLocalRepoDir}."
+        assert mvnLocalRepoDir != null : 'Local Maven Repository is undefined.'
+
+        stage("checkout ${stageKey}") {
+            checkout scm
+        }
+
+        def properties = ["-Djacoco.skip=${!makeReports}", "\"-Dmaven.repo.local=${mvnLocalRepoDir}\""]
+        println "Setting JDK for testing ${jdkName}"
+        def cmd = ['mvn'] + goals + options + properties
+
+        stage("build ${stageKey}") {
+            if (isUnix()) {
+                withEnv(["JAVA_HOME=${tool(jdkName)}",
+                         "JAVA_HOME_IT=${tool(jdkTestName)}",
+                         "MAVEN_OPTS=${mavenOpts}",
+                         "PATH+MAVEN=${tool(mvnName)}/bin:${env.JAVA_HOME}/bin"
+                ]) {
+                    sh 'echo JAVA_HOME=$JAVA_HOME, JAVA_HOME_IT=$JAVA_HOME_IT'
+                    def script = cmd + ['\"-Djdk.home=$JAVA_HOME_IT\"']
+                    sh script.join(' ')
+                }
+            } else {
+                withEnv(["JAVA_HOME=${tool(jdkName)}",
+                         "JAVA_HOME_IT=${tool(jdkTestName)}",
+                         "MAVEN_OPTS=${mavenOpts}",
+                         "PATH+MAVEN=${tool(mvnName)}\\bin;${env.JAVA_HOME}\\bin"
+                ]) {
+                    bat 'echo JAVA_HOME=%JAVA_HOME%, JAVA_HOME_IT=%JAVA_HOME_IT%'
+                    def script = cmd + ['\"-Djdk.home=%JAVA_HOME_IT%\"']
+                    bat script.join(' ')
+                }
+            }
+        }
+    } finally {
+        stage("reporting ${stageKey}") {
+            if (makeReports) {
+                openTasks(ignoreCase: true, canComputeNew: false, defaultEncoding: 'UTF-8', pattern: sourcesPatternCsv(),
+                        high: tasksViolationHigh(), normal: tasksViolationNormal(), low: tasksViolationLow())
+
+                jacoco(changeBuildStatus: false,
+                        execPattern: '**/*.exec',
+                        sourcePattern: sourcesPatternCsv(),
+                        classPattern: classPatternCsv())
+
+                junit(healthScaleFactor: 0.0,
+                        allowEmptyResults: true,
+                        keepLongStdio: true,
+                        testResults: testReportsPatternCsv())
+
+                if (currentBuild.result == 'UNSTABLE') {
+                    currentBuild.result = 'FAILURE'
+                }
+            }
+
+            if (fileExists('maven-failsafe-plugin/target/it')) {
+                zip(zipFile: "it--maven-failsafe-plugin--${stageKey}.zip", dir: 'maven-failsafe-plugin/target/it', archive: true)
+            }
+
+            if (fileExists('surefire-its/target')) {
+                zip(zipFile: "it--surefire-its--${stageKey}.zip", dir: 'surefire-its/target', archive: true)
+            }
+
+            archiveArtifacts(artifacts: '*.zip', allowEmptyArchive: true, onlyIfSuccessful: false)
+        }
+
+        stage("cleanup ${stageKey}") {
+            // clean up after ourselves to reduce disk space
+            cleanWs()
+        }
     }
 }
+
+@NonCPS
+static def sourcesPatternCsv() {
+    return '**/maven-failsafe-plugin/src/main/java,' +
+            '**/maven-surefire-common/src/main/java,' +
+            '**/maven-surefire-plugin/src/main/java,' +
+            '**/maven-surefire-report-plugin/src/main/java,' +
+            '**/surefire-api/src/main/java,' +
+            '**/surefire-booter/src/main/java,' +
+            '**/surefire-grouper/src/main/java,' +
+            '**/surefire-its/src/main/java,' +
+            '**/surefire-logger-api/src/main/java,' +
+            '**/surefire-providers/**/src/main/java,' +
+            '**/surefire-report-parser/src/main/java'
+}
+
+@NonCPS
+static def classPatternCsv() {
+    return '**/maven-failsafe-plugin/target/classes,' +
+            '**/maven-surefire-common/target/classes,' +
+            '**/maven-surefire-plugin/target/classes,' +
+            '**/maven-surefire-report-plugin/target/classes,' +
+            '**/surefire-api/target/classes,' +
+            '**/surefire-booter/target/classes,' +
+            '**/surefire-grouper/target/classes,' +
+            '**/surefire-its/target/classes,' +
+            '**/surefire-logger-api/target/classes,' +
+            '**/surefire-providers/**/target/classes,' +
+            '**/surefire-report-parser/target/classes'
+}
+
+@NonCPS
+static def tasksViolationLow() {
+    return '@SuppressWarnings'
+}
+
+@NonCPS
+static def tasksViolationNormal() {
+    return 'TODO,FIXME,@deprecated'
+}
+
+@NonCPS
+static def tasksViolationHigh() {
+    return 'finalize(),Locale.setDefault,TimeZone.setDefault,\
+System.out,System.err,System.setOut,System.setErr,System.setIn,System.exit,System.gc,System.runFinalization,System.load'
+}
+
+@NonCPS
+static def testReportsPatternCsv() {
+    return '**/maven-failsafe-plugin/target/surefire-reports/*.xml,' +
+            '**/maven-surefire-common/target/surefire-reports/*.xml,' +
+            '**/maven-surefire-plugin/target/surefire-reports/*.xml,' +
+            '**/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,' +
+            '**/surefire-report-parser/target/surefire-reports/*.xml,' +
+            '**/surefire-its/target/failsafe-reports/*.xml'
+}

README.md

@@ -20,9 +20,9 @@ Usage of [maven-surefire-plugin], [maven-failsafe-plugin], [maven-surefire-repor
 
 # Build Status
 
-[![dependencies](https://www.versioneye.com/java/org.apache.maven.plugins:maven-surefire-plugin/badge.svg?style=plastic)](https://builds.apache.org/job/maven-surefire/depgraph-view/) Maven 2.2.1 Plugin API
+[![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/view/M-R/view/Maven/job/maven-surefire-pipeline/job/master.svg?style=plastic)](https://builds.apache.org/view/M-R/view/Maven/job/maven-surefire-pipeline/job/master/lastBuild/testReport/) [![Build Status](https://builds.apache.org/view/M-R/view/Maven/job/maven-surefire-pipeline/job/master/badge/icon?style=plastic)](https://builds.apache.org/view/M-R/view/Maven/job/maven-surefire-pipeline/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-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/)
 
 # Development Information
 
@@ -31,10 +31,12 @@ In order to build Surefire project use **Maven 3.1.0+** and **JDK 1.8**.
 But in order to run IT tests, you can do:   
 
 * In order to run tests for a release check during the vote the following memory requirements are needed:   
-  **(on Linux/Unix)** *export MAVEN_OPTS="-Xmx768m -XX:MaxMetaspaceSize=864m -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true"*  
-  **(on Windows)** *set MAVEN_OPTS="-Xmx768m -XX:MaxMetaspaceSize=864m -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true"*    
+  **(on Linux/Unix)** *export MAVEN_OPTS="-server -Xmx512m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Dhttps.protocols=TLSv1"*  
+  **(on Windows)** *set MAVEN_OPTS="-server -Xmx256m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Dhttps.protocols=TLSv1"*    
 * In order to run the build with **JDK 9** **on Windows** (**on Linux/Unix modify system property jdk.home**):  
-  *mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program Files\Java\jdk9\"* 
+  *mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program Files\Java\jdk9\"*
+* In order to run the build with **JDK 10** disable JaCoCo due to a [bug in JaCoCo](https://github.com/jacoco/jacoco/issues/629)
+  *mvn install site site:stage -P reporting,run-its -Djacoco.skip=true "-Djdk.home=e:\Program Files\Java\jdk10\"*
   
 ### Deploying web site
 

debian/changelog

+surefire (2.21.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+    - Updated the Maven rules
+    - New dependency on libplexus-languages-java
+  * Depend on libcommons-lang3-java (>= 3.7) to ensure
+    the compatibility with Java 10
+  * Use salsa.debian.org Vcs-* URLs
+  * Standards-Version updated to 4.1.4
+  * Removed debian/orig-tar.sh
+  * Converted debian/copyright to the Copyright Format 1.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 04 May 2018 11:20:54 +0200
+
 surefire (2.20.1-3) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -9,7 +9,7 @@ Build-Depends-Indep: javacc,
                      junit4,
                      libbuild-helper-maven-plugin-java,
                      libcommons-io-java,
-                     libcommons-lang3-java,
+                     libcommons-lang3-java (>= 3.7),
                      libfest-assert-java,
                      libjavacc-maven-plugin-java,
                      libjcip-annotations-java,
@@ -24,13 +24,14 @@ Build-Depends-Indep: javacc,
                      libmaven-shade-plugin-java,
                      libmaven-shared-utils-java,
                      libmockito-java,
+                     libplexus-languages-java,
                      libplexus-velocity-java,
                      maven-debian-helper (>= 2.0),
                      testng,
                      velocity
-Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/surefire.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/surefire.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/surefire.git
+Vcs-Browser: https://salsa.debian.org/java-team/surefire
 Homepage: http://maven.apache.org/surefire/
 
 Package: libsurefire-java

debian/copyright

-This package was debianized by Torsten Werner <twerner@debian.org>.
-
-The Debian packaging is Copyright (c) 2008 Torsten Werner and is
-licensed under the GNU General Public License version 3. On Debian
-systems, the complete text of the GNU General Public License can be
-found in '/usr/share/common-licenses/GPL-3'.
-
-The package was downloaded from <http://maven.apache.org/surefire/>.
-
-Copyright: 2005-2008 The Apache Software Foundation.
-
-License:
-
-  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.
-
-The full text of the license can be found in
-`/usr/share/common-licenes/Apache-2.0'.
-
-----------
-
-Files: surefire-api/src/main/java/org/apache/maven/surefire/util/Nested*.java
-
-Copyright:
-
-  2005-2007 Spring Framework Project
-  2005-2008 The Apache Software Foundation.
-
-License: Apache 2.0 (see above)
-
-Those files have been originally developed by
-<http://www.springsource.org>.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Maven Surefire
+Source: https://github.com/apache/maven-surefire
+
+Files: *
+Copyright: 2005-2018, The Apache Software Foundation
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2009-2011, Torsten Werner <twerner@debian.org>
+           2009, Ludovic Claude <ludovic.claude@laposte.net>
+           2011-2012, Miguel Landaeta <miguel@miguel.cc>
+           2012, Damien Raude-Morvan <drazzib@debian.org>
+           2013-2018, Emmanuel Bourg <ebourg@apache.org>
+           2016, Markus Koschany <apo@debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'

debian/libsurefire-java.poms

@@ -47,4 +47,4 @@ 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-integration-tests/pom.xml --ignore
+surefire-its/pom.xml --ignore

debian/maven.ignoreRules

@@ -9,4 +9,5 @@ org.apache.maven.plugins maven-scm-publish-plugin * * * *
 org.apache.maven.plugins maven-surefire-plugin * * * *
 org.apache.rat apache-rat-plugin * * * *
 org.codehaus.mojo animal-sniffer-maven-plugin * * * *
-org.powermock powermock-mockito-release-full * * * *
+org.jacoco jacoco-maven-plugin * * * *
+org.powermock * * * * *

debian/orig-tar.sh

-#!/bin/sh -e
-
-VERSION=$2
-TAR=../surefire_$VERSION.orig.tar.xz
-DIR=surefire-$VERSION
-TAG=$(echo surefire-$VERSION | sed s/~RC/-RC/ )
-
-rm $3
-
-git clone http://git.apache.org/maven-surefire.git $DIR
-cd $DIR
-git checkout tags/$TAG
-cd ..
-rm -Rf $DIR/.git
-
-XZ_OPT=--best tar -c -J -f $TAR $DIR
-rm -rf $DIR ../$TAG

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
-@@ -1284,7 +1284,7 @@
+@@ -1319,7 +1319,7 @@
                  return "org.apache.maven.surefire.testng.conf.TestNG60Configurator";
              }
  
@@ -14,7 +14,7 @@ Forwarded: not-needed
          }
          catch ( InvalidVersionSpecificationException invsex )
          {
-@@ -1890,13 +1890,6 @@
+@@ -1987,13 +1987,6 @@
  
          if ( artifact != null )
          {

debian/patches/doxia-compatibility.patch

@@ -9,6 +9,6 @@ Forwarded: no
  import org.apache.maven.doxia.sink.Sink;
 -import org.apache.maven.doxia.sink.SinkEventAttributeSet;
 +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
- import org.apache.maven.doxia.sink.SinkEventAttributes;
  import org.apache.maven.doxia.util.DoxiaUtils;
  import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
+ import org.apache.maven.reporting.MavenReportException;

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
-@@ -1497,12 +1497,14 @@
+@@ -1532,12 +1532,14 @@
  
      private boolean isJunit47Compatible( Artifact artifact )
      {

debian/patches/jdk-8186647-workaround.patch

@@ -3,7 +3,7 @@ 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
-@@ -2233,11 +2233,11 @@
+@@ -2377,11 +2377,11 @@
       * Generate the test classpath.
       *
       * @return List containing the classpath elements
@@ -21,24 +21,15 @@ Bug: http://bugs.java.com/bugdatabase/view_bug.do?bug_id=JDK-8186647
          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
-@@ -136,7 +136,7 @@
+@@ -56,7 +56,7 @@
       * @param config               The startup configuration
-      * @param threadNumber         the thread number, to be the replacement in the argLine   @return A commandline
+      * @param forkNumber           index of forked JVM, to be the replacement in the argLine
       * @return CommandLine able to flush entire command going to be sent to forked JVM
 -     * @throws org.apache.maven.surefire.booter.SurefireBooterForkException
 +     * throws org.apache.maven.surefire.booter.SurefireBooterForkException
       *          when unable to perform the fork
       */
-     public OutputStreamFlushableCommandline createCommandLine( List<String> classPath, StartupConfiguration config,
-@@ -283,7 +283,7 @@
-      * @param classPath      List&lt;String&gt; of all classpath elements.
-      * @param startClassName  The classname to start (main-class)
-      * @return The file pointint to the jar
--     * @throws java.io.IOException When a file operation fails.
-+     * throws java.io.IOException When a file operation fails.
-      */
-     private File createJar( List<String> classPath, String startClassName )
-         throws IOException
+     @Nonnull
 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
 +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
 @@ -52,7 +52,7 @@

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
-@@ -139,25 +139,6 @@
+@@ -150,25 +150,6 @@
          </executions>
        </plugin>
        <plugin>
@@ -28,7 +28,7 @@ Forwarded: not-needed
 -      <plugin>
          <artifactId>maven-surefire-plugin</artifactId>
          <configuration>
-           <jvm>${jdk.home}/bin/java</jvm>
+           <includes>
 --- a/maven-surefire-report-plugin/pom.xml
 +++ b/maven-surefire-report-plugin/pom.xml
 @@ -148,24 +148,6 @@
@@ -55,4 +55,4 @@ Forwarded: not-needed
 -      <plugin>
          <artifactId>maven-surefire-plugin</artifactId>
          <configuration>
-           <classpathDependencyExcludes>
+           <useSystemClassLoader>true</useSystemClassLoader>

debian/watch

 version=3
-https://github.com/apache/maven-surefire/releases .*/surefire-([\d\.]+).tar.gz debian debian/orig-tar.sh
+opts="repack,compression=xz" \
+https://github.com/apache/maven-surefire/tags .*/surefire-([\d\.]+).tar.gz

maven-failsafe-plugin/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>2.20.1</version>
+    <version>2.21.0</version>
   </parent>
 
   <groupId>org.apache.maven.plugins</groupId>
@@ -41,6 +41,8 @@
   <properties>
     <thisPlugin>Failsafe</thisPlugin>
     <thatPlugin>Surefire</thatPlugin>
+    <failsafe-integration-test-port>8084</failsafe-integration-test-port>
+    <failsafe-integration-test-stop-port>8085</failsafe-integration-test-stop-port>
   </properties>
 
   <dependencies>
@@ -56,6 +58,10 @@
       <type>zip</type>
       <classifier>site-source</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-shared-utils</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -104,6 +110,11 @@
             <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
+        <configuration>
+          <includes>
+            <include>**/JUnit4SuiteTest.java</include>
+          </includes>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -284,6 +295,7 @@
                   <goals>
                     <goal>clean</goal>
                     <goal>verify</goal>
+                    <goal>-nsu</goal>
                   </goals>
                   <setupIncludes>
                     <setupInclude>dummy-*/pom.xml</setupInclude>
@@ -296,10 +308,15 @@
                   <skipInvocation>${skipTests}</skipInvocation>
                   <streamLogs>false</streamLogs>
                   <showErrors>true</showErrors>
+                  <properties>
+                    <integration-test-port>${failsafe-integration-test-port}</integration-test-port>
+                    <integration-test-stop-port>${failsafe-integration-test-stop-port}</integration-test-stop-port>
+                  </properties>
                 </configuration>
               </execution>
             </executions>
             <configuration>
+              <javaHome>${jdk.home}</javaHome>
               <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
             </configuration>
           </plugin>

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

@@ -118,14 +118,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
@@ -135,6 +127,8 @@
     <integration-test-port>8083</integration-test-port>
     <integration-test-stop-port>18009</integration-test-stop-port>
     <jetty-version>9.2.2.v20140723</jetty-version>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
   </properties>
 
 </project>

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

@@ -118,14 +118,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
@@ -135,6 +127,8 @@
     <integration-test-port>8083</integration-test-port>
     <integration-test-stop-port>18009</integration-test-stop-port>
     <jetty-version>9.2.2.v20140723</jetty-version>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
   </properties>
 
 </project>

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

@@ -25,6 +25,12 @@
   <artifactId>working-directory-test</artifactId>
   <version>1.0</version>
   <name>Run tests multiple times</name>
+
+  <properties>
+    <maven.compiler.source>1.6</maven.compiler.source>
+    <maven.compiler.target>1.6</maven.compiler.target>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>

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

@@ -25,6 +25,12 @@
   <artifactId>working-directory-test</artifactId>
   <version>1.0</version>
   <name>Run tests multiple times</name>
+
+  <properties>
+    <maven.compiler.source>1.6</maven.compiler.source>
+    <maven.compiler.target>1.6</maven.compiler.target>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>