You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2022/04/03 12:24:17 UTC
[maven-surefire] branch release/2.22.3 updated (d82a089 -> 10d4fc7)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch release/2.22.3
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
discard d82a089 a probable root cause extractExternalJavaVersion
discard 57869d1 a probable root cause illegal-access
discard f5049c3 a probable root cause
discard 6c2322b a probable root cause
discard 35a5580 removed ${jacoco.agent}
discard fd27e22 JDK 18 support
new 10d4fc7 JDK 18 support
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d82a089)
\
N -- N -- N refs/heads/release/2.22.3 (10d4fc7)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 2 +-
.../maven/surefire/its/CheckTestNgVersionsIT.java | 10 ++++------
.../its/JUnit47RerunFailingTestWithCucumberIT.java | 2 +-
.../org/apache/maven/surefire/its/Java9FullApiIT.java | 19 +++++++++++++------
.../maven/surefire/its/fixture/SurefireLauncher.java | 4 +++-
.../src/test/resources/java9-full-api/pom.xml | 2 +-
surefire-its/src/test/resources/testng-simple/pom.xml | 2 +-
7 files changed, 24 insertions(+), 17 deletions(-)
[maven-surefire] 01/01: JDK 18 support
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch release/2.22.3
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 10d4fc7b08a6fbba2b1663cf6ac1ccb1b5a57af3
Author: tibordigana <ti...@apache.org>
AuthorDate: Fri Apr 1 23:42:15 2022 +0200
JDK 18 support
---
Jenkinsfile | 6 +--
README.md | 4 +-
.../src/it/jetty-war-test-failing/pom.xml | 9 ++++
.../src/it/jetty-war-test-passing/pom.xml | 9 ++++
.../src/it/multiple-summaries-failing/pom.xml | 4 +-
.../src/it/multiple-summaries/pom.xml | 4 +-
.../src/it/working-directory/pom.xml | 4 +-
.../src/site/apt/examples/cucumber.apt.vm | 8 +--
pom.xml | 3 +-
.../maven/surefire/its/AbstractJigsawIT.java | 39 ++++++++------
.../its/CheckTestNgListenerReporterIT.java | 22 +++++---
.../maven/surefire/its/CheckTestNgVersionsIT.java | 59 +++++++++-------------
.../its/JUnit47RerunFailingTestWithCucumberIT.java | 4 +-
.../maven/surefire/its/JUnit47WithCucumberIT.java | 20 +++-----
.../apache/maven/surefire/its/Java9FullApiIT.java | 26 ++++------
.../maven/surefire/its/fixture/MavenLauncher.java | 16 ++----
.../surefire/its/fixture/SurefireLauncher.java | 2 +
.../test/resources/environment-variables/pom.xml | 4 +-
.../src/test/resources/failingBuilds/pom.xml | 4 +-
.../src/test/resources/failsafe-notests/pom.xml | 4 +-
.../test/resources/failure-result-counting/pom.xml | 4 +-
.../src/test/resources/failureOutput/pom.xml | 4 +-
.../src/test/resources/fork-consoleOutput/pom.xml | 4 +-
.../resources/fork-consoleOutputWithErrors/pom.xml | 4 +-
surefire-its/src/test/resources/fork-fail/pom.xml | 4 +-
.../test/resources/fork-mode-multimodule/pom.xml | 4 +-
.../resources/fork-mode-resource-loading/pom.xml | 4 +-
.../src/test/resources/fork-mode-testng/pom.xml | 4 +-
surefire-its/src/test/resources/fork-mode/pom.xml | 4 +-
.../src/test/resources/fork-timeout/pom.xml | 4 +-
.../resources/includes-excludes-from-file/pom.xml | 4 +-
.../src/test/resources/includes-excludes/pom.xml | 4 +-
.../test/resources/isolated-classloader/pom.xml | 4 +-
.../src/test/resources/java9-full-api/pom.xml | 2 +-
.../java9-full-api/src/test/java/J9IT.java | 2 +-
.../java9-full-api/src/test/java/J9Test.java | 2 +-
.../test/resources/junit-fork-mode-always/pom.xml | 4 +-
.../src/test/resources/junit-ignore/pom.xml | 4 +-
.../src/test/resources/junit-innerClass/pom.xml | 4 +-
.../resources/junit-notExtendingTestCase/pom.xml | 4 +-
.../test/resources/junit-pathWithUmlaut/pom.xml | 4 +-
.../test/resources/junit-twoTestCaseSuite/pom.xml | 4 +-
.../src/test/resources/junit-twoTestCases/pom.xml | 4 +-
.../resources/junit4-forkAlways-staticInit/pom.xml | 4 +-
.../resources/junit4-rerun-failing-tests/pom.xml | 4 +-
.../src/test/resources/junit4-runlistener/pom.xml | 4 +-
.../test/resources/junit4-twoTestCaseSuite/pom.xml | 4 +-
.../src/test/resources/junit44-dep/pom.xml | 4 +-
.../src/test/resources/junit44-environment/pom.xml | 4 +-
.../src/test/resources/junit44-hamcrest/pom.xml | 4 +-
.../test/resources/junit44-method-pattern/pom.xml | 4 +-
.../test/resources/junit44-single-method/pom.xml | 4 +-
.../src/test/resources/junit47-cucumber/pom.xml | 14 ++---
.../org/sample/cucumber/FailingCucumberTest.java | 5 +-
.../test/java/org/sample/cucumber/StepDefs.java | 6 +--
.../org/sample/cucumber/SuccessCucumberTest.java | 5 +-
.../resources/junit47-parallel-with-suite/pom.xml | 4 +-
.../test/resources/junit47-redirect-output/pom.xml | 4 +-
.../pom.xml | 13 +++--
.../org/sample/cucumber/FlakeCucumberTest.java | 3 +-
.../test/java/org/sample/cucumber/StepDefs.java | 6 +--
.../junit47-static-inner-class-tests/pom.xml | 4 +-
.../src/test/resources/junit48-categories/pom.xml | 4 +-
.../test/resources/junit48-smartStackTrace/pom.xml | 4 +-
.../src/test/resources/norunnableTests/pom.xml | 4 +-
.../src/test/resources/parallel-runtime/pom.xml | 4 +-
.../resources/plain-old-java-classpath/pom.xml | 4 +-
.../src/test/resources/plexus-conflict/pom.xml | 4 +-
.../src/test/resources/pojo-simple/pom.xml | 4 +-
surefire-its/src/test/resources/pom.xml | 4 +-
surefire-its/src/test/resources/reporters/pom.xml | 4 +-
.../src/test/resources/result-counting/pom.xml | 4 +-
surefire-its/src/test/resources/runOrder/pom.xml | 4 +-
.../src/test/resources/runorder-parallel/pom.xml | 4 +-
surefire-its/src/test/resources/settings.xml | 29 -----------
.../sibling-aggregator/aggregator/pom.xml | 4 +-
.../resources/sibling-aggregator/child1/pom.xml | 4 +-
.../resources/sibling-aggregator/child2/pom.xml | 4 +-
.../test/resources/small-result-counting/pom.xml | 4 +-
.../jiras-surefire-1024-testjar/pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../surefire-1122-parallel-and-flakyTests/pom.xml | 4 +-
.../pom.xml | 4 +-
.../surefire-1202-rerun-and-failfast/pom.xml | 4 +-
.../surefire-1209-rerun-and-forkcount/pom.xml | 4 +-
.../surefire-1278-group-name-ending/pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../surefire-141-pluggableproviders/pom.xml | 4 +-
.../surefire-146-forkPerTestNoSetup/pom.xml | 4 +-
.../surefire-1535-parallel-testng/pom.xml | 4 +-
.../resources/surefire-162-charsetProvider/pom.xml | 4 +-
.../surefire-224-wellFormedXmlFailures/pom.xml | 4 +-
.../resources/surefire-257-rerunningTests/pom.xml | 4 +-
.../surefire-260-testWithIdenticalNames/pom.xml | 4 +-
.../surefire-34-securityManager-success/pom.xml | 4 +-
.../resources/surefire-34-securityManager/pom.xml | 4 +-
.../surefire-408-manual-provider-selection/pom.xml | 4 +-
.../resources/surefire-500-puzzling-error/pom.xml | 4 +-
.../resources/surefire-510-testClassPath/pom.xml | 4 +-
.../surefire-570-multipleReportDirectories/pom.xml | 4 +-
.../surefire-613-testCount-in-parallel/pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../surefire-634-systemPropertiesWarning/pom.xml | 4 +-
.../test/resources/surefire-673-mockito/pom.xml | 20 +++++++-
.../surefire-674-buildFailingWhenErrors/pom.xml | 4 +-
.../surefire-685-commaseparatedIncludes/pom.xml | 4 +-
.../resources/surefire-697-niceSummary/pom.xml | 4 +-
.../surefire-733-allOverridesCaptured/pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../surefire-806-specifiedTests-multi/pom.xml | 4 +-
.../surefire-806-specifiedTests-single/pom.xml | 4 +-
.../surefire-809-groupExpr-junit48/pom.xml | 4 +-
.../surefire-809-groupExpr-testng/pom.xml | 4 +-
.../surefire-812-log4j-classloader/pom.xml | 4 +-
.../surefire-818-ignored-tests-on-npe/pom.xml | 4 +-
.../surefire-828-emptyGroupExpr-junit48/pom.xml | 4 +-
.../surefire-828-emptyGroupExpr-testng/pom.xml | 4 +-
.../surefire-832-provider-selection/pom.xml | 4 +-
.../test/resources/surefire-847-testngfail/pom.xml | 4 +-
.../surefire-855-failsafe-use-war/pom.xml | 2 +-
.../surefire-930-failsafe-runtests/pom.xml | 4 +-
.../surefire-931-provider-failure/pom.xml | 4 +-
.../resources/surefire-943-report-content/pom.xml | 4 +-
.../pom.xml | 4 +-
.../surefire-946-self-destruct-plugin/pom.xml | 4 +-
.../surefire-972-bizarre-noclassdef/pom.xml | 4 +-
.../resources/surefire-975-wrong-encoding/pom.xml | 4 +-
.../module1/pom.xml | 4 +-
.../module2/pom.xml | 4 +-
.../pom.xml | 4 +-
.../src/test/resources/system-properties/pom.xml | 4 +-
.../resources/test-helper-dump-pid-plugin/pom.xml | 4 +-
.../resources/testng-afterSuiteFailure/pom.xml | 4 +-
.../src/test/resources/testng-beforeMethod/pom.xml | 4 +-
.../resources/testng-beforeMethodFailure/pom.xml | 4 +-
.../test/resources/testng-execute-error/pom.xml | 4 +-
.../src/test/resources/testng-groups/pom.xml | 4 +-
.../src/test/resources/testng-jdk14/pom.xml | 4 +-
.../test/resources/testng-junit-together/pom.xml | 4 +-
.../resources/testng-listener-reporter/pom.xml | 4 +-
.../resources/testng-method-pattern-after/pom.xml | 4 +-
.../resources/testng-method-pattern-before/pom.xml | 4 +-
.../test/resources/testng-method-pattern/pom.xml | 4 +-
.../testng-parallel-with-annotations/pom.xml | 4 +-
.../test/resources/testng-path with spaces/pom.xml | 4 +-
.../src/test/resources/testng-simple/pom.xml | 4 +-
.../resources/testng-single-method-5-14-9/pom.xml | 4 +-
.../test/resources/testng-single-method/pom.xml | 4 +-
.../src/test/resources/testng-suite-xml/pom.xml | 4 +-
.../test/resources/testng-twoTestCaseSuite/pom.xml | 4 +-
.../src/test/resources/timeout-forked/pom.xml | 4 +-
.../src/test/resources/unicode-testnames/pom.xml | 4 +-
.../working-directory-is-invalid-property/pom.xml | 4 +-
.../resources/working-directory-missing/pom.xml | 4 +-
.../src/test/resources/working-directory/pom.xml | 4 +-
160 files changed, 431 insertions(+), 437 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c97ac91..d201090 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,8 +31,8 @@ properties(
)
final def oses = ['linux':'ubuntu', 'windows':'windows-he']
-final def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.5.x'] : ['3.5.x']
-final def jdks = [7, 8, 11]
+final def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.8.x'] : ['3.8.x']
+final def jdks = [7, 8, 11, 18]
final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
final def goals = ['clean', 'install', 'jacoco:report']
@@ -71,7 +71,7 @@ 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) {
+ if (jdk > 11) {
allOptions += ['-DskipUnitTests=true']
}
buildProcess(stageKey, jdkName, jdkTestName, mvnName, goals, allOptions, mavenOpts, makeReports)
diff --git a/README.md b/README.md
index 1fc5458..ddb1f63 100644
--- a/README.md
+++ b/README.md
@@ -34,9 +34,9 @@ But in order to run IT tests, you can do:
**(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=/path/to/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\"*
+ *mvn install site site:stage -P reporting,run-its -Djacoco.skip=true "-Djdk.home=/path/to/jdk10"*
### Deploying web site
diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml b/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml
index 193791d..79d2619 100644
--- a/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml
+++ b/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml
@@ -63,6 +63,15 @@
<directory>${basedir}/src/test/resources</directory>
</testResource>
</testResources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.3.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml b/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml
index 31dc8ec..7e33bfd 100644
--- a/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml
+++ b/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml
@@ -63,6 +63,15 @@
<directory>${basedir}/src/test/resources</directory>
</testResource>
</testResources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.3.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
diff --git a/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml b/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml
index aedbdde..af2df65 100644
--- a/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml
+++ b/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml
@@ -27,8 +27,8 @@
<name>Run tests multiple times</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml b/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml
index d87409f..2c508f3 100644
--- a/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml
+++ b/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml
@@ -27,8 +27,8 @@
<name>Run tests multiple times</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/maven-failsafe-plugin/src/it/working-directory/pom.xml b/maven-failsafe-plugin/src/it/working-directory/pom.xml
index 6cf2bc5..22d5034 100644
--- a/maven-failsafe-plugin/src/it/working-directory/pom.xml
+++ b/maven-failsafe-plugin/src/it/working-directory/pom.xml
@@ -27,8 +27,8 @@
<name>Run tests in a nonexistent working directory</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/maven-surefire-plugin/src/site/apt/examples/cucumber.apt.vm b/maven-surefire-plugin/src/site/apt/examples/cucumber.apt.vm
index e0436cc..e211be5 100644
--- a/maven-surefire-plugin/src/site/apt/examples/cucumber.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/cucumber.apt.vm
@@ -54,8 +54,8 @@ package org.sample.cucumber;
import org.junit.runner.RunWith;
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import io.cucumber.junit.Cucumber;
@RunWith( Cucumber.class )
public class RunCucumberTest
@@ -71,8 +71,8 @@ package org.sample.cucumber;
import org.junit.runner.RunWith;
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import io.cucumber.junit.Cucumber;
@RunWith( Cucumber.class )
public class RunCucumberIT
diff --git a/pom.xml b/pom.xml
index c00ce26..6968947 100644
--- a/pom.xml
+++ b/pom.xml
@@ -458,6 +458,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<configuration>
+ <skipTests>${skipUnitTests}</skipTests>
<!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! -->
<useSystemClassLoader>false</useSystemClassLoader>
<argLine>${jvm.args.tests} ${jacoco.agent} -Dnet.bytebuddy.experimental=true</argLine>
@@ -486,7 +487,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
+ <version>0.8.7</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
index 6695301..8910796 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
@@ -29,6 +29,7 @@ import java.io.InputStream;
import java.util.Properties;
import java.util.StringTokenizer;
+import static java.lang.Double.parseDouble;
import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME;
import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME_KEY;
import static org.junit.Assert.fail;
@@ -50,7 +51,7 @@ public abstract class AbstractJigsawIT
protected SurefireLauncher assumeJigsaw() throws IOException
{
assumeTrue( "There's no JDK 9 provided.",
- isJavaVersion9AtLeast() || EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() );
+ isJavaVersion9AtLeast() || EXT_JDK_HOME != null && isExtJavaVersion9AtLeast() );
// fail( EXT_JDK_HOME_KEY + " was provided with value " + EXT_JDK_HOME + " but it is not Jigsaw Java 9." );
SurefireLauncher launcher = unpack();
@@ -60,21 +61,11 @@ public abstract class AbstractJigsawIT
protected SurefireLauncher assumeJava9Property() throws IOException
{
- assumeTrue( "There's no JDK 9 provided.", EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() );
+ assumeTrue( "There's no JDK 9 provided.", EXT_JDK_HOME != null && isExtJavaVersion9AtLeast() );
return unpack();
}
- private SurefireLauncher unpack()
- {
- return unpack( getProjectDirectoryName() );
- }
-
- private static boolean isJavaVersion9AtLeast()
- {
- return Double.valueOf( System.getProperty( "java.specification.version" ) ) >= JIGSAW_JAVA_VERSION;
- }
-
- private static boolean isExtJavaVerion9AtLeast() throws IOException
+ protected static String extractExternalJavaVersion() throws IOException
{
File release = new File( EXT_JDK_HOME, "release" );
assumeTrue( EXT_JDK_HOME_KEY + " was provided with value " + EXT_JDK_HOME + " but file does not exist "
@@ -93,13 +84,31 @@ public abstract class AbstractJigsawIT
}
else if ( versions.countTokens() >= 2 )
{
- javaVersion = versions.nextToken() + "." + versions.nextToken();
+ String v1 = versions.nextToken();
+ String v2 = versions.nextToken();
+ javaVersion = v1.equals( "1" ) ? v1 + "." + v2 : v1;
}
else
{
fail( "unexpected java version format" );
}
+ return javaVersion;
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( getProjectDirectoryName() );
+ }
+
+ private static boolean isJavaVersion9AtLeast()
+ {
+ return parseDouble( System.getProperty( "java.specification.version" ) ) >= JIGSAW_JAVA_VERSION;
+ }
+
+ private static boolean isExtJavaVersion9AtLeast() throws IOException
+ {
+ String javaVersion = extractExternalJavaVersion();
- return Double.valueOf( javaVersion ) >= JIGSAW_JAVA_VERSION;
+ return parseDouble( javaVersion ) >= JIGSAW_JAVA_VERSION;
}
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
index 2c618d0..7004f22 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
@@ -19,15 +19,16 @@ package org.apache.maven.surefire.its;
* under the License.
*/
+import java.util.Arrays;
+import java.util.Collection;
+
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import java.util.Arrays;
-import java.util.Collection;
-
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaMaxVersion;
import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
import static org.junit.runners.Parameterized.Parameter;
import static org.junit.runners.Parameterized.Parameters;
@@ -71,8 +72,9 @@ public class CheckTestNgListenerReporterIT
{ "5.14.6", null, 1.5d }, // Usage of org.testng:guice removed
{ "5.14.9", null, 1.5d }, // Latest 5.14.x TestNG version
{ "6.0", null, 1.5d },
- { "6.9.9", null, 1.7d } // Currently latest TestNG version
- });
+ { "6.14.3", null, 1.7d },
+ { "7.5", null, 1.8d } // Currently latest TestNG version
+ } );
}
@Parameter
@@ -88,6 +90,14 @@ public class CheckTestNgListenerReporterIT
public void testNgListenerReporter()
{
assumeJavaVersion( javaVersion );
+
+ if ( version.equals( "5.13" ) )
+ {
+ // only 5.13 uses Google Guice, reflection which breaks jdk 16+
+ // module java.base does not "opens java.lang" to unnamed module @209c0b14
+ assumeJavaMaxVersion( 15 );
+ }
+
final SurefireLauncher launcher = unpack( "testng-listener-reporter", "_" + version )
.sysProp( "testNgVersion", version );
@@ -97,7 +107,7 @@ public class CheckTestNgListenerReporterIT
}
launcher.executeTest()
- .verifyErrorFree( 1 )
+ .assertTestSuiteResults( 1, 0, 0, 0 )
.getTargetFile( "resultlistener-output.txt" ).assertFileExists()
.getTargetFile( "suitelistener-output.txt" ).assertFileExists()
.getTargetFile( "reporter-output.txt" ).assertFileExists();
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
index 6d2bbfa..8cd91fd 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
@@ -29,6 +29,7 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Ignore;
import org.junit.Test;
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaMaxVersion;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -45,151 +46,125 @@ public class CheckTestNgVersionsIT
{
@Test public void test47()
- throws Exception
{
runTestNgTest( "4.7", "jdk15" );
}
- @Test @Ignore( "5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024" ) public void XXXtest50()
- throws Exception
+ @Test
+ @Ignore( "5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024" )
+ public void test50()
{
runTestNgTest( "5.0", "jdk15" );
}
- @Test @Ignore( "5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024" ) public void XXXtest501()
- throws Exception
+ @Test
+ @Ignore( "5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024" )
+ public void test501()
{
runTestNgTest( "5.0.1", "jdk15" );
}
@Test public void test502()
- throws Exception
{
runTestNgTest( "5.0.2", "jdk15" );
}
@Test public void test51()
- throws Exception
{
runTestNgTest( "5.1", "jdk15" );
}
@Test public void test55()
- throws Exception
{
runTestNgTest( "5.5", "jdk15" );
}
@Test public void test56()
- throws Exception
{
runTestNgTest( "5.6", "jdk15" );
}
@Test public void test57()
- throws Exception
{
runTestNgTest( "5.7", "jdk15" );
}
@Test public void test58()
- throws Exception
{
runTestNgTest( "5.8", "jdk15" );
}
@Test public void test59()
- throws Exception
{
runTestNgTest( "5.9", "jdk15" );
}
@Test public void test510()
- throws Exception
{
runTestNgTest( "5.10", "jdk15" );
}
@Test public void test511()
- throws Exception
{
runTestNgTest( "5.11", "jdk15" );
}
@Test public void test512()
- throws Exception
{
runTestNgTest( "5.12.1" );
}
@Test public void test513()
- throws Exception
{
runTestNgTest( "5.13" );
}
@Test public void test5131()
- throws Exception
{
runTestNgTest( "5.13.1" );
}
@Test public void test514()
- throws Exception
{
runTestNgTest( "5.14" );
}
@Test public void test5141()
- throws Exception
{
runTestNgTest( "5.14.1" );
}
@Test public void test5142()
- throws Exception
{
runTestNgTest( "5.14.2" );
}
@Test public void test60()
- throws Exception
{
runTestNgTest( "6.0" );
}
@Test public void test685()
- throws Exception
{
runTestNgTestWithRunOrder( "6.8.5" );
}
private void runTestNgTestWithRunOrder( String version )
- throws Exception
{
runTestNgTest( version, null, true );
}
private void runTestNgTest( String version )
- throws Exception
{
runTestNgTest( version, null, false );
}
- private void runTestNgTest( String version, boolean validateRunOrder )
- throws Exception
- {
- runTestNgTest( version, null, validateRunOrder );
- }
-
private void runTestNgTest( String version, String classifier )
- throws Exception
{
runTestNgTest( version, classifier, false );
}
private void runTestNgTest( String version, String classifier, boolean validateRunOrder )
- throws Exception
{
final SurefireLauncher launcher = unpack( "testng-simple" )
.sysProp( "testNgVersion", version );
@@ -199,6 +174,15 @@ public class CheckTestNgVersionsIT
launcher.sysProp( "testNgClassifier", classifier );
}
+ if ( version.startsWith( "5.12" ) || version.startsWith( "5.13" ) || version.startsWith( "5.14" ) )
+ {
+ // TestNG 5.12 - 5.14 uses Guava lib ang CGLib with reflective access.
+ // WARNING: Illegal reflective access by com.google.inject.internal.cglib.core.ReflectUtils$2
+ // (testng-5.12.1.jar) to method
+ // java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain)
+ assumeJavaMaxVersion( 15 );
+ }
+
final OutputValidator outputValidator = launcher.executeTest();
outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 );
@@ -210,9 +194,14 @@ public class CheckTestNgVersionsIT
assertEquals( 3, report.size() );
- assertTrue( "TestNGSuiteTestC was executed first", getTestClass( report, 0 ).endsWith( "TestNGSuiteTestC" ) );
- assertTrue( "TestNGSuiteTestB was executed second", getTestClass( report, 1 ).endsWith( "TestNGSuiteTestB" ) );
- assertTrue( "TestNGSuiteTestA was executed last", getTestClass( report, 2 ).endsWith( "TestNGSuiteTestA" ) );
+ assertTrue( "TestNGSuiteTestC was executed first",
+ getTestClass( report, 0 ).endsWith( "TestNGSuiteTestC" ) );
+
+ assertTrue( "TestNGSuiteTestB was executed second",
+ getTestClass( report, 1 ).endsWith( "TestNGSuiteTestB" ) );
+
+ assertTrue( "TestNGSuiteTestA was executed last",
+ getTestClass( report, 2 ).endsWith( "TestNGSuiteTestA" ) );
}
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
index 9fe1775..006a5b9 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
@@ -38,8 +38,8 @@ public class JUnit47RerunFailingTestWithCucumberIT
extends SurefireJUnit4IntegrationTestCase {
@Before
- public void assumeJdk17() {
- assumeJavaVersion(1.7d);
+ public void assumeJava8Plus() {
+ assumeJavaVersion(1.8d);
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java
index 38c2eae..e01a34b 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java
@@ -38,33 +38,29 @@ public class JUnit47WithCucumberIT
{
@Before
- public void assumeJdk16()
+ public void assumeJava8Plus()
{
- assumeJavaVersion( 1.6d );
+ assumeJavaVersion( 1.8d );
}
@Test
public void testWithoutParallel()
{
- // 8 tests in total is what's probably correct
- doTest( "none", 8 );
+ doTest( "none" );
}
@Test
public void testWithParallelClasses()
{
- // with parallel=classes, we get 9 tests in total,
- // as the dummy "scenario" test entry is reported twice: once as success, and once with the failure from the
- // failing test step
- doTest( "classes", 9 );
+ doTest( "classes" );
}
- private void doTest( String parallel, int total )
+ private void doTest( String parallel )
{
unpack( "junit47-cucumber" )
- .sysProp( "parallel", parallel )
- .sysProp( "threadCount", "2" )
+ .parallel( parallel )
+ .threadCount( 2 )
.executeTest()
- .assertTestSuiteResults( total, 0, 2, 0 );
+ .assertTestSuiteResults( 2, 0, 1, 0 );
}
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
index ec9a688..1dde3b1 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
@@ -19,15 +19,14 @@ package org.apache.maven.surefire.its;
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.junit.Test;
-import java.io.File;
-
import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME;
import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME_KEY;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
/**
@@ -50,15 +49,13 @@ public class Java9FullApiIT
.execute( "verify" )
.verifyErrorFree( 1 );
+ String jVersion = extractExternalJavaVersion();
validator.verifyTextInLog( "loaded class java.sql.SQLException" )
.verifyTextInLog( "loaded class javax.xml.ws.Holder" )
.verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
.verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
.verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
- is( "java.specification.version=10" ),
- is( "java.specification.version=11" ) ),
- greaterThanOrEqualTo( 1 ) );
+ .assertThatLogLine( containsString( "java.specification.version is " + jVersion ), is( 2 ) );
}
@Test
@@ -71,15 +68,13 @@ public class Java9FullApiIT
.execute( "verify" )
.verifyErrorFree( 1 );
+ String jVersion = extractExternalJavaVersion();
validator.verifyTextInLog( "loaded class java.sql.SQLException" )
.verifyTextInLog( "loaded class javax.xml.ws.Holder" )
.verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
.verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
.verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
- is( "java.specification.version=10" ),
- is( "java.specification.version=11" ) ),
- greaterThanOrEqualTo( 1 ) );
+ .assertThatLogLine( containsString( "java.specification.version is " + jVersion ), is( 2 ) );
}
@Test
@@ -87,21 +82,20 @@ public class Java9FullApiIT
{
OutputValidator validator = assumeJava9Property()
.setForkJvm()
+ .debugLogging()
.activateProfile( "use-toolchains" )
.addGoal( "--toolchains" )
.addGoal( System.getProperty( "maven.toolchains.file" ) )
.execute( "verify" )
.verifyErrorFree( 1 );
+ String jVersion = System.getProperty( "java.specification.version" );
validator.verifyTextInLog( "loaded class java.sql.SQLException" )
.verifyTextInLog( "loaded class javax.xml.ws.Holder" )
.verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
.verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
.verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
- is( "java.specification.version=10" ),
- is( "java.specification.version=11" ) ),
- greaterThanOrEqualTo( 1 ) );
+ .assertThatLogLine( containsString( "java.specification.version is " + jVersion ), is( 2 ) );
}
@Override
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index 1cbfb6b..eb6cf01 100755
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -160,8 +160,10 @@ public final class MavenLauncher
public OutputValidator getSubProjectValidator( String subProject )
throws VerificationException
{
- final File subFile = getValidator().getSubFile( subProject );
- return new OutputValidator( new Verifier( subFile.getAbsolutePath() ) );
+ File subFile = getValidator().getSubFile( subProject );
+ Verifier subProjectVerifier = new Verifier( subFile.getAbsolutePath() );
+ subProjectVerifier.setLocalRepo( System.getProperty( "localRepository" ) );
+ return new OutputValidator( subProjectVerifier );
}
public MavenLauncher addEnvVar( String key, String value )
@@ -292,17 +294,10 @@ public final class MavenLauncher
{
try
{
- File generatedSettings = new File( System.getProperty( "maven.settings.file" ) ).getCanonicalFile();
- String generatedSettingsPath = generatedSettings.getAbsolutePath();
- addCliOption( "-s " + generatedSettingsPath );
getVerifier().setCliOptions( cliOptions );
getVerifier().executeGoals( goals, envvars );
return getValidator();
}
- catch ( IOException e )
- {
- throw new SurefireVerifierException( e.getLocalizedMessage(), e );
- }
catch ( VerificationException e )
{
throw new SurefireVerifierException( e.getLocalizedMessage(), e );
@@ -390,8 +385,7 @@ public final class MavenLauncher
? new Verifier( ensureUnpacked().getAbsolutePath(), null, false )
: new Verifier( ensureUnpacked().getAbsolutePath(), null, false, cli );
- verifier.getVerifierProperties()
- .setProperty( "use.mavenRepoLocal", "false" );
+ verifier.setLocalRepo( System.getProperty( "localRepository" ) );
}
catch ( VerificationException e )
{
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 0e40622..c9fbe6c 100755
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -147,6 +147,8 @@ public final class SurefireLauncher
goals.add( "-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2" );
+ goals.add( "-nsu" );
+
return goals;
}
diff --git a/surefire-its/src/test/resources/environment-variables/pom.xml b/surefire-its/src/test/resources/environment-variables/pom.xml
index 6b8e3bc..902e97e 100644
--- a/surefire-its/src/test/resources/environment-variables/pom.xml
+++ b/surefire-its/src/test/resources/environment-variables/pom.xml
@@ -31,8 +31,8 @@
<properties>
<forkMode>always</forkMode>
<useSystemClassLoader>false</useSystemClassLoader>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
diff --git a/surefire-its/src/test/resources/failingBuilds/pom.xml b/surefire-its/src/test/resources/failingBuilds/pom.xml
index d30dbb3..8e988ad 100644
--- a/surefire-its/src/test/resources/failingBuilds/pom.xml
+++ b/surefire-its/src/test/resources/failingBuilds/pom.xml
@@ -34,7 +34,7 @@
<properties>
<junit.version>4.8.1</junit.version>
<forkMode>once</forkMode>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/failsafe-notests/pom.xml b/surefire-its/src/test/resources/failsafe-notests/pom.xml
index b6d29b9..24d1dec 100644
--- a/surefire-its/src/test/resources/failsafe-notests/pom.xml
+++ b/surefire-its/src/test/resources/failsafe-notests/pom.xml
@@ -28,8 +28,8 @@
<name>failsafe-notests</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/failure-result-counting/pom.xml b/surefire-its/src/test/resources/failure-result-counting/pom.xml
index 9d6ae84..7d79f29 100644
--- a/surefire-its/src/test/resources/failure-result-counting/pom.xml
+++ b/surefire-its/src/test/resources/failure-result-counting/pom.xml
@@ -32,7 +32,7 @@
<properties>
<junit.version>4.10</junit.version>
<forkMode>once</forkMode>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/failureOutput/pom.xml b/surefire-its/src/test/resources/failureOutput/pom.xml
index e6ad639..85c10ee 100644
--- a/surefire-its/src/test/resources/failureOutput/pom.xml
+++ b/surefire-its/src/test/resources/failureOutput/pom.xml
@@ -43,8 +43,8 @@
<printSummary>true</printSummary>
<useFile>true</useFile>
<reportFormat>brief</reportFormat>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/fork-consoleOutput/pom.xml b/surefire-its/src/test/resources/fork-consoleOutput/pom.xml
index 1c89877..407d86b 100644
--- a/surefire-its/src/test/resources/fork-consoleOutput/pom.xml
+++ b/surefire-its/src/test/resources/fork-consoleOutput/pom.xml
@@ -40,8 +40,8 @@
<forkMode>once</forkMode>
<printSummary>true</printSummary>
<reportFormat>brief</reportFormat>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/fork-consoleOutputWithErrors/pom.xml b/surefire-its/src/test/resources/fork-consoleOutputWithErrors/pom.xml
index 5f3af23..9aa5e1b 100644
--- a/surefire-its/src/test/resources/fork-consoleOutputWithErrors/pom.xml
+++ b/surefire-its/src/test/resources/fork-consoleOutputWithErrors/pom.xml
@@ -43,8 +43,8 @@
<printSummary>true</printSummary>
<useFile>true</useFile>
<reportFormat>brief</reportFormat>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/fork-fail/pom.xml b/surefire-its/src/test/resources/fork-fail/pom.xml
index 8825613..9db6d72 100644
--- a/surefire-its/src/test/resources/fork-fail/pom.xml
+++ b/surefire-its/src/test/resources/fork-fail/pom.xml
@@ -30,8 +30,8 @@
<properties>
<argLine>-Xmxxxx712743m</argLine>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/fork-mode-multimodule/pom.xml b/surefire-its/src/test/resources/fork-mode-multimodule/pom.xml
index 708598c..e0786b1 100644
--- a/surefire-its/src/test/resources/fork-mode-multimodule/pom.xml
+++ b/surefire-its/src/test/resources/fork-mode-multimodule/pom.xml
@@ -31,8 +31,8 @@
<packaging>pom</packaging>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<modules>
diff --git a/surefire-its/src/test/resources/fork-mode-resource-loading/pom.xml b/surefire-its/src/test/resources/fork-mode-resource-loading/pom.xml
index 21a0fc2..e40033c 100644
--- a/surefire-its/src/test/resources/fork-mode-resource-loading/pom.xml
+++ b/surefire-its/src/test/resources/fork-mode-resource-loading/pom.xml
@@ -29,8 +29,8 @@
<name>Test for forkMode</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/fork-mode-testng/pom.xml b/surefire-its/src/test/resources/fork-mode-testng/pom.xml
index 1f1956b..8e25749 100644
--- a/surefire-its/src/test/resources/fork-mode-testng/pom.xml
+++ b/surefire-its/src/test/resources/fork-mode-testng/pom.xml
@@ -13,8 +13,8 @@
<name>Test for forkMode</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/fork-mode/pom.xml b/surefire-its/src/test/resources/fork-mode/pom.xml
index ad9ec47..28bfb4d 100644
--- a/surefire-its/src/test/resources/fork-mode/pom.xml
+++ b/surefire-its/src/test/resources/fork-mode/pom.xml
@@ -29,8 +29,8 @@
<name>Test for forkMode</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/fork-timeout/pom.xml b/surefire-its/src/test/resources/fork-timeout/pom.xml
index 67d85e9..25365a2 100644
--- a/surefire-its/src/test/resources/fork-timeout/pom.xml
+++ b/surefire-its/src/test/resources/fork-timeout/pom.xml
@@ -12,8 +12,8 @@
<junit.parallel>classes</junit.parallel>
<forkMode>once</forkMode>
<timeOut>1</timeOut>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
diff --git a/surefire-its/src/test/resources/includes-excludes-from-file/pom.xml b/surefire-its/src/test/resources/includes-excludes-from-file/pom.xml
index d69c129..39313db 100644
--- a/surefire-its/src/test/resources/includes-excludes-from-file/pom.xml
+++ b/surefire-its/src/test/resources/includes-excludes-from-file/pom.xml
@@ -31,8 +31,8 @@ under the License.
<properties>
<junit.version>3.8.2</junit.version>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/includes-excludes/pom.xml b/surefire-its/src/test/resources/includes-excludes/pom.xml
index f107168..77711f7 100644
--- a/surefire-its/src/test/resources/includes-excludes/pom.xml
+++ b/surefire-its/src/test/resources/includes-excludes/pom.xml
@@ -31,8 +31,8 @@ under the License.
<properties>
<junit.version>3.8.2</junit.version>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/isolated-classloader/pom.xml b/surefire-its/src/test/resources/isolated-classloader/pom.xml
index e761141..a853063 100644
--- a/surefire-its/src/test/resources/isolated-classloader/pom.xml
+++ b/surefire-its/src/test/resources/isolated-classloader/pom.xml
@@ -29,8 +29,8 @@
<name>Test for useSystemClassLoader=false</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/java9-full-api/pom.xml b/surefire-its/src/test/resources/java9-full-api/pom.xml
index 2e4d4f3..ffec71e 100644
--- a/surefire-its/src/test/resources/java9-full-api/pom.xml
+++ b/surefire-its/src/test/resources/java9-full-api/pom.xml
@@ -83,7 +83,7 @@
<profiles>
<profile>
- <id>use-jvm-config-paramater</id>
+ <id>use-jvm-config-parameter</id>
<activation>
<property>
<name>jdk.home</name>
diff --git a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9IT.java b/surefire-its/src/test/resources/java9-full-api/src/test/java/J9IT.java
index c74678d..bfe3ded 100644
--- a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9IT.java
+++ b/surefire-its/src/test/resources/java9-full-api/src/test/java/J9IT.java
@@ -31,7 +31,7 @@ public class J9IT
System.out.println( "from classloader " + javax.transaction.InvalidTransactionException.class.getClassLoader() );
System.out.println( "loaded class " + javax.transaction.TransactionManager.class.getName() );
System.out.println( "loaded class " + javax.xml.xpath.XPath.class.getName() );
- System.out.println( "java.specification.version=" + System.getProperty( "java.specification.version" ) );
+ System.out.println( "java.specification.version is " + System.getProperty( "java.specification.version" ) );
}
}
diff --git a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9Test.java b/surefire-its/src/test/resources/java9-full-api/src/test/java/J9Test.java
index 6fc8536..3caa7dd 100644
--- a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9Test.java
+++ b/surefire-its/src/test/resources/java9-full-api/src/test/java/J9Test.java
@@ -30,7 +30,7 @@ public class J9Test
System.out.println( "loaded class " + javax.transaction.InvalidTransactionException.class.getName() );
System.out.println( "loaded class " + javax.transaction.TransactionManager.class.getName() );
System.out.println( "loaded class " + javax.xml.xpath.XPath.class.getName() );
- System.out.println( "java.specification.version=" + System.getProperty( "java.specification.version" ) );
+ System.out.println( "java.specification.version is " + System.getProperty( "java.specification.version" ) );
}
}
diff --git a/surefire-its/src/test/resources/junit-fork-mode-always/pom.xml b/surefire-its/src/test/resources/junit-fork-mode-always/pom.xml
index 8b48b46..9b86c75 100644
--- a/surefire-its/src/test/resources/junit-fork-mode-always/pom.xml
+++ b/surefire-its/src/test/resources/junit-fork-mode-always/pom.xml
@@ -29,8 +29,8 @@
<name>Test for forkMode</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/junit-ignore/pom.xml b/surefire-its/src/test/resources/junit-ignore/pom.xml
index a9547fc..d9c3817 100644
--- a/surefire-its/src/test/resources/junit-ignore/pom.xml
+++ b/surefire-its/src/test/resources/junit-ignore/pom.xml
@@ -32,8 +32,8 @@
<junit.version>4.4</junit.version>
<surefire.parallel></surefire.parallel>
<surefire.threadcount>3</surefire.threadcount>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit-innerClass/pom.xml b/surefire-its/src/test/resources/junit-innerClass/pom.xml
index ac98523..fb1ffd6 100644
--- a/surefire-its/src/test/resources/junit-innerClass/pom.xml
+++ b/surefire-its/src/test/resources/junit-innerClass/pom.xml
@@ -29,8 +29,8 @@
<name>Test JUnit classes with inner classes</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit-notExtendingTestCase/pom.xml b/surefire-its/src/test/resources/junit-notExtendingTestCase/pom.xml
index 3a05cf1..8a95201 100644
--- a/surefire-its/src/test/resources/junit-notExtendingTestCase/pom.xml
+++ b/surefire-its/src/test/resources/junit-notExtendingTestCase/pom.xml
@@ -29,8 +29,8 @@
<name>Test for JUnit tests that don't extend TestCase</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml b/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml
index 9f947e0..ee65491 100644
--- a/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml
+++ b/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml
@@ -29,8 +29,8 @@
<name>Test path with Ümlaut</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit-twoTestCaseSuite/pom.xml b/surefire-its/src/test/resources/junit-twoTestCaseSuite/pom.xml
index ce121c7..f2075ae 100644
--- a/surefire-its/src/test/resources/junit-twoTestCaseSuite/pom.xml
+++ b/surefire-its/src/test/resources/junit-twoTestCaseSuite/pom.xml
@@ -29,8 +29,8 @@
<name>Test for single suite with two test cases</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/junit-twoTestCases/pom.xml b/surefire-its/src/test/resources/junit-twoTestCases/pom.xml
index 51ad8b2..89684ad 100644
--- a/surefire-its/src/test/resources/junit-twoTestCases/pom.xml
+++ b/surefire-its/src/test/resources/junit-twoTestCases/pom.xml
@@ -24,8 +24,8 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<groupId>org.apache.maven.plugins.surefire</groupId>
diff --git a/surefire-its/src/test/resources/junit4-forkAlways-staticInit/pom.xml b/surefire-its/src/test/resources/junit4-forkAlways-staticInit/pom.xml
index 77ce5c4..4bfc081 100644
--- a/surefire-its/src/test/resources/junit4-forkAlways-staticInit/pom.xml
+++ b/surefire-its/src/test/resources/junit4-forkAlways-staticInit/pom.xml
@@ -11,8 +11,8 @@
</description>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit4-rerun-failing-tests/pom.xml b/surefire-its/src/test/resources/junit4-rerun-failing-tests/pom.xml
index 1bf63c7..9456a29 100644
--- a/surefire-its/src/test/resources/junit4-rerun-failing-tests/pom.xml
+++ b/surefire-its/src/test/resources/junit4-rerun-failing-tests/pom.xml
@@ -29,8 +29,8 @@
<name>Test for rerun failing tests in JUnit 4</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit4-runlistener/pom.xml b/surefire-its/src/test/resources/junit4-runlistener/pom.xml
index ff22b91..d776533 100644
--- a/surefire-its/src/test/resources/junit4-runlistener/pom.xml
+++ b/surefire-its/src/test/resources/junit4-runlistener/pom.xml
@@ -31,8 +31,8 @@
<properties>
<junitVersion>4.4</junitVersion>
<provider>surefire-junit4</provider>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit4-twoTestCaseSuite/pom.xml b/surefire-its/src/test/resources/junit4-twoTestCaseSuite/pom.xml
index 5836224..867cd09 100644
--- a/surefire-its/src/test/resources/junit4-twoTestCaseSuite/pom.xml
+++ b/surefire-its/src/test/resources/junit4-twoTestCaseSuite/pom.xml
@@ -31,8 +31,8 @@
<properties>
<junitVersion>4.4</junitVersion>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit44-dep/pom.xml b/surefire-its/src/test/resources/junit44-dep/pom.xml
index bae6ad6..d26c024 100644
--- a/surefire-its/src/test/resources/junit44-dep/pom.xml
+++ b/surefire-its/src/test/resources/junit44-dep/pom.xml
@@ -29,8 +29,8 @@
<name>Test for junit-dep</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit44-environment/pom.xml b/surefire-its/src/test/resources/junit44-environment/pom.xml
index af18c21..eb04443 100644
--- a/surefire-its/src/test/resources/junit44-environment/pom.xml
+++ b/surefire-its/src/test/resources/junit44-environment/pom.xml
@@ -29,8 +29,8 @@
<name>Test for setting environment variables</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit44-hamcrest/pom.xml b/surefire-its/src/test/resources/junit44-hamcrest/pom.xml
index c5e44ab..4140b41 100644
--- a/surefire-its/src/test/resources/junit44-hamcrest/pom.xml
+++ b/surefire-its/src/test/resources/junit44-hamcrest/pom.xml
@@ -29,8 +29,8 @@
<name>Test for JUnit44 with Hamcrest extensions</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit44-method-pattern/pom.xml b/surefire-its/src/test/resources/junit44-method-pattern/pom.xml
index 3ed4b2a..e9ac59e 100644
--- a/surefire-its/src/test/resources/junit44-method-pattern/pom.xml
+++ b/surefire-its/src/test/resources/junit44-method-pattern/pom.xml
@@ -31,8 +31,8 @@
<properties>
<junitVersion>4.4</junitVersion>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit44-single-method/pom.xml b/surefire-its/src/test/resources/junit44-single-method/pom.xml
index 26769be..c74aee2 100644
--- a/surefire-its/src/test/resources/junit44-single-method/pom.xml
+++ b/surefire-its/src/test/resources/junit44-single-method/pom.xml
@@ -31,8 +31,8 @@
<properties>
<junitVersion>4.4</junitVersion>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit47-cucumber/pom.xml b/surefire-its/src/test/resources/junit47-cucumber/pom.xml
index a57d3c4..17a8859 100644
--- a/surefire-its/src/test/resources/junit47-cucumber/pom.xml
+++ b/surefire-its/src/test/resources/junit47-cucumber/pom.xml
@@ -29,13 +29,11 @@
</parent>
<artifactId>junit47-cucumber</artifactId>
- <packaging>jar</packaging>
<name>Tests cucumber with JUnit47 provider</name>
<properties>
- <cucumber.version>1.1.3</cucumber.version>
- <junit.version>4.11</junit.version>
+ <cucumber.version>6.10.0</cucumber.version>
</properties>
<build>
@@ -60,19 +58,13 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<version>${cucumber.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<version>${cucumber.version}</version>
<scope>test</scope>
diff --git a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java
index ed86734..448b877 100644
--- a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java
+++ b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java
@@ -21,10 +21,11 @@ package org.sample.cucumber;
import org.junit.runner.RunWith;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import io.cucumber.junit.Cucumber;
@RunWith( Cucumber.class )
-@Cucumber.Options( features = { "classpath:failing" } )
+@CucumberOptions( features = { "classpath:failing" } )
public class FailingCucumberTest
{
diff --git a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
index ba25f69..e5e7339 100644
--- a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
+++ b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
@@ -19,9 +19,9 @@
package org.sample.cucumber;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
import static org.junit.Assert.fail;
diff --git a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java
index 318f5e6..7ba238b 100644
--- a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java
+++ b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java
@@ -21,10 +21,11 @@ package org.sample.cucumber;
import org.junit.runner.RunWith;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import io.cucumber.junit.Cucumber;
@RunWith( Cucumber.class )
-@Cucumber.Options( features = { "classpath:success" } )
+@CucumberOptions( features = { "classpath:success" } )
public class SuccessCucumberTest
{
diff --git a/surefire-its/src/test/resources/junit47-parallel-with-suite/pom.xml b/surefire-its/src/test/resources/junit47-parallel-with-suite/pom.xml
index c8aa695..5dcbaba 100644
--- a/surefire-its/src/test/resources/junit47-parallel-with-suite/pom.xml
+++ b/surefire-its/src/test/resources/junit47-parallel-with-suite/pom.xml
@@ -16,8 +16,8 @@
</dependencies>
<properties>
<parallel>methods</parallel>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<plugins>
diff --git a/surefire-its/src/test/resources/junit47-redirect-output/pom.xml b/surefire-its/src/test/resources/junit47-redirect-output/pom.xml
index a4b9066..38ec727 100644
--- a/surefire-its/src/test/resources/junit47-redirect-output/pom.xml
+++ b/surefire-its/src/test/resources/junit47-redirect-output/pom.xml
@@ -51,8 +51,8 @@
<forkMode>once</forkMode>
<printSummary>true</printSummary>
<parallel>none</parallel>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
index 24ee294..315b9db 100644
--- a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
+++ b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
@@ -33,7 +33,9 @@
<name>Test for rerun failing cucumber tests in JUnit 47</name>
<properties>
- <cucumber.version>2.0.0</cucumber.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ <cucumber.version>6.10.0</cucumber.version>
</properties>
<build>
@@ -42,6 +44,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ </configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
@@ -55,12 +60,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<version>${cucumber.version}</version>
diff --git a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java
index ecda87b..841ea52 100644
--- a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java
+++ b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java
@@ -19,9 +19,10 @@
package org.sample.cucumber;
-import cucumber.api.junit.Cucumber;
import org.junit.runner.RunWith;
+import io.cucumber.junit.Cucumber;
+
@RunWith( Cucumber.class )
public class FlakeCucumberTest
{
diff --git a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
index d253222..7e4e2da 100644
--- a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
+++ b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
@@ -19,9 +19,9 @@
package org.sample.cucumber;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
import static org.junit.Assert.fail;
diff --git a/surefire-its/src/test/resources/junit47-static-inner-class-tests/pom.xml b/surefire-its/src/test/resources/junit47-static-inner-class-tests/pom.xml
index b0c40ec..81f26c2 100644
--- a/surefire-its/src/test/resources/junit47-static-inner-class-tests/pom.xml
+++ b/surefire-its/src/test/resources/junit47-static-inner-class-tests/pom.xml
@@ -8,8 +8,8 @@
<name>junit47-static-inner-class-tests</name>
<url>http://maven.apache.org</url>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
diff --git a/surefire-its/src/test/resources/junit48-categories/pom.xml b/surefire-its/src/test/resources/junit48-categories/pom.xml
index 4fcf119..a83b687 100644
--- a/surefire-its/src/test/resources/junit48-categories/pom.xml
+++ b/surefire-its/src/test/resources/junit48-categories/pom.xml
@@ -33,8 +33,8 @@
<junit.version>4.8.1</junit.version>
<groups>junit4.CategoryA,junit4.CategoryB</groups>
<excludedGroups></excludedGroups>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml b/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml
index 84a3a18..fe104a4 100644
--- a/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml
+++ b/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml
@@ -31,8 +31,8 @@
<properties>
<junitVersion>4.8.1</junitVersion>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/norunnableTests/pom.xml b/surefire-its/src/test/resources/norunnableTests/pom.xml
index f9e154f..dd1a3cc 100644
--- a/surefire-its/src/test/resources/norunnableTests/pom.xml
+++ b/surefire-its/src/test/resources/norunnableTests/pom.xml
@@ -29,8 +29,8 @@
<name>Test JUnit classes with inner classes</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/parallel-runtime/pom.xml b/surefire-its/src/test/resources/parallel-runtime/pom.xml
index 34ba2fe..f39f949 100644
--- a/surefire-its/src/test/resources/parallel-runtime/pom.xml
+++ b/surefire-its/src/test/resources/parallel-runtime/pom.xml
@@ -18,8 +18,8 @@
<properties>
<parallel>classes</parallel>
<threadCount>3</threadCount>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/plain-old-java-classpath/pom.xml b/surefire-its/src/test/resources/plain-old-java-classpath/pom.xml
index 042bdd1..72bd38c 100644
--- a/surefire-its/src/test/resources/plain-old-java-classpath/pom.xml
+++ b/surefire-its/src/test/resources/plain-old-java-classpath/pom.xml
@@ -29,8 +29,8 @@
<name>Test for useManifestOnlyJar=false</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/plexus-conflict/pom.xml b/surefire-its/src/test/resources/plexus-conflict/pom.xml
index 5cb6d81..338904a 100644
--- a/surefire-its/src/test/resources/plexus-conflict/pom.xml
+++ b/surefire-its/src/test/resources/plexus-conflict/pom.xml
@@ -29,8 +29,8 @@
<name>Test for plexus conflict</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/pojo-simple/pom.xml b/surefire-its/src/test/resources/pojo-simple/pom.xml
index d418dc4..45986ac 100644
--- a/surefire-its/src/test/resources/pojo-simple/pom.xml
+++ b/surefire-its/src/test/resources/pojo-simple/pom.xml
@@ -29,8 +29,8 @@
<name>Pojo simple test</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<!-- NOTE: This has no dependencies on JUnit or TestNG, just nothing -->
diff --git a/surefire-its/src/test/resources/pom.xml b/surefire-its/src/test/resources/pom.xml
index 929385c..e01ed4c 100644
--- a/surefire-its/src/test/resources/pom.xml
+++ b/surefire-its/src/test/resources/pom.xml
@@ -9,8 +9,8 @@
<name>It parent</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/reporters/pom.xml b/surefire-its/src/test/resources/reporters/pom.xml
index 82d0b54..2152525 100644
--- a/surefire-its/src/test/resources/reporters/pom.xml
+++ b/surefire-its/src/test/resources/reporters/pom.xml
@@ -43,7 +43,7 @@
<redirect.to.file>true</redirect.to.file>
<forkMode>once</forkMode>
<printSummary>true</printSummary>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/result-counting/pom.xml b/surefire-its/src/test/resources/result-counting/pom.xml
index 5147bf1..fcb7372 100644
--- a/surefire-its/src/test/resources/result-counting/pom.xml
+++ b/surefire-its/src/test/resources/result-counting/pom.xml
@@ -35,7 +35,7 @@
<properties>
<junit.version>4.8.1</junit.version>
<forkMode>once</forkMode>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/runOrder/pom.xml b/surefire-its/src/test/resources/runOrder/pom.xml
index 0544e70..84abb53 100644
--- a/surefire-its/src/test/resources/runOrder/pom.xml
+++ b/surefire-its/src/test/resources/runOrder/pom.xml
@@ -29,8 +29,8 @@
<name>Test for runOrder</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/runorder-parallel/pom.xml b/surefire-its/src/test/resources/runorder-parallel/pom.xml
index d2f38b6..1dee7d8 100644
--- a/surefire-its/src/test/resources/runorder-parallel/pom.xml
+++ b/surefire-its/src/test/resources/runorder-parallel/pom.xml
@@ -16,8 +16,8 @@
</dependencies>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/settings.xml b/surefire-its/src/test/resources/settings.xml
deleted file mode 100644
index 69a1c2a..0000000
--- a/surefire-its/src/test/resources/settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
- <localRepository>${maven.repo.local}</localRepository>
- <interactiveMode>false</interactiveMode>
- <pluginGroups>
- <pluginGroup>org.apache.maven.plugins</pluginGroup>
- <pluginGroup>org.codehaus.mojo</pluginGroup>
- </pluginGroups>
-</settings>
diff --git a/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml b/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml
index 36dff80..b12b118 100644
--- a/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml
+++ b/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml
@@ -30,8 +30,8 @@
<packaging>pom</packaging>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<modules>
diff --git a/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml b/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml
index 9ed3e9b..be2f9df 100644
--- a/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml
+++ b/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml
@@ -29,8 +29,8 @@
<name>Test for aggregated child1</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml b/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml
index 1312a3d..b8c21bf 100644
--- a/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml
+++ b/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml
@@ -29,8 +29,8 @@
<name>Test for aggregated child2</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/small-result-counting/pom.xml b/surefire-its/src/test/resources/small-result-counting/pom.xml
index fb6c175..e06061c 100644
--- a/surefire-its/src/test/resources/small-result-counting/pom.xml
+++ b/surefire-its/src/test/resources/small-result-counting/pom.xml
@@ -32,7 +32,7 @@
<properties>
<junit.version>4.8.1</junit.version>
<forkMode>once</forkMode>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml b/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
index 61b0668..5bf2bad 100644
--- a/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
@@ -32,8 +32,8 @@
<version>1.0</version>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
index 96adf0c..2f24bc4 100644
--- a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
@@ -45,8 +45,8 @@
</contributors>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml b/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
index 226023d..4229cc9 100644
--- a/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
@@ -40,8 +40,8 @@
</developers>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml b/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
index b5570fd..6bc1c31 100644
--- a/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
@@ -26,8 +26,8 @@
<version>1.0</version>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml b/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
index e58abdc..daecfc0 100644
--- a/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
@@ -30,8 +30,8 @@
<name>Surefire 1135</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
index bdccd8b..4fb9d72 100644
--- a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
@@ -41,8 +41,8 @@
</developers>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
index 8a0fdf9..9bb5c27 100644
--- a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
@@ -41,8 +41,8 @@
</developers>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1278-group-name-ending/pom.xml b/surefire-its/src/test/resources/surefire-1278-group-name-ending/pom.xml
index 399d601..d262525 100644
--- a/surefire-its/src/test/resources/surefire-1278-group-name-ending/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1278-group-name-ending/pom.xml
@@ -29,8 +29,8 @@
<name>Test for testng groups</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
index c8bd26f..30e5199 100644
--- a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
@@ -27,8 +27,8 @@
<name>Test provider</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
index 642737c..be5cf97 100644
--- a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
@@ -29,8 +29,8 @@
<name>pluggableproviders-classpath-test</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
index 76b7636..10a40c4 100644
--- a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
+++ b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
@@ -27,8 +27,8 @@
<name>Test provider</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml b/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml
index 5e1e054..1a92a0c 100644
--- a/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml
+++ b/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml
@@ -39,8 +39,8 @@
<properties>
<surefire.version>2.12.4</surefire.version>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml b/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
index 424a016..671a654 100644
--- a/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
+++ b/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
@@ -29,8 +29,8 @@
<name>Test for SUREFIRE-146 (forkMode=pertest fails to call setUp)</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1535-parallel-testng/pom.xml b/surefire-its/src/test/resources/surefire-1535-parallel-testng/pom.xml
index c7aba88..4fcc715 100644
--- a/surefire-its/src/test/resources/surefire-1535-parallel-testng/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1535-parallel-testng/pom.xml
@@ -29,8 +29,8 @@
<name>Test execution testng suites in parallel</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/pom.xml b/surefire-its/src/test/resources/surefire-162-charsetProvider/pom.xml
index 948b323..3eb6175 100644
--- a/surefire-its/src/test/resources/surefire-162-charsetProvider/pom.xml
+++ b/surefire-its/src/test/resources/surefire-162-charsetProvider/pom.xml
@@ -6,8 +6,8 @@
<name>Test alternate CharsetProvider</name>
<version>1.0-SNAPSHOT</version>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<plugins>
diff --git a/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml b/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
index 944ccaf..74217ef 100644
--- a/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
+++ b/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
@@ -29,8 +29,8 @@
<name>Test for MSUREFIRE-54 (well-formed XML failures)</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-257-rerunningTests/pom.xml b/surefire-its/src/test/resources/surefire-257-rerunningTests/pom.xml
index 4b30546..c3e6738 100644
--- a/surefire-its/src/test/resources/surefire-257-rerunningTests/pom.xml
+++ b/surefire-its/src/test/resources/surefire-257-rerunningTests/pom.xml
@@ -8,8 +8,8 @@
<packaging>pom</packaging>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
index bdb9d6f..4bb71da 100644
--- a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
+++ b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
@@ -29,8 +29,8 @@
<name>surefire-260-testsWithIdenticalNames</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-34-securityManager-success/pom.xml b/surefire-its/src/test/resources/surefire-34-securityManager-success/pom.xml
index af205c6..541f499 100644
--- a/surefire-its/src/test/resources/surefire-34-securityManager-success/pom.xml
+++ b/surefire-its/src/test/resources/surefire-34-securityManager-success/pom.xml
@@ -30,8 +30,8 @@
<properties>
<junitVersion>3.8.1</junitVersion>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-34-securityManager/pom.xml b/surefire-its/src/test/resources/surefire-34-securityManager/pom.xml
index af205c6..541f499 100644
--- a/surefire-its/src/test/resources/surefire-34-securityManager/pom.xml
+++ b/surefire-its/src/test/resources/surefire-34-securityManager/pom.xml
@@ -30,8 +30,8 @@
<properties>
<junitVersion>3.8.1</junitVersion>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-408-manual-provider-selection/pom.xml b/surefire-its/src/test/resources/surefire-408-manual-provider-selection/pom.xml
index 8579532..ac94779 100644
--- a/surefire-its/src/test/resources/surefire-408-manual-provider-selection/pom.xml
+++ b/surefire-its/src/test/resources/surefire-408-manual-provider-selection/pom.xml
@@ -29,8 +29,8 @@
<name>Test for two test cases</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-500-puzzling-error/pom.xml b/surefire-its/src/test/resources/surefire-500-puzzling-error/pom.xml
index 33bd9a5..ce01272 100644
--- a/surefire-its/src/test/resources/surefire-500-puzzling-error/pom.xml
+++ b/surefire-its/src/test/resources/surefire-500-puzzling-error/pom.xml
@@ -9,8 +9,8 @@
<url>http://maven.apache.org</url>
<properties>
<junit.version>4.4</junit.version>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
diff --git a/surefire-its/src/test/resources/surefire-510-testClassPath/pom.xml b/surefire-its/src/test/resources/surefire-510-testClassPath/pom.xml
index 24916fa..5cb7b92 100644
--- a/surefire-its/src/test/resources/surefire-510-testClassPath/pom.xml
+++ b/surefire-its/src/test/resources/surefire-510-testClassPath/pom.xml
@@ -29,8 +29,8 @@
<name>Surefire-510-systemprops</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
index 9efe896..b3238ea 100644
--- a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
@@ -8,8 +8,8 @@
<packaging>pom</packaging>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/pom.xml b/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
index daba45e..8175d3f 100644
--- a/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
+++ b/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
@@ -8,8 +8,8 @@
<name>junit4-test</name>
<url>http://maven.apache.org</url>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
diff --git a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
index a012b7f..412035d 100644
--- a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
+++ b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
@@ -9,8 +9,8 @@
<url>http://maven.apache.org</url>
<properties>
<junit.version>4.8.1</junit.version>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
diff --git a/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml b/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
index cd89dd1..9c975a8 100644
--- a/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
+++ b/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
@@ -10,8 +10,8 @@
<properties>
<junit.version>4.8.1</junit.version>
<parallel>methods</parallel>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
diff --git a/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml b/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
index 06a6162..211a99d 100644
--- a/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
+++ b/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
@@ -30,8 +30,8 @@
<properties>
<junitVersion>4.4</junitVersion>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-673-mockito/pom.xml b/surefire-its/src/test/resources/surefire-673-mockito/pom.xml
index f73c533..554705b 100644
--- a/surefire-its/src/test/resources/surefire-673-mockito/pom.xml
+++ b/surefire-its/src/test/resources/surefire-673-mockito/pom.xml
@@ -7,8 +7,8 @@
<version>1.0.0-SNAPSHOT</version>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
@@ -34,4 +34,20 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>jdk8</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>3.8.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml b/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
index 4631a8c..398a225 100644
--- a/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
+++ b/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
@@ -35,7 +35,7 @@
<properties>
<junit.version>4.8.1</junit.version>
<forkMode>once</forkMode>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml b/surefire-its/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
index 567901e..eb40366 100644
--- a/surefire-its/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
+++ b/surefire-its/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
@@ -29,8 +29,8 @@
<name>surefire-685-commaseparatedIncludes</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-697-niceSummary/pom.xml b/surefire-its/src/test/resources/surefire-697-niceSummary/pom.xml
index d86467b..52663e5 100644
--- a/surefire-its/src/test/resources/surefire-697-niceSummary/pom.xml
+++ b/surefire-its/src/test/resources/surefire-697-niceSummary/pom.xml
@@ -29,8 +29,8 @@
<name>Tests summary with long/multiline exception messages</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-733-allOverridesCaptured/pom.xml b/surefire-its/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
index 4ed3472..acb0d5e 100644
--- a/surefire-its/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
+++ b/surefire-its/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
@@ -50,7 +50,7 @@
<properties>
<junit.version>4.8.1</junit.version>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml b/surefire-its/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml
index cdf4de2..9c039d4 100644
--- a/surefire-its/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml
+++ b/surefire-its/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml
@@ -11,8 +11,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml b/surefire-its/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml
index 78aa765..ae8ad78 100644
--- a/surefire-its/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml
+++ b/surefire-its/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml
@@ -11,8 +11,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-806-specifiedTests-multi/pom.xml b/surefire-its/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
index dd4090d..296ded6 100644
--- a/surefire-its/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
+++ b/surefire-its/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
@@ -29,8 +29,8 @@
<name>Test for single test in one of multiple executions</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-806-specifiedTests-single/pom.xml b/surefire-its/src/test/resources/surefire-806-specifiedTests-single/pom.xml
index 617446b..74e261a 100644
--- a/surefire-its/src/test/resources/surefire-806-specifiedTests-single/pom.xml
+++ b/surefire-its/src/test/resources/surefire-806-specifiedTests-single/pom.xml
@@ -29,8 +29,8 @@
<name>Test for single test in one of multiple executions</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-809-groupExpr-junit48/pom.xml b/surefire-its/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
index ff49c39..30f1708 100644
--- a/surefire-its/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
+++ b/surefire-its/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
@@ -31,8 +31,8 @@
<properties>
<junit.version>4.8.1</junit.version>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-809-groupExpr-testng/pom.xml b/surefire-its/src/test/resources/surefire-809-groupExpr-testng/pom.xml
index 5c39211..983e5bb 100644
--- a/surefire-its/src/test/resources/surefire-809-groupExpr-testng/pom.xml
+++ b/surefire-its/src/test/resources/surefire-809-groupExpr-testng/pom.xml
@@ -30,8 +30,8 @@
<properties>
<groups>!CategoryC</groups>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<plugins>
diff --git a/surefire-its/src/test/resources/surefire-812-log4j-classloader/pom.xml b/surefire-its/src/test/resources/surefire-812-log4j-classloader/pom.xml
index c24eb50..61be350 100644
--- a/surefire-its/src/test/resources/surefire-812-log4j-classloader/pom.xml
+++ b/surefire-its/src/test/resources/surefire-812-log4j-classloader/pom.xml
@@ -7,8 +7,8 @@
<version>1.0.0-SNAPSHOT</version>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml b/surefire-its/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
index 683327b..cef444e 100644
--- a/surefire-its/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
+++ b/surefire-its/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
@@ -7,8 +7,8 @@
<name>cyril</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml b/surefire-its/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
index 5f64d10..2d005b6 100644
--- a/surefire-its/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
+++ b/surefire-its/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
@@ -32,8 +32,8 @@
<properties>
<junitVersion>4.8.1</junitVersion>
<groups>junit4.CategoryA,junit4.CategoryB</groups>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml b/surefire-its/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
index 67ea160..989f8af 100644
--- a/surefire-its/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
+++ b/surefire-its/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
@@ -19,8 +19,8 @@
<name>TestNG group expressions tests</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-832-provider-selection/pom.xml b/surefire-its/src/test/resources/surefire-832-provider-selection/pom.xml
index f2dbec0..895dd91 100644
--- a/surefire-its/src/test/resources/surefire-832-provider-selection/pom.xml
+++ b/surefire-its/src/test/resources/surefire-832-provider-selection/pom.xml
@@ -32,8 +32,8 @@
<properties>
<junitVersion>4.8.1</junitVersion>
<groups>junit4.CategoryA,junit4.CategoryB</groups>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-847-testngfail/pom.xml b/surefire-its/src/test/resources/surefire-847-testngfail/pom.xml
index 511ea6b..18cb679 100644
--- a/surefire-its/src/test/resources/surefire-847-testngfail/pom.xml
+++ b/surefire-its/src/test/resources/surefire-847-testngfail/pom.xml
@@ -54,7 +54,7 @@
</build>
<properties>
<defaultSuiteFile>${basedir}/src/test/resources/suite.xml</defaultSuiteFile>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/surefire-855-failsafe-use-war/pom.xml b/surefire-its/src/test/resources/surefire-855-failsafe-use-war/pom.xml
index 3361e8c..96634a7 100644
--- a/surefire-its/src/test/resources/surefire-855-failsafe-use-war/pom.xml
+++ b/surefire-its/src/test/resources/surefire-855-failsafe-use-war/pom.xml
@@ -98,7 +98,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>3.3.2</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
diff --git a/surefire-its/src/test/resources/surefire-930-failsafe-runtests/pom.xml b/surefire-its/src/test/resources/surefire-930-failsafe-runtests/pom.xml
index bc20362..8535068 100644
--- a/surefire-its/src/test/resources/surefire-930-failsafe-runtests/pom.xml
+++ b/surefire-its/src/test/resources/surefire-930-failsafe-runtests/pom.xml
@@ -11,8 +11,8 @@
<properties>
<surefire.version>2.12.4</surefire.version>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
diff --git a/surefire-its/src/test/resources/surefire-931-provider-failure/pom.xml b/surefire-its/src/test/resources/surefire-931-provider-failure/pom.xml
index b866def..6232149 100644
--- a/surefire-its/src/test/resources/surefire-931-provider-failure/pom.xml
+++ b/surefire-its/src/test/resources/surefire-931-provider-failure/pom.xml
@@ -12,8 +12,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<plugins>
diff --git a/surefire-its/src/test/resources/surefire-943-report-content/pom.xml b/surefire-its/src/test/resources/surefire-943-report-content/pom.xml
index 13e8403..3b2958f 100644
--- a/surefire-its/src/test/resources/surefire-943-report-content/pom.xml
+++ b/surefire-its/src/test/resources/surefire-943-report-content/pom.xml
@@ -10,8 +10,8 @@
<properties>
<surefire.version>2.13</surefire.version>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml b/surefire-its/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
index 83e3870..53bb0a3 100644
--- a/surefire-its/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
+++ b/surefire-its/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
@@ -27,8 +27,8 @@
<name>Tests killing the main maven process when using reusable forks</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/pom.xml b/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
index 005eb4f..811be93 100644
--- a/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
+++ b/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
@@ -12,8 +12,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml b/surefire-its/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
index 220f37b..7a2ac4d 100644
--- a/surefire-its/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
+++ b/surefire-its/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
@@ -10,8 +10,8 @@
<module>boom</module>
</modules>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<pluginManagement>
diff --git a/surefire-its/src/test/resources/surefire-975-wrong-encoding/pom.xml b/surefire-its/src/test/resources/surefire-975-wrong-encoding/pom.xml
index 571809f..49848d6 100755
--- a/surefire-its/src/test/resources/surefire-975-wrong-encoding/pom.xml
+++ b/surefire-its/src/test/resources/surefire-975-wrong-encoding/pom.xml
@@ -9,8 +9,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml b/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml
index e0c7477..79e1c7d 100644
--- a/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml
+++ b/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml
@@ -7,8 +7,8 @@
<name>surefire-979-base</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml b/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml
index e8ef424..cae9147 100644
--- a/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml
+++ b/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml
@@ -7,8 +7,8 @@
<name>surefire-979</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml b/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml
index 9a4c595..c9c1f91 100644
--- a/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml
+++ b/surefire-its/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml
@@ -13,8 +13,8 @@
</modules>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/system-properties/pom.xml b/surefire-its/src/test/resources/system-properties/pom.xml
index 79899b5..1d2952d 100644
--- a/surefire-its/src/test/resources/system-properties/pom.xml
+++ b/surefire-its/src/test/resources/system-properties/pom.xml
@@ -91,8 +91,8 @@
<properties>
<setOnArgLineWorkAround>fool</setOnArgLineWorkAround>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
diff --git a/surefire-its/src/test/resources/test-helper-dump-pid-plugin/pom.xml b/surefire-its/src/test/resources/test-helper-dump-pid-plugin/pom.xml
index 0c4a15e..4a01e23 100644
--- a/surefire-its/src/test/resources/test-helper-dump-pid-plugin/pom.xml
+++ b/surefire-its/src/test/resources/test-helper-dump-pid-plugin/pom.xml
@@ -12,8 +12,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/testng-afterSuiteFailure/pom.xml b/surefire-its/src/test/resources/testng-afterSuiteFailure/pom.xml
index 3958c79..0b96853 100644
--- a/surefire-its/src/test/resources/testng-afterSuiteFailure/pom.xml
+++ b/surefire-its/src/test/resources/testng-afterSuiteFailure/pom.xml
@@ -29,8 +29,8 @@
<name>TestNG failure after suite</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-beforeMethod/pom.xml b/surefire-its/src/test/resources/testng-beforeMethod/pom.xml
index 63f3445..1072958 100644
--- a/surefire-its/src/test/resources/testng-beforeMethod/pom.xml
+++ b/surefire-its/src/test/resources/testng-beforeMethod/pom.xml
@@ -29,8 +29,8 @@
<name>TestNG @BeforeMethod annotation</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-beforeMethodFailure/pom.xml b/surefire-its/src/test/resources/testng-beforeMethodFailure/pom.xml
index 6e8ee65..88b6a4e 100644
--- a/surefire-its/src/test/resources/testng-beforeMethodFailure/pom.xml
+++ b/surefire-its/src/test/resources/testng-beforeMethodFailure/pom.xml
@@ -29,8 +29,8 @@
<name>TestNG failure in @BeforeMethod annotation</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-execute-error/pom.xml b/surefire-its/src/test/resources/testng-execute-error/pom.xml
index a140357..7e06dbe 100644
--- a/surefire-its/src/test/resources/testng-execute-error/pom.xml
+++ b/surefire-its/src/test/resources/testng-execute-error/pom.xml
@@ -29,8 +29,8 @@
<name>Test proper output from forked execution in case of uncatched error during suite run</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-groups/pom.xml b/surefire-its/src/test/resources/testng-groups/pom.xml
index f26929e..f6b7447 100644
--- a/surefire-its/src/test/resources/testng-groups/pom.xml
+++ b/surefire-its/src/test/resources/testng-groups/pom.xml
@@ -29,8 +29,8 @@
<name>Test for testng groups</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/testng-jdk14/pom.xml b/surefire-its/src/test/resources/testng-jdk14/pom.xml
index 2098e7d..337f71c 100644
--- a/surefire-its/src/test/resources/testng-jdk14/pom.xml
+++ b/surefire-its/src/test/resources/testng-jdk14/pom.xml
@@ -29,8 +29,8 @@
<name>Test for testng jdk14 integration</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/testng-junit-together/pom.xml b/surefire-its/src/test/resources/testng-junit-together/pom.xml
index f8d0b20..93c9942 100644
--- a/surefire-its/src/test/resources/testng-junit-together/pom.xml
+++ b/surefire-its/src/test/resources/testng-junit-together/pom.xml
@@ -29,8 +29,8 @@
<name>TestNG and Junit Together</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-listener-reporter/pom.xml b/surefire-its/src/test/resources/testng-listener-reporter/pom.xml
index 3fed89f..af6ac28 100644
--- a/surefire-its/src/test/resources/testng-listener-reporter/pom.xml
+++ b/surefire-its/src/test/resources/testng-listener-reporter/pom.xml
@@ -29,8 +29,8 @@
<name>TestNG listener and reporter test</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-method-pattern-after/pom.xml b/surefire-its/src/test/resources/testng-method-pattern-after/pom.xml
index fac74ae..41768cd 100644
--- a/surefire-its/src/test/resources/testng-method-pattern-after/pom.xml
+++ b/surefire-its/src/test/resources/testng-method-pattern-after/pom.xml
@@ -29,8 +29,8 @@
<name>Test for Testng</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-method-pattern-before/pom.xml b/surefire-its/src/test/resources/testng-method-pattern-before/pom.xml
index fac74ae..41768cd 100644
--- a/surefire-its/src/test/resources/testng-method-pattern-before/pom.xml
+++ b/surefire-its/src/test/resources/testng-method-pattern-before/pom.xml
@@ -29,8 +29,8 @@
<name>Test for Testng</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-method-pattern/pom.xml b/surefire-its/src/test/resources/testng-method-pattern/pom.xml
index fb627b7..50b08bf 100644
--- a/surefire-its/src/test/resources/testng-method-pattern/pom.xml
+++ b/surefire-its/src/test/resources/testng-method-pattern/pom.xml
@@ -29,8 +29,8 @@
<name>Test for Testng</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-parallel-with-annotations/pom.xml b/surefire-its/src/test/resources/testng-parallel-with-annotations/pom.xml
index ed45863..9464c84 100644
--- a/surefire-its/src/test/resources/testng-parallel-with-annotations/pom.xml
+++ b/surefire-its/src/test/resources/testng-parallel-with-annotations/pom.xml
@@ -18,8 +18,8 @@
<version>1.0-SNAPSHOT</version>
<name>TestNG group/parallel thread tests, with parallel settings set by @Test(threadPoolSize)</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
diff --git a/surefire-its/src/test/resources/testng-path with spaces/pom.xml b/surefire-its/src/test/resources/testng-path with spaces/pom.xml
index cedd92d..3f1138a 100644
--- a/surefire-its/src/test/resources/testng-path with spaces/pom.xml
+++ b/surefire-its/src/test/resources/testng-path with spaces/pom.xml
@@ -29,8 +29,8 @@
<name>TestNG test in a path with spaces</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-simple/pom.xml b/surefire-its/src/test/resources/testng-simple/pom.xml
index 7ab3904..d361ddc 100644
--- a/surefire-its/src/test/resources/testng-simple/pom.xml
+++ b/surefire-its/src/test/resources/testng-simple/pom.xml
@@ -76,8 +76,8 @@
<surefire.testng.verbose>0</surefire.testng.verbose>
<argLine/>
<jacoco.agent/>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/testng-single-method-5-14-9/pom.xml b/surefire-its/src/test/resources/testng-single-method-5-14-9/pom.xml
index b7629d5..a10bd0f 100644
--- a/surefire-its/src/test/resources/testng-single-method-5-14-9/pom.xml
+++ b/surefire-its/src/test/resources/testng-single-method-5-14-9/pom.xml
@@ -29,8 +29,8 @@
<name>Test for Testng</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/testng-single-method/pom.xml b/surefire-its/src/test/resources/testng-single-method/pom.xml
index 330ffcb..32ebfaf 100644
--- a/surefire-its/src/test/resources/testng-single-method/pom.xml
+++ b/surefire-its/src/test/resources/testng-single-method/pom.xml
@@ -29,8 +29,8 @@
<name>Test for Testng</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-suite-xml/pom.xml b/surefire-its/src/test/resources/testng-suite-xml/pom.xml
index b0af8b8..ec02455 100644
--- a/surefire-its/src/test/resources/testng-suite-xml/pom.xml
+++ b/surefire-its/src/test/resources/testng-suite-xml/pom.xml
@@ -29,8 +29,8 @@
<name>TestNG Suite XML File</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/testng-twoTestCaseSuite/pom.xml b/surefire-its/src/test/resources/testng-twoTestCaseSuite/pom.xml
index 0293192..f7477fe 100644
--- a/surefire-its/src/test/resources/testng-twoTestCaseSuite/pom.xml
+++ b/surefire-its/src/test/resources/testng-twoTestCaseSuite/pom.xml
@@ -29,8 +29,8 @@
<name>TestNG Suite XML with two test cases</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<profiles>
diff --git a/surefire-its/src/test/resources/timeout-forked/pom.xml b/surefire-its/src/test/resources/timeout-forked/pom.xml
index a36f8f4..fc95eb3 100644
--- a/surefire-its/src/test/resources/timeout-forked/pom.xml
+++ b/surefire-its/src/test/resources/timeout-forked/pom.xml
@@ -29,8 +29,8 @@
<name>Timeout forked process</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
diff --git a/surefire-its/src/test/resources/unicode-testnames/pom.xml b/surefire-its/src/test/resources/unicode-testnames/pom.xml
index cd0a7b8..c186f83 100644
--- a/surefire-its/src/test/resources/unicode-testnames/pom.xml
+++ b/surefire-its/src/test/resources/unicode-testnames/pom.xml
@@ -31,8 +31,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/working-directory-is-invalid-property/pom.xml b/surefire-its/src/test/resources/working-directory-is-invalid-property/pom.xml
index 53d42fb..fa19695 100644
--- a/surefire-its/src/test/resources/working-directory-is-invalid-property/pom.xml
+++ b/surefire-its/src/test/resources/working-directory-is-invalid-property/pom.xml
@@ -28,8 +28,8 @@
<name>Don't run tests if working directory is invalid property.</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/working-directory-missing/pom.xml b/surefire-its/src/test/resources/working-directory-missing/pom.xml
index de466d9..515a414 100644
--- a/surefire-its/src/test/resources/working-directory-missing/pom.xml
+++ b/surefire-its/src/test/resources/working-directory-missing/pom.xml
@@ -26,8 +26,8 @@
<version>1.0</version>
<name>Run tests in a nonexistent working directory</name>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
diff --git a/surefire-its/src/test/resources/working-directory/pom.xml b/surefire-its/src/test/resources/working-directory/pom.xml
index 9880d63..1a7b7d7 100644
--- a/surefire-its/src/test/resources/working-directory/pom.xml
+++ b/surefire-its/src/test/resources/working-directory/pom.xml
@@ -30,8 +30,8 @@
<packaging>pom</packaging>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<modules>