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 2018/02/04 02:47:43 UTC
[1/4] maven-surefire git commit: [SUREFIRE-1463] integration tests
should run on the top of JDK 9 [Forced Update!]
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1463 075b5c413 -> e340afd47 (forced update)
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/working-directory/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory/pom.xml b/surefire-integration-tests/src/test/resources/working-directory/pom.xml
index 88d7f46..1a7b7d7 100644
--- a/surefire-integration-tests/src/test/resources/working-directory/pom.xml
+++ b/surefire-integration-tests/src/test/resources/working-directory/pom.xml
@@ -28,6 +28,12 @@
<version>1.0-SNAPSHOT</version>
<name>Test for working directory configuration (parent)</name>
<packaging>pom</packaging>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<modules>
<module>child</module>
</modules>
[4/4] maven-surefire git commit: [SUREFIRE-1463] integration tests
should run on the top of JDK 9
Posted by ti...@apache.org.
[SUREFIRE-1463] integration tests should run on the top of JDK 9
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e340afd4
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e340afd4
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e340afd4
Branch: refs/heads/SUREFIRE-1463
Commit: e340afd471f7479adbbf9ab2241a5842c1a3d76c
Parents: 27a5e6a
Author: Tibor17 <ti...@apache.org>
Authored: Sat Jan 13 23:22:07 2018 +0100
Committer: Tibor17 <ti...@apache.org>
Committed: Sun Feb 4 03:47:21 2018 +0100
----------------------------------------------------------------------
Jenkinsfile | 255 +++++++++++++++++--
README.md | 4 +-
maven-failsafe-plugin/pom.xml | 1 +
.../src/it/jetty-war-test-failing/pom.xml | 10 +-
.../src/it/jetty-war-test-passing/pom.xml | 10 +-
.../src/it/multiple-summaries-failing/pom.xml | 6 +
.../src/it/multiple-summaries/pom.xml | 6 +
.../src/it/working-directory/pom.xml | 6 +
.../ModularClasspathForkConfigurationTest.java | 5 +-
pom.xml | 7 +-
surefire-booter/pom.xml | 7 +
.../maven/surefire/booter/SystemUtils.java | 4 +-
.../maven/surefire/booter/ClasspathTest.java | 9 +
.../maven/surefire/booter/JUnit4SuiteTest.java | 6 +-
.../maven/surefire/booter/SystemUtilsTest.java | 7 +-
surefire-integration-tests/pom.xml | 50 +---
.../maven/surefire/its/AbstractJigsawIT.java | 23 +-
.../maven/surefire/its/Java9FullApiIT.java | 5 +-
.../apache/maven/surefire/its/RunOrderIT.java | 1 -
.../surefire/its/fixture/SurefireLauncher.java | 45 +++-
...urefire1295AttributeJvmCrashesToTestsIT.java | 19 +-
.../resources/environment-variables/pom.xml | 14 +-
.../src/test/resources/fail-fast-junit/pom.xml | 8 -
.../src/test/resources/fail-fast-testng/pom.xml | 8 -
.../src/test/resources/failingBuilds/pom.xml | 10 +-
.../src/test/resources/failsafe-notests/pom.xml | 7 +
.../resources/failure-result-counting/pom.xml | 10 +-
.../src/test/resources/failureOutput/pom.xml | 10 +-
.../test/resources/fork-consoleOutput/pom.xml | 10 +-
.../fork-consoleOutputWithErrors/pom.xml | 10 +-
.../src/test/resources/fork-fail/pom.xml | 14 +-
.../resources/fork-mode-multimodule/pom.xml | 13 +-
.../fork-mode-resource-loading/pom.xml | 12 +-
.../src/test/resources/fork-mode-testng/pom.xml | 12 +-
.../src/test/resources/fork-mode/pom.xml | 12 +-
.../src/test/resources/fork-timeout/pom.xml | 7 +-
.../includes-excludes-from-file/pom.xml | 2 +
.../test/resources/includes-excludes/pom.xml | 4 +-
.../test/resources/isolated-classloader/pom.xml | 4 +
.../src/test/resources/java9-full-api/pom.xml | 5 -
.../resources/junit-fork-mode-always/pom.xml | 15 +-
.../src/test/resources/junit-ignore/pom.xml | 10 +-
.../src/test/resources/junit-innerClass/pom.xml | 5 +
.../junit-notExtendingTestCase/pom.xml | 5 +
.../test/resources/junit-pathWithUmlaut/pom.xml | 5 +
.../resources/junit-twoTestCaseSuite/pom.xml | 5 +
.../test/resources/junit-twoTestCases/pom.xml | 5 +
.../junit4-forkAlways-staticInit/pom.xml | 13 +-
.../junit4-rerun-failing-tests/pom.xml | 13 +-
.../test/resources/junit4-runlistener/pom.xml | 10 +-
.../resources/junit4-twoTestCaseSuite/pom.xml | 10 +-
.../src/test/resources/junit4/pom.xml | 12 +-
.../src/test/resources/junit44-dep/pom.xml | 14 +-
.../test/resources/junit44-environment/pom.xml | 13 +-
.../src/test/resources/junit44-hamcrest/pom.xml | 14 +-
.../resources/junit44-method-pattern/pom.xml | 10 +-
.../resources/junit44-multiple-methods/pom.xml | 8 -
.../resources/junit44-single-method/pom.xml | 10 +-
.../test/resources/junit47-parallel-nts/pom.xml | 7 -
.../junit47-parallel-with-suite/pom.xml | 10 +-
.../src/test/resources/junit47-parallel/pom.xml | 7 -
.../resources/junit47-redirect-output/pom.xml | 10 +-
.../junit47-static-inner-class-tests/pom.xml | 12 +-
.../test/resources/junit48-categories/pom.xml | 10 +-
.../resources/junit48-method-pattern/pom.xml | 8 -
.../junit48-multiple-method-patterns/pom.xml | 8 -
.../resources/junit48-multiple-methods/pom.xml | 8 -
.../resources/junit48-single-method/pom.xml | 8 -
.../resources/junit48-smartStackTrace/pom.xml | 10 +-
.../src/test/resources/norunnableTests/pom.xml | 5 +
.../src/test/resources/parallel-runtime/pom.xml | 12 +-
.../resources/plain-old-java-classpath/pom.xml | 5 +
.../src/test/resources/plexus-conflict/pom.xml | 5 +
.../src/test/resources/pojo-simple/pom.xml | 13 +-
.../src/test/resources/pom.xml | 10 +-
.../src/test/resources/reporters/pom.xml | 10 +-
.../src/test/resources/result-counting/pom.xml | 10 +-
.../src/test/resources/runOrder/pom.xml | 5 +
.../test/resources/runorder-parallel/pom.xml | 13 +-
.../sibling-aggregator/aggregator/pom.xml | 6 +
.../resources/sibling-aggregator/child1/pom.xml | 5 +
.../resources/sibling-aggregator/child2/pom.xml | 5 +
.../resources/small-result-counting/pom.xml | 10 +-
.../jiras-surefire-1024-testjar/pom.xml | 17 +-
.../pom.xml | 14 -
.../pom.xml | 7 -
.../surefire-1053-system-properties/pom.xml | 7 -
.../surefire-1055-parallelTestCount/pom.xml | 8 -
.../pom.xml | 13 +-
.../pom.xml | 13 +-
.../surefire-1095-npe-in-runlistener/pom.xml | 7 -
.../surefire-1098-balanced-runorder/pom.xml | 7 -
.../pom.xml | 13 +-
.../pom.xml | 13 +-
.../pom.xml | 8 -
.../resources/surefire-1144-xml-runtime/pom.xml | 13 -
.../pom.xml | 7 -
.../pom.xml | 8 -
.../pom.xml | 7 -
.../surefire-1158-remove-info-lines/pom.xml | 8 -
.../pom.xml | 8 -
.../src/test/resources/surefire-1185/pom.xml | 7 -
.../surefire-1202-rerun-and-failfast/pom.xml | 15 +-
.../surefire-1209-rerun-and-forkcount/pom.xml | 15 +-
.../src/test/resources/surefire-1211/pom.xml | 8 -
.../surefire-1278-group-name-ending/pom.xml | 13 +-
.../src/test/resources/surefire-1364/pom.xml | 3 +-
.../src/test/resources/surefire-1367/pom.xml | 2 -
.../pom.xml | 5 +
.../pom.xml | 5 +
.../pom.xml | 16 +-
.../surefire-141-pluggableproviders/pom.xml | 12 +-
.../surefire-146-forkPerTestNoSetup/pom.xml | 5 +
.../surefire-162-charsetProvider/pom.xml | 11 +-
.../surefire-224-wellFormedXmlFailures/pom.xml | 5 +
.../surefire-257-rerunningTests/pom.xml | 5 +
.../surefire-260-testWithIdenticalNames/pom.xml | 5 +
.../surefire-34-securityManager-success/pom.xml | 11 +-
.../surefire-34-securityManager/pom.xml | 11 +-
.../pom.xml | 5 +
.../surefire-500-puzzling-error/pom.xml | 15 +-
.../surefire-510-testClassPath/pom.xml | 12 +-
.../pom.xml | 5 +
.../surefire-613-testCount-in-parallel/pom.xml | 12 +-
.../pom.xml | 12 +-
.../pom.xml | 10 +-
.../pom.xml | 11 +-
.../surefire-649-systemProperties/pom.xml | 7 -
.../pom.xml | 7 -
.../test/resources/surefire-673-mockito/pom.xml | 13 +-
.../surefire-674-buildFailingWhenErrors/pom.xml | 10 +-
.../surefire-685-commaseparatedIncludes/pom.xml | 5 +
.../resources/surefire-697-niceSummary/pom.xml | 5 +
.../surefire-733-allOverridesCaptured/pom.xml | 2 +
.../pom.xml | 7 +-
.../pom.xml | 7 +-
.../surefire-806-specifiedTests-multi/pom.xml | 5 +
.../surefire-806-specifiedTests-single/pom.xml | 5 +
.../surefire-809-groupExpr-junit48/pom.xml | 10 +-
.../surefire-809-groupExpr-testng/pom.xml | 11 +-
.../surefire-812-log4j-classloader/pom.xml | 13 +-
.../resources/surefire-817-system-exit/pom.xml | 7 -
.../surefire-818-ignored-tests-on-npe/pom.xml | 10 +-
.../surefire-828-emptyGroupExpr-junit48/pom.xml | 10 +-
.../surefire-828-emptyGroupExpr-testng/pom.xml | 15 +-
.../surefire-832-provider-selection/pom.xml | 10 +-
.../resources/surefire-847-testngfail/pom.xml | 11 +-
.../surefire-855-failsafe-use-bundle/pom.xml | 10 +-
.../surefire-855-failsafe-use-jar/pom.xml | 10 +-
.../surefire-855-failsafe-use-war/pom.xml | 10 +-
.../surefire-930-failsafe-runtests/pom.xml | 7 +-
.../surefire-931-provider-failure/pom.xml | 11 +-
.../surefire-943-report-content/pom.xml | 7 +-
.../pom.xml | 13 +-
.../surefire-946-self-destruct-plugin/pom.xml | 7 +-
.../surefire-972-bizarre-noclassdef/pom.xml | 4 +
.../surefire-975-wrong-encoding/pom.xml | 7 +-
.../module1/pom.xml | 10 +-
.../module2/pom.xml | 10 +-
.../pom.xml | 10 +-
.../pom.xml | 8 -
.../surefire-995-categoryInheritance/pom.xml | 7 -
.../test/resources/system-properties/pom.xml | 2 +
.../test-helper-dump-pid-plugin/pom.xml | 7 +-
.../resources/testng-afterSuiteFailure/pom.xml | 15 +-
.../test/resources/testng-beforeMethod/pom.xml | 16 +-
.../testng-beforeMethodFailure/pom.xml | 15 +-
.../test/resources/testng-execute-error/pom.xml | 12 +-
.../testng-group-thread-parallel/pom.xml | 8 -
.../src/test/resources/testng-groups/pom.xml | 13 +-
.../src/test/resources/testng-jdk14/pom.xml | 5 +
.../resources/testng-junit-together/pom.xml | 14 +-
.../resources/testng-junit4-together/pom.xml | 13 -
.../resources/testng-listener-reporter/pom.xml | 14 +-
.../testng-method-pattern-after/pom.xml | 17 +-
.../testng-method-pattern-before/pom.xml | 17 +-
.../resources/testng-method-pattern/pom.xml | 14 +-
.../testng-multiple-method-patterns/pom.xml | 8 -
.../test/resources/testng-objectFactory/pom.xml | 8 -
.../resources/testng-parallel-suites/pom.xml | 8 -
.../testng-parallel-with-annotations/pom.xml | 12 +-
.../resources/testng-path with spaces/pom.xml | 16 +-
.../src/test/resources/testng-simple/pom.xml | 13 +-
.../testng-single-method-5-14-9/pom.xml | 14 +-
.../test/resources/testng-single-method/pom.xml | 14 +-
.../src/test/resources/testng-suite-xml/pom.xml | 13 +-
.../resources/testng-testRunnerFactory/pom.xml | 8 -
.../resources/testng-twoTestCaseSuite/pom.xml | 14 +-
.../src/test/resources/timeout-forked/pom.xml | 5 +
.../test/resources/unicode-testnames/pom.xml | 7 +-
.../pom.xml | 7 +
.../resources/working-directory-missing/pom.xml | 4 +
.../test/resources/working-directory/pom.xml | 6 +
193 files changed, 880 insertions(+), 1221 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 9863659..bf174d5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,31 +1,244 @@
-pipeline {
- agent none
- stages {
- stage('Parallel Unix and Windows Build') {
- steps {
- parallel unix: {
- node("${env.NIX_LABEL}") {
- checkout scm
- withEnv(["JAVA_HOME=${tool('JDK 1.8.0_144')}", "PATH+MAVEN=${tool('Maven 3.5.0')}/bin:${env.JAVA_HOME}/bin"]) {
- sh "mvn clean install jacoco:report -B -U -e -fae -V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false -Dintegration-test-port=8084 \\\"-Djdk.home=${tool('JDK 9 b181')}\\\""
+#!/usr/bin/env groovy
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+properties([buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '0', daysToKeepStr: env.BRANCH_NAME == 'master' ? '30' : '7', numToKeepStr: '5'))])
+
+def oses = ['windows']//['linux', 'windows']
+def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
+def jdks = ['8']//env.BRANCH_NAME == 'master' ? ['7', '8', '9', '10'] : ['9']
+
+def cmd = ['mvn']
+def options = ['-e', '-V']
+def optionsITs = ['-e', '-V', '-P', 'run-its']
+def goals = ['clean', 'install'] // , 'jacoco:report'
+def goalsITs = ['verify']
+def Map stages = [:]
+
+oses.eachWithIndex { os, indexOfOs ->
+
+ mavens.eachWithIndex { maven, indexOfMaven ->
+
+ jdks.eachWithIndex { jdk, indexOfJdk ->
+
+ def String label = jenkinsEnv.labelForOS(os);
+ def String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
+ def String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+ def String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+
+ def stageKey = "${os}-jdk${jdk}-maven${maven}"
+
+ if (label == null || jdkTestName == null || mvnName == null) {
+ println "Skipping ${stageKey} as unsupported by Jenkins Environment."
+ return;
+ }
+
+ println "${stageKey} ==> Label: ${label}, JDK: ${jdkTestName}, Maven: ${mvnName}."
+
+
+ stages[stageKey] = {
+ if (os == 'windows') {
+ node("${env.WIN_LABEL}") {
+ try {
+ println "Basedir = ${pwd()}."
+
+ def mvnLocalRepoDir
+
+ dir('.repository') {
+ mvnLocalRepoDir = "${pwd()}"
+ }
+
+ println "Maven Local Repository = ${mvnLocalRepoDir}."
+
+ dir('build') {
+ stage("checkout ${stageKey}") {
+ checkout scm
+ }
+
+ stage("build ${stageKey}") {
+ def jdkTestHome = resolveToolNameToJavaPath(jdkTestName, mvnName)
+ println("Setting JDK for testing -Djdk.home=${jdkTestHome}")
+
+ def properties = ["\"-Djdk.home=${jdkTestHome}\"", "-Djacoco.skip=true"]
+
+ withMaven(jdk: jdkName, maven: mvnName,
+ mavenLocalRepo: mvnLocalRepoDir, mavenOpts: '-Xmx512m') {
+ def script = cmd + options + goals // + properties
+ bat script.join(' ')
+ }
+ }
+
+ stage("build-failsafe-it ${stageKey}") {
+ lock('maven-surefire-its') {
+// timeout(time: 15, unit: 'MINUTES') {
+ withMaven(jdk: jdkName, maven: mvnName,
+ mavenLocalRepo: mvnLocalRepoDir, mavenOpts: '-Xmx512m',
+ options: [invokerPublisher()]) {
+ def script = cmd + optionsITs + goalsITs + propertiesITs
+ bat script.join(' ')
+ }
+// }
+ }
+ }
+ }
+ } finally {
+ println(readFile('build/surefire-booter/target/surefire-reports/org.apache.maven.surefire.booter.JUnit4SuiteTest-output.txt'))
+// zip(zipFile: "it--maven-failsafe-plugin--${stageKey}.zip", dir: 'build/maven-failsafe-plugin/target/it', archive: true)
+// zip(zipFile: "it--surefire-integration-tests--${stageKey}.zip", dir: 'build/surefire-integration-tests/target', archive: true)
+
+ stage("cleanup ${stageKey}") {
+ // clean up after ourselves to reduce disk space
+ cleanWs()
+ }
}
- jacoco changeBuildStatus: false, execPattern: '**/*.exec', sourcePattern: '**/src/main/java', exclusionPattern: 'pkg/*.class,plexusConflict/*.class,**/surefire570/**/*.class,siblingAggregator/*.class,surefire257/*.class,surefire979/*.class,org/apache/maven/surefire/crb/*.class,org/apache/maven/plugins/surefire/selfdestruct/*.class,org/apache/maven/plugins/surefire/dumppid/*.class,org/apache/maven/plugin/surefire/*.class,org/apache/maven/plugin/failsafe/*.class,jiras/**/*.class,org/apache/maven/surefire/testng/*.class,org/apache/maven/surefire/testprovider/*.class,**/test/*.class,**/org/apache/maven/surefire/group/parse/*.class'
- junit healthScaleFactor: 0.0, allowEmptyResults: true, keepLongStdio: true, testResults: '**/surefire-integration-tests/target/failsafe-reports/**/*.xml,**/surefire-integration-tests/target/surefire-reports/**/*.xml,**/maven-*/target/surefire-reports/**/*.xml,**/surefire-*/target/surefire-reports/**/*.xml,**/common-*/target/surefire-reports/**/*.xml'
}
- },
- windows: {
- node("${env.WIN_LABEL}") {
- checkout scm
- withEnv(["JAVA_HOME=${tool('JDK 1.8_121 (Windows Only)')}", "PATH+MAVEN=${tool('Maven 3.5.0 (Windows)')}\\bin;${env.JAVA_HOME}\\bin"]) {
- bat "mvn clean install jacoco:report -B -U -e -fae -V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false -Dintegration-test-port=8084"
+ } else {
+ node("${env.NIX_LABEL}") {
+ try {
+ println "Basedir = ${pwd()}."
+
+ def mvnLocalRepoDir
+
+ dir('.repository') {
+ mvnLocalRepoDir = "${pwd()}"
+ }
+
+ println "Maven Local Repository = ${mvnLocalRepoDir}."
+
+ dir('build') {
+ stage("checkout ${stageKey}") {
+ checkout scm
+ }
+
+ stage("build ${stageKey}") {
+ def jdkTestHome = resolveToolNameToJavaPath(jdkTestName, mvnName)
+ println("Setting JDK for testing -Djdk.home=${jdkTestHome}")
+
+ //https://github.com/jacoco/jacoco/issues/629
+ def skipJacoco = jdk == '9' ? 'false' : 'true'
+ def propertiesJdk = "\"-Djdk.home=${jdkTestHome}\""
+ def properties = [propertiesJdk, "-Djacoco.skip=${skipJacoco}"]
+ def propertiesITs = [propertiesJdk, '-Djacoco.skip=true']
+
+ withMaven(jdk: jdkName, maven: mvnName,
+ mavenLocalRepo: mvnLocalRepoDir, mavenOpts: '-Xmx1g') {
+ def script = cmd + options + goals + properties
+ sh script.join(' ')
+ }
+ }
+
+ stage("build-failsafe-it ${stageKey}") {
+ lock('maven-surefire-its') {
+// timeout(time: 15, unit: 'MINUTES') {
+ withMaven(jdk: jdkName, maven: mvnName,
+ mavenLocalRepo: mvnLocalRepoDir, mavenOpts: '-Xmx1g',
+ options: [invokerPublisher()]) {
+ def script = cmd + optionsITs + goalsITs + propertiesITs
+ sh script.join(' ')
+ }
+// }
+ }
+ }
+ }
+ } finally {
+ if (indexOfMaven == mavens.size() - 1 && jdk == '9') {
+ jacoco changeBuildStatus: false, execPattern: '**/*.exec', sourcePattern: '**/src/main/java', exclusionPattern: 'pkg/*.class,plexusConflict/*.class,**/surefire570/**/*.class,siblingAggregator/*.class,surefire257/*.class,surefire979/*.class,org/apache/maven/surefire/crb/*.class,org/apache/maven/plugins/surefire/selfdestruct/*.class,org/apache/maven/plugins/surefire/dumppid/*.class,org/apache/maven/plugin/surefire/*.class,org/apache/maven/plugin/failsafe/*.class,jiras/**/*.class,org/apache/maven/surefire/testng/*.class,org/apache/maven/surefire/testprovider/*.class,**/test/*.class,**/org/apache/maven/surefire/group/parse/*.class'
+ junit healthScaleFactor: 0.0, allowEmptyResults: true, keepLongStdio: true, testResults: '**/surefire-integration-tests/target/failsafe-reports/**/*.xml,**/surefire-integration-tests/target/surefire-reports/**/*.xml,**/maven-*/target/surefire-reports/**/*.xml,**/surefire-*/target/surefire-reports/**/*.xml,**/common-*/target/surefire-reports/**/*.xml'
+ if (currentBuild.result == 'UNSTABLE') currentBuild.result = 'FAILURE'
+ }
+
+// zip(zipFile: "it--maven-failsafe-plugin--${stageKey}.zip", dir: 'build/maven-failsafe-plugin/target/it', archive: true)
+// zip(zipFile: "it--surefire-integration-tests--${stageKey}.zip", dir: 'build/surefire-integration-tests/target', archive: true)
+//
+// sh 'tar czvf it1.tgz build/maven-failsafe-plugin/target/it'
+// sh 'tar czvf it2.tgz build/surefire-integration-tests/target'
+// archiveArtifacts(artifacts: '**/*.tgz', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
+// archiveArtifacts(artifacts: '*.tgz', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
+
+ stage("cleanup ${stageKey}") {
+ // clean up after ourselves to reduce disk space
+ cleanWs()
+ }
}
}
}
}
}
}
- options {
- buildDiscarder(logRotator(numToKeepStr:'10'))
- timeout(time: 10, unit: 'HOURS')
+}
+
+timeout(time: 18, unit: 'HOURS') {
+ try {
+ parallel(stages)
+ // JENKINS-34376 seems to make it hard to detect the aborted builds
+ } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) {
+ // this ambiguous condition means a user probably aborted
+ if (e.causes.size() == 0) {
+ currentBuild.result = "ABORTED"
+ } else {
+ currentBuild.result = "FAILURE"
+ }
+ throw e
+ } catch (hudson.AbortException e) {
+ // this ambiguous condition means during a shell step, user probably aborted
+ if (e.getMessage().contains('script returned exit code 143')) {
+ currentBuild.result = "ABORTED"
+ } else {
+ currentBuild.result = "FAILURE"
+ }
+ throw e
+ } catch (InterruptedException e) {
+ currentBuild.result = "ABORTED"
+ throw e
+ } catch (Throwable e) {
+ currentBuild.result = "FAILURE"
+ throw e
+ } finally {
+ stage("notifications") {
+ //jenkinsNotify()
+ }
+ }
+}
+
+/**
+ * It is used instead of tool(${jdkTestName}).
+ */
+def resolveToolNameToJavaPath(jdkToolName, mvnName) {
+ def javaHome = null
+ try {
+ withMaven(jdk: jdkToolName, maven: mvnName) {
+ javaHome = isUnix() ? sh(script: 'echo -en $JAVA_HOME', returnStdout: true) : bat(script: '@echo %JAVA_HOME%', returnStdout: true)
+ }
+
+ if (javaHome != null) {
+ javaHome = javaHome.trim()
+ def exec = javaHome + (isUnix() ? '/bin/java' : '\\bin\\java.exe')
+ if (!fileExists(exec)) {
+ println "The ${exec} does not exist in jdkToolName=${jdkToolName}."
+ javaHome = null
+ }
+ }
+ } catch(e) {
+ println "Caught an exception while resolving 'jdkToolName' ${jdkToolName} via 'mvnName' ${mvnName}: ${e}"
+ javaHome = null;
}
+ assert javaHome != null : "Could not resolve ${jdkToolName} to JAVA_HOME."
+ return javaHome
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 2361f5d..c3dd2d2 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,8 @@ In order to build Surefire project use **Maven 3.1.0+** and **JDK 1.8**.
But in order to run IT tests, you can do:
* In order to run tests for a release check during the vote the following memory requirements are needed:
- **(on Linux/Unix)** *export MAVEN_OPTS="-Xmx768m -XX:MaxMetaspaceSize=864m -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true"*
- **(on Windows)** *set MAVEN_OPTS="-Xmx768m -XX:MaxMetaspaceSize=864m -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true"*
+ **(on Linux/Unix)** *export MAVEN_OPTS="-server -Xmx512m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Dhttps.protocols=TLSv1"*
+ **(on Windows)** *set MAVEN_OPTS="-server -Xmx256m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Dhttps.protocols=TLSv1"*
* In order to run the build with **JDK 9** **on Windows** (**on Linux/Unix modify system property jdk.home**):
*mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program Files\Java\jdk9\"*
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/maven-failsafe-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index ace3231..9e3d87b 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -300,6 +300,7 @@
</execution>
</executions>
<configuration>
+ <javaHome>${jdk.home}</javaHome>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml
----------------------------------------------------------------------
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 cc65b18..193791d 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
@@ -118,14 +118,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -135,6 +127,8 @@
<integration-test-port>8083</integration-test-port>
<integration-test-stop-port>18009</integration-test-stop-port>
<jetty-version>9.2.2.v20140723</jetty-version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml
----------------------------------------------------------------------
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 b90d3d8..31dc8ec 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
@@ -118,14 +118,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -135,6 +127,8 @@
<integration-test-port>8083</integration-test-port>
<integration-test-stop-port>18009</integration-test-stop-port>
<jetty-version>9.2.2.v20140723</jetty-version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml
----------------------------------------------------------------------
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 41e36d5..aedbdde 100644
--- a/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml
+++ b/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml
@@ -25,6 +25,12 @@
<artifactId>working-directory-test</artifactId>
<version>1.0</version>
<name>Run tests multiple times</name>
+
+ <properties>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml b/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml
index 921af08..d87409f 100644
--- a/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml
+++ b/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml
@@ -25,6 +25,12 @@
<artifactId>working-directory-test</artifactId>
<version>1.0</version>
<name>Run tests multiple times</name>
+
+ <properties>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/maven-failsafe-plugin/src/it/working-directory/pom.xml
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/it/working-directory/pom.xml b/maven-failsafe-plugin/src/it/working-directory/pom.xml
index c250b69..6cf2bc5 100644
--- a/maven-failsafe-plugin/src/it/working-directory/pom.xml
+++ b/maven-failsafe-plugin/src/it/working-directory/pom.xml
@@ -25,6 +25,12 @@
<artifactId>working-directory-test</artifactId>
<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>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java
index ce384fe..6053f24 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java
@@ -39,6 +39,7 @@ import java.util.Properties;
import static java.io.File.separator;
import static java.io.File.pathSeparator;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static java.nio.file.Files.readAllLines;
import static java.util.Arrays.asList;
import static java.util.Collections.singleton;
@@ -84,7 +85,7 @@ public class ModularClasspathForkConfigurationTest
config.createArgsFile( descriptor, modulePath, classPath, packages, patchFile, startClassName );
assertThat( jigsawArgsFile ).isNotNull();
- List<String> argsFileLines = readAllLines( jigsawArgsFile.toPath() );
+ List<String> argsFileLines = readAllLines( jigsawArgsFile.toPath(), UTF_8 );
assertThat( argsFileLines ).hasSize( 13 );
assertThat( argsFileLines.get( 0 ) ).isEqualTo( "--module-path" );
assertThat( argsFileLines.get( 1 ) ).isEqualTo( "modular.jar" + pathSeparator + "target/classes" );
@@ -118,7 +119,7 @@ public class ModularClasspathForkConfigurationTest
assertThat( cli.getArguments()[0] ).startsWith( "@" );
File argFile = new File( cli.getArguments()[0].substring( 1 ) );
assertThat( argFile ).isFile();
- List<String> argsFileLines2 = readAllLines( argFile.toPath() );
+ List<String> argsFileLines2 = readAllLines( argFile.toPath(), UTF_8 );
assertThat( argsFileLines2 ).hasSize( 13 );
for ( int i = 0; i < argsFileLines2.size(); i++ )
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3592b31..8a9a405 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,8 +97,8 @@
<maven.site.path>surefire-archives/surefire-LATEST</maven.site.path>
<!-- Override with Jigsaw JRE 9 -->
<jdk.home>${java.home}/..</jdk.home>
- <maven.compiler.testSource>1.8</maven.compiler.testSource>
- <maven.compiler.testTarget>1.8</maven.compiler.testTarget>
+ <maven.compiler.testSource>1.7</maven.compiler.testSource>
+ <maven.compiler.testTarget>1.7</maven.compiler.testTarget>
</properties>
<dependencyManagement>
@@ -263,7 +263,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.10.0</version>
+ <version>2.13.0</version>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
@@ -434,6 +434,7 @@
<!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! -->
<useSystemClassLoader>false</useSystemClassLoader>
<argLine>-Xms128m -Xmx144m ${jacoco.agent}</argLine>
+ <useFile>false</useFile>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-booter/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
index 0d7f431..96b81b5 100644
--- a/surefire-booter/pom.xml
+++ b/surefire-booter/pom.xml
@@ -115,6 +115,13 @@
<includes>
<include>**/JUnit4SuiteTest.java</include>
</includes>
+ <!--todo in version 3.0 remove old commons-lang3 and use 3.7+ -->
+ <classpathDependencyExcludes>
+ <classpathDependencyExclude>org.apache.commons:commons-lang3</classpathDependencyExclude>
+ </classpathDependencyExcludes>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${maven.repo.local}/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java
index 0a68a80..9cb0ef9 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java
@@ -55,9 +55,9 @@ public final class SystemUtils
{
public static final BigDecimal JAVA_SPECIFICATION_VERSION = getJavaSpecificationVersion();
- private static final BigDecimal JAVA_VERSION_7 = new BigDecimal( "1.7" );
+ private static final BigDecimal JAVA_VERSION_7 = new BigDecimal( "1.7" ).stripTrailingZeros();
- private static final BigDecimal JIGSAW_JAVA_VERSION = new BigDecimal( 9 );
+ private static final BigDecimal JIGSAW_JAVA_VERSION = new BigDecimal( 9 ).stripTrailingZeros();
private static final int PROC_STATUS_PID_FIRST_CHARS = 20;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ClasspathTest.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ClasspathTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ClasspathTest.java
index 78a180b..d07937e 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ClasspathTest.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ClasspathTest.java
@@ -41,6 +41,15 @@ public class ClasspathTest
public void testShouldWriteEmptyPropertyForEmptyClasspath()
throws Exception
{
+ try
+ {
+ Class c = Class.forName( "org.apache.commons.lang3.SystemUtils" );
+ System.out.println( "JUnit4SuiteTest: Found class org.apache.commons.lang3.SystemUtils: URL=" + c.getResource( "" ) );
+ }
+ catch ( ClassNotFoundException e )
+ {
+ System.out.println( "JUnit4SuiteTest: Not found class org.apache.commons.lang3.SystemUtils" );
+ }
Classpath classpath = Classpath.emptyClasspath();
classpath.writeToSystemProperty( DUMMY_PROPERTY_NAME );
assertEquals( "", System.getProperty( DUMMY_PROPERTY_NAME ) );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-booter/src/test/java/org/apache/maven/surefire/booter/JUnit4SuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/JUnit4SuiteTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/JUnit4SuiteTest.java
index f073a8b..c3e0b04 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/JUnit4SuiteTest.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/JUnit4SuiteTest.java
@@ -34,9 +34,9 @@ import org.junit.runners.Suite;
ClasspathTest.class,
CommandReaderTest.class,
PropertiesWrapperTest.class,
- SurefireReflectorTest.class,
- PpidCheckerTest.class,
- SystemUtilsTest.class
+ SurefireReflectorTest.class
+ // PpidCheckerTest.class,
+ // SystemUtilsTest.class
} )
@RunWith( Suite.class )
public class JUnit4SuiteTest
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java
index d1ba04f..5120cb5 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java
@@ -63,7 +63,7 @@ public class SystemUtilsTest
public void shouldMatchJavaSpecVersion() throws Exception
{
BigDecimal actual = invokeMethod( SystemUtils.class, "getJavaSpecificationVersion" );
- BigDecimal expected = new BigDecimal( System.getProperty( "java.specification.version" ) );
+ BigDecimal expected = new BigDecimal( System.getProperty( "java.specification.version" ) ).stripTrailingZeros();
assertThat( actual ).isEqualTo( expected );
assertThat( SystemUtils.JAVA_SPECIFICATION_VERSION ).isEqualTo( expected );
}
@@ -84,7 +84,7 @@ public class SystemUtilsTest
}
@Test
- public void incorrectJdkPath() throws IOException
+ public void incorrectJdkPath()
{
File jre = new File( System.getProperty( "java.home" ) );
File jdk = jre.getParentFile();
@@ -285,6 +285,7 @@ public class SystemUtilsTest
.isEqualTo( expectedPid );
}
+ @SuppressWarnings( "unused" )
public static ClassLoader getPlatformClassLoader()
{
return ClassLoader.getSystemClassLoader();
@@ -313,7 +314,7 @@ public class SystemUtilsTest
}
}
- private static void testIsJava9AtLeast( File pathInJdk ) throws IOException
+ private static void testIsJava9AtLeast( File pathInJdk )
{
File path = new File( pathInJdk, "bin" + separator + "java" );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
index c1a6c4a..15ebd45 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -34,9 +34,6 @@
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <it.settings.showPasswords>false</it.settings.showPasswords>
- <surefire.threadcount>5</surefire.threadcount>
- <useInterpolatedSettings>false</useInterpolatedSettings>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
@@ -76,8 +73,10 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
+ <!-- Java 9 requires version 3.6+ (todo use in parent POM. Note: versions 3.6, 3.7 are compiled with Java 7) -->
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
+ <version>3.7</version>
</dependency>
</dependencies>
@@ -93,13 +92,14 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<configuration>
+ <jvm>${jdk.home}/bin/java</jvm>
<runOrder>alphabetical</runOrder>
<threadCount>1</threadCount>
<perCoreThreadCount>false</perCoreThreadCount>
- <forkMode>never</forkMode>
- <argLine>${argLine}</argLine>
+ <forkMode>once</forkMode>
+ <argLine>-server -Xmx64m -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.awt.headless=true</argLine>
<includes>
- <include>org/apache/**/*IT*.java</include>
+ <include>org/apache/**/AbstractTestCaseIT.java</include>
</includes>
<!-- Pass current surefire version to the main suite so that it -->
<!-- can forward to all integration test projects. SUREFIRE-513 -->
@@ -113,13 +113,14 @@
<maven.repo.local>${project.basedir}/../surefire-setup-integration-tests/target/it-repo</maven.repo.local>
<maven.test.tmpdir>${project.build.directory}</maven.test.tmpdir>
<user.localRepository>${settings.localRepository}</user.localRepository>
- <useInterpolatedSettings>${useInterpolatedSettings}</useInterpolatedSettings>
+ <useInterpolatedSettings>false</useInterpolatedSettings>
<testBuildDirectory>${project.build.testOutputDirectory}</testBuildDirectory>
- <verifier.forkMode>${verifier.forkMode}</verifier.forkMode>
+ <verifier.forkMode>forked</verifier.forkMode>
<jdk.home>${jdk.home}</jdk.home>
<jacoco.agent>${jacoco-it.agent}</jacoco.agent>
</systemPropertyVariables>
<redirectTestOutputToFile>false</redirectTestOutputToFile>
+ <useFile>false</useFile>
</configuration>
<dependencies>
<dependency>
@@ -198,37 +199,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>parallel</id>
- <properties>
- <useInterpolatedSettings>false</useInterpolatedSettings>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <parallel>classes</parallel>
- <threadCount>${surefire.threadcount}</threadCount>
- <argLine>${argLine} -Xmx512m -XX:MaxPermSize=356m</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>embedded</id>
- <activation>
- <file>
- <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
- <exists>${basedir}</exists>
- </file>
- </activation>
- <properties>
- <verifier.forkMode>auto</verifier.forkMode>
- </properties>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
index 5063a2d..7f73d48 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
@@ -29,6 +29,8 @@ import java.io.InputStream;
import java.util.Properties;
import java.util.StringTokenizer;
+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;
import static org.junit.Assume.assumeTrue;
@@ -41,8 +43,6 @@ import static org.junit.Assume.assumeTrue;
public abstract class AbstractJigsawIT
extends SurefireJUnit4IntegrationTestCase
{
- protected static final String JDK_HOME_KEY = "jdk.home";
- protected static final String JDK_HOME = System.getProperty( JDK_HOME_KEY );
private static final double JIGSAW_JAVA_VERSION = 9.0d;
protected abstract String getProjectDirectoryName();
@@ -50,22 +50,17 @@ public abstract class AbstractJigsawIT
protected SurefireLauncher assumeJigsaw() throws IOException
{
assumeTrue( "There's no JDK 9 provided.",
- isJavaVersion9AtLeast() || JDK_HOME != null && isExtJavaVerion9AtLeast() );
- // fail( JDK_HOME_KEY + " was provided with value " + JDK_HOME + " but it is not Jigsaw Java 9." );
+ isJavaVersion9AtLeast() || EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() );
+ // fail( EXT_JDK_HOME_KEY + " was provided with value " + EXT_JDK_HOME + " but it is not Jigsaw Java 9." );
SurefireLauncher launcher = unpack();
- if ( JDK_HOME != null )
- {
- launcher.setLauncherJavaHome( JDK_HOME );
- }
-
- return launcher;
+ return EXT_JDK_HOME == null ? launcher : launcher.setLauncherJavaHome( EXT_JDK_HOME );
}
protected SurefireLauncher assumeJava9Property() throws IOException
{
- assumeTrue( "There's no JDK 9 provided.", JDK_HOME != null && isExtJavaVerion9AtLeast() );
+ assumeTrue( "There's no JDK 9 provided.", EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() );
return unpack();
}
@@ -81,12 +76,12 @@ public abstract class AbstractJigsawIT
private static boolean isExtJavaVerion9AtLeast() throws IOException
{
- File release = new File( JDK_HOME, "release" );
+ File release = new File( EXT_JDK_HOME, "release" );
if ( !release.isFile() )
{
- fail( JDK_HOME_KEY + " was provided with value " + JDK_HOME + " but file does not exist "
- + JDK_HOME + File.separator + "release"
+ fail( EXT_JDK_HOME_KEY + " was provided with value " + EXT_JDK_HOME + " but file does not exist "
+ + EXT_JDK_HOME + File.separator + "release"
);
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
index 22841ae..5d9b7fe 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
@@ -25,6 +25,9 @@ import org.junit.Test;
import java.io.File;
import java.io.IOException;
+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;
+
/**
* Running Surefire on the top of JDK 9 and should be able to load
* classes of multiple different Jigsaw modules without error.
@@ -59,7 +62,7 @@ public class Java9FullApiIT
OutputValidator validator = assumeJava9Property()
.setForkJvm()
.debugLogging()
- .sysProp( JDK_HOME_KEY, new File( JDK_HOME ).getCanonicalPath() )
+ .sysProp( EXT_JDK_HOME_KEY, new File( EXT_JDK_HOME ).getCanonicalPath() )
.execute( "verify" )
.verifyErrorFree( 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
index c71e5d6..099aa07 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
@@ -83,7 +83,6 @@ public class RunOrderIT
}
private OutputValidator executeWithRunOrder( String runOrder )
- throws IOException, VerificationException
{
return unpack().forkMode( getForkMode() ).runOrder( runOrder ).executeTest().verifyErrorFree( 3 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 1c6c971..a9fc346 100755
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -26,6 +26,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
/**
* Encapsulate all needed features to start a surefire run
* <br>
@@ -36,6 +38,12 @@ import java.util.List;
*/
public final class SurefireLauncher
{
+ public static final String EXT_JDK_HOME_KEY = "jdk.home";
+
+ public static final String EXT_JDK_HOME = System.getProperty( EXT_JDK_HOME_KEY );
+
+ private static final File JAVA_HOME = javaHome();
+
private final MavenLauncher mavenLauncher;
private final String surefireVersion = System.getProperty( "surefire.version" );
@@ -66,25 +74,38 @@ public final class SurefireLauncher
setInProcessJavaHome();
}
- public SurefireLauncher setInProcessJavaHome()
+ private static File javaHome()
{
- String javaHome = System.getenv( "JAVA_HOME" );
- if ( javaHome != null && !javaHome.isEmpty() )
+ String javaHome = isBlank( EXT_JDK_HOME ) ? System.getenv( "JAVA_HOME" ) : EXT_JDK_HOME;
+ if ( isBlank( javaHome ) )
{
- try
+ javaHome = System.getProperty( "java.home" );
+ File jre = new File( javaHome );
+ if ( "jre".equals( jre.getName() ) )
{
- File javaHomeAsDir = new File( javaHome ).getCanonicalFile();
- if ( javaHomeAsDir.isDirectory() )
- {
- setLauncherJavaHome( javaHomeAsDir.getPath() );
- }
+ javaHome = jre.getParent();
}
- catch ( IOException e )
+ }
+
+ try
+ {
+ File javaHomeAsDir = new File( javaHome ).getCanonicalFile();
+ if ( !javaHomeAsDir.isDirectory() )
{
- throw new RuntimeException( e );
+ throw new RuntimeException( javaHomeAsDir.getAbsolutePath() + " is not a JAVA_HOME directory." );
}
+ System.out.println( "Using JAVA_HOME=" + javaHomeAsDir.getAbsolutePath() + " in forked launcher." );
+ return javaHomeAsDir;
}
- return this;
+ catch ( IOException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
+
+ private void setInProcessJavaHome()
+ {
+ setLauncherJavaHome( JAVA_HOME.getPath() );
}
public SurefireLauncher setLauncherJavaHome( String javaHome )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
index f051c1c..3ca758a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
@@ -27,9 +27,10 @@ import org.junit.Before;
import org.junit.Test;
import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
-import static org.apache.commons.lang.SystemUtils.IS_OS_LINUX;
-import static org.apache.commons.lang.SystemUtils.IS_OS_MAC_OSX;
+import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX;
+import static org.apache.commons.lang3.SystemUtils.IS_OS_MAC_OSX;
import static org.fest.assertions.Assertions.assertThat;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
@@ -51,7 +52,7 @@ public class Surefire1295AttributeJvmCrashesToTestsIT
}
@Test
- public void crashInFork() throws VerificationException
+ public void crashInFork() throws VerificationException, InterruptedException
{
SurefireLauncher launcher = unpack( "crash-during-test" );
@@ -59,7 +60,7 @@ public class Surefire1295AttributeJvmCrashesToTestsIT
}
@Test
- public void crashInSingleUseFork() throws VerificationException
+ public void crashInSingleUseFork() throws VerificationException, InterruptedException
{
SurefireLauncher launcher = unpack( "crash-during-test" )
.forkCount( 1 )
@@ -69,7 +70,7 @@ public class Surefire1295AttributeJvmCrashesToTestsIT
}
@Test
- public void crashInReusableFork() throws VerificationException
+ public void crashInReusableFork() throws VerificationException, InterruptedException
{
SurefireLauncher launcher = unpack( "crash-during-test" )
.forkPerThread()
@@ -80,14 +81,14 @@ public class Surefire1295AttributeJvmCrashesToTestsIT
}
private static void checkCrashTypes( SurefireLauncher launcher )
- throws VerificationException
+ throws VerificationException, InterruptedException
{
checkCrash( launcher.addGoal( "-DcrashType=exit" ) );
checkCrash( launcher.addGoal( "-DcrashType=abort" ) );
checkCrash( launcher.addGoal( "-DcrashType=segfault" ) );
}
- private static void checkCrash( SurefireLauncher launcher ) throws VerificationException
+ private static void checkCrash( SurefireLauncher launcher ) throws VerificationException, InterruptedException
{
OutputValidator validator = launcher.maven()
.withFailure()
@@ -97,6 +98,10 @@ public class Surefire1295AttributeJvmCrashesToTestsIT
)
.verifyTextInLog( "Crashed tests:" );
+ // Cannot flush log.txt stream because it is consumed internally by Verifier.
+ // Waiting for the stream to become flushed on disk.
+ TimeUnit.SECONDS.sleep( 1L );
+
for ( Iterator<String> it = validator.loadLogLines().iterator(); it.hasNext(); )
{
String line = it.next();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/environment-variables/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/environment-variables/pom.xml b/surefire-integration-tests/src/test/resources/environment-variables/pom.xml
index 79f4eda..902e97e 100644
--- a/surefire-integration-tests/src/test/resources/environment-variables/pom.xml
+++ b/surefire-integration-tests/src/test/resources/environment-variables/pom.xml
@@ -29,8 +29,10 @@
<name>Test for checking environment variables into forks</name>
<properties>
- <forkMode>always</forkMode>
- <useSystemClassLoader>false</useSystemClassLoader>
+ <forkMode>always</forkMode>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
@@ -56,14 +58,6 @@
</environmentVariables>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml b/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml
index 6d6aca2..b82448e 100644
--- a/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml
@@ -50,14 +50,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<runOrder>alphabetical</runOrder>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml b/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml
index 47e5e24..d52ad12 100644
--- a/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml
@@ -47,14 +47,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<runOrder>alphabetical</runOrder>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml b/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml
index 46da1bf..8e988ad 100644
--- a/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml
+++ b/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml
@@ -18,14 +18,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -42,5 +34,7 @@
<properties>
<junit.version>4.8.1</junit.version>
<forkMode>once</forkMode>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml b/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml
index bc414e4..24d1dec 100644
--- a/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml
@@ -21,10 +21,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>localhost</groupId>
<artifactId>failsafe-notests</artifactId>
<version>1.0</version>
<name>failsafe-notests</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml b/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml
index 59f60cd..7d79f29 100644
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml
+++ b/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml
@@ -18,14 +18,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -40,5 +32,7 @@
<properties>
<junit.version>4.10</junit.version>
<forkMode>once</forkMode>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failureOutput/pom.xml b/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
index 71ff2c4..85c10ee 100644
--- a/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
+++ b/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
@@ -19,14 +19,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -51,6 +43,8 @@
<printSummary>true</printSummary>
<useFile>true</useFile>
<reportFormat>brief</reportFormat>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml b/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
index 29610f9..407d86b 100644
--- a/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
@@ -19,14 +19,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -48,6 +40,8 @@
<forkMode>once</forkMode>
<printSummary>true</printSummary>
<reportFormat>brief</reportFormat>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml b/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml
index fd92dde..9aa5e1b 100644
--- a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml
@@ -19,14 +19,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -51,6 +43,8 @@
<printSummary>true</printSummary>
<useFile>true</useFile>
<reportFormat>brief</reportFormat>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/fork-fail/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-fail/pom.xml b/surefire-integration-tests/src/test/resources/fork-fail/pom.xml
index e0de5b0..9db6d72 100644
--- a/surefire-integration-tests/src/test/resources/fork-fail/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-fail/pom.xml
@@ -28,17 +28,15 @@
<version>1.0-SNAPSHOT</version>
<name>Test for failing fork</name>
- <properties><argLine>-Xmxxxx712743m</argLine></properties>
+ <properties>
+ <argLine>-Xmxxxx712743m</argLine>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml
index 7535569..e0786b1 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml
@@ -30,6 +30,11 @@
<packaging>pom</packaging>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<modules>
<module>module-a</module>
<module>module-b</module>
@@ -38,14 +43,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
index 1c00ea6..e40033c 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
@@ -28,16 +28,14 @@
<version>1.0-SNAPSHOT</version>
<name>Test for forkMode</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
index a622fa5..8e25749 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
@@ -12,16 +12,14 @@
<version>1.0-SNAPSHOT</version>
<name>Test for forkMode</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
index cf77bb0..28bfb4d 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
@@ -28,16 +28,14 @@
<version>1.0-SNAPSHOT</version>
<name>Test for forkMode</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml b/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
index c0d03c5..25365a2 100644
--- a/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
@@ -12,6 +12,8 @@
<junit.parallel>classes</junit.parallel>
<forkMode>once</forkMode>
<timeOut>1</timeOut>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
@@ -24,11 +26,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml
index 025f182..39313db 100644
--- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml
+++ b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml
@@ -31,6 +31,8 @@ under the License.
<properties>
<junit.version>3.8.2</junit.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml b/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
index 504171e..77711f7 100644
--- a/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
+++ b/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
@@ -31,10 +31,10 @@ under the License.
<properties>
<junit.version>3.8.2</junit.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
-
-
<dependencies>
<dependency>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml b/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml
index dbed07b..a853063 100644
--- a/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml
+++ b/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml
@@ -28,6 +28,10 @@
<version>1.0-SNAPSHOT</version>
<name>Test for useSystemClassLoader=false</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml b/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml
index dc44fb7..2e4d4f3 100644
--- a/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml
+++ b/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml
@@ -32,11 +32,6 @@
<artifactId>java9-full-api</artifactId>
- <properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
- </properties>
-
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml b/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml
index ed2d930..9b86c75 100644
--- a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml
@@ -28,21 +28,18 @@
<version>1.0-SNAPSHOT</version>
<name>Test for forkMode</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
+ <version>${surefire.version}</version>
<configuration>
<forkMode>${forkMode}</forkMode>
-
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml b/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
index a73c362..d9c3817 100644
--- a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
@@ -32,6 +32,8 @@
<junit.version>4.4</junit.version>
<surefire.parallel></surefire.parallel>
<surefire.threadcount>3</surefire.threadcount>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,14 +48,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml b/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml
index 40b5060..fb1ffd6 100644
--- a/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test JUnit classes with inner classes</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml b/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml
index e459f45..8a95201 100644
--- a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for JUnit tests that don't extend TestCase</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml b/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml
index 321aba7..890839e 100644
--- a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test path with Ãœmlaut</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml
index 0e2a12c..f2075ae 100644
--- a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for single suite with two test cases</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
[3/4] maven-surefire git commit: [SUREFIRE-1463] integration tests
should run on the top of JDK 9
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml b/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
index e74f485..89684ad 100644
--- a/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
@@ -23,6 +23,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>junit-twoTestCases</artifactId>
<version>1.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml b/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
index 57765e0..4bfc081 100644
--- a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
@@ -10,6 +10,11 @@
Test that static initializers on classes other than the one being executed in the current test-set will not be run, and cannot pollute the environment.
</description>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -28,14 +33,6 @@
<forkMode>always</forkMode>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml b/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml
index 95e8471..9456a29 100644
--- a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for rerun failing tests in JUnit 4</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -41,14 +46,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml b/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml
index 1487d3a..d776533 100644
--- a/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml
@@ -31,6 +31,8 @@
<properties>
<junitVersion>4.4</junitVersion>
<provider>surefire-junit4</provider>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,14 +48,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml
index 6c83538..867cd09 100644
--- a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml
@@ -31,6 +31,8 @@
<properties>
<junitVersion>4.4</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,14 +48,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit4/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4/pom.xml b/surefire-integration-tests/src/test/resources/junit4/pom.xml
index 894b608..bba9b00 100644
--- a/surefire-integration-tests/src/test/resources/junit4/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4/pom.xml
@@ -17,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -28,9 +27,10 @@
<version>1.0-SNAPSHOT</version>
<name>Test for JUnit 4</name>
-
<properties>
<junitVersion>4.4</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,14 +46,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml b/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
index b19f5f7..d26c024 100644
--- a/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for junit-dep</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -53,15 +58,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml b/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
index b7904d2..eb04443 100644
--- a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for setting environment variables</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -48,14 +53,6 @@
</environmentVariables>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml b/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
index 8bc0e93..4140b41 100644
--- a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for JUnit44 with Hamcrest extensions</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -40,18 +45,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
-
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
index 2ef4471..e9ac59e 100644
--- a/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
@@ -31,6 +31,8 @@
<properties>
<junitVersion>4.4</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,14 +48,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml b/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml
index 2757d54..9858f4c 100644
--- a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml
@@ -57,14 +57,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<test>junit4/BasicTest#testSuccessOne+testFailOne,junit4/TestThree#testSuccessTwo</test>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml b/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
index e3d28ac..c74aee2 100644
--- a/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
@@ -31,6 +31,8 @@
<properties>
<junitVersion>4.4</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,14 +48,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml b/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml
index d984c58..92a2fb3 100644
--- a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml
@@ -57,13 +57,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml b/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
index e8b08d7..5dcbaba 100644
--- a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
@@ -16,19 +16,13 @@
</dependencies>
<properties>
<parallel>methods</parallel>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml b/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml
index 2c17576..dbbd4e9 100644
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml
@@ -59,13 +59,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${argLine} ${jacoco.agent}</argLine>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml b/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
index f5e7f80..38ec727 100644
--- a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
@@ -19,14 +19,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<dependencies>
@@ -59,6 +51,8 @@
<forkMode>once</forkMode>
<printSummary>true</printSummary>
<parallel>none</parallel>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml b/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml
index 60d3b99..81f26c2 100644
--- a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml
@@ -7,6 +7,10 @@
<version>1.0-SNAPSHOT</version>
<name>junit47-static-inner-class-tests</name>
<url>http://maven.apache.org</url>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -18,14 +22,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml b/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml
index ef40d2e..a83b687 100644
--- a/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml
@@ -33,6 +33,8 @@
<junit.version>4.8.1</junit.version>
<groups>junit4.CategoryA,junit4.CategoryB</groups>
<excludedGroups></excludedGroups>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -48,14 +50,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
index d7b99fe..8689549 100644
--- a/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
@@ -52,14 +52,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<test>BasicTest#testSuccess*</test>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml b/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml
index f6de751..f307687 100644
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml
@@ -50,14 +50,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml b/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml
index 999627b..09ef51e 100644
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml
@@ -52,14 +52,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<test>junit4/BasicTest#testSuccessOne+testFailOne,junit4/TestThree#testSuccessTwo</test>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml b/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
index 3ab2235..96061ce 100644
--- a/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
@@ -52,14 +52,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<test>BasicTest#testSuccessOne</test>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml b/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml
index eaafcde..fe104a4 100644
--- a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml
@@ -31,6 +31,8 @@
<properties>
<junitVersion>4.8.1</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,14 +48,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml b/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml
index cde195f..dd1a3cc 100644
--- a/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test JUnit classes with inner classes</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml b/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml
index dba4c97..f39f949 100644
--- a/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml
+++ b/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml
@@ -16,22 +16,16 @@
</dependencies>
<properties>
- <parallel>classes</parallel>
+ <parallel>classes</parallel>
<threadCount>3</threadCount>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml b/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
index 22ef8a6..72bd38c 100644
--- a/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
+++ b/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for useManifestOnlyJar=false</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml b/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml
index 19c5486..338904a 100644
--- a/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml
+++ b/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for plexus conflict</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml b/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml
index ae30de0..45986ac 100644
--- a/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml
+++ b/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml
@@ -28,20 +28,17 @@
<version>1.0-SNAPSHOT</version>
<name>Pojo simple test</name>
+ <properties>
+ <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 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/pom.xml b/surefire-integration-tests/src/test/resources/pom.xml
index a5a9341..e01ed4c 100644
--- a/surefire-integration-tests/src/test/resources/pom.xml
+++ b/surefire-integration-tests/src/test/resources/pom.xml
@@ -8,15 +8,15 @@
<version>1.0</version>
<name>It parent</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/reporters/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/reporters/pom.xml b/surefire-integration-tests/src/test/resources/reporters/pom.xml
index 8ea3d17..2152525 100644
--- a/surefire-integration-tests/src/test/resources/reporters/pom.xml
+++ b/surefire-integration-tests/src/test/resources/reporters/pom.xml
@@ -21,14 +21,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -51,5 +43,7 @@
<redirect.to.file>true</redirect.to.file>
<forkMode>once</forkMode>
<printSummary>true</printSummary>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/pom.xml b/surefire-integration-tests/src/test/resources/result-counting/pom.xml
index 7e7f262..fcb7372 100644
--- a/surefire-integration-tests/src/test/resources/result-counting/pom.xml
+++ b/surefire-integration-tests/src/test/resources/result-counting/pom.xml
@@ -18,14 +18,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -43,5 +35,7 @@
<properties>
<junit.version>4.8.1</junit.version>
<forkMode>once</forkMode>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/runOrder/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runOrder/pom.xml b/surefire-integration-tests/src/test/resources/runOrder/pom.xml
index 063e82b..84abb53 100644
--- a/surefire-integration-tests/src/test/resources/runOrder/pom.xml
+++ b/surefire-integration-tests/src/test/resources/runOrder/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for runOrder</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml b/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
index edbc7fa..1dee7d8 100644
--- a/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
+++ b/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
@@ -15,18 +15,15 @@
</dependency>
</dependencies>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml b/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
index eb5f25c..b12b118 100644
--- a/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
+++ b/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
@@ -28,6 +28,12 @@
<version>1.0-SNAPSHOT</version>
<name>Test for aggregator whose modules are in ../child</name>
<packaging>pom</packaging>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<modules>
<module>../child1</module>
<module>../child2</module>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml b/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
index ba34f0a..be2f9df 100644
--- a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
+++ b/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for aggregated child1</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml b/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
index 5ca21cd..b8c21bf 100644
--- a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
+++ b/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for aggregated child2</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml b/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml
index d48eb92..e06061c 100644
--- a/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml
+++ b/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml
@@ -18,14 +18,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -40,5 +32,7 @@
<properties>
<junit.version>4.8.1</junit.version>
<forkMode>once</forkMode>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
index b613fcb..5bf2bad 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
@@ -31,6 +31,11 @@
<artifactId>jiras-surefire-1024-testjar</artifactId>
<version>1.0</version>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -39,16 +44,4 @@
<optional>true</optional>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
index 2b7659e..8598f1e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
@@ -50,18 +50,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
index 00ed618..6fefa7d 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
@@ -59,13 +59,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<groups>jiras.surefire1036.IntegrationTest</groups>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml
index 4c69f8f..1774dc4 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml
@@ -52,13 +52,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
index d405a8c..51ef7bc 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
@@ -52,14 +52,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
index 86f29f3..2f24bc4 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
@@ -44,6 +44,11 @@
</contributor>
</contributors>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -56,14 +61,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
index 64e8559..4229cc9 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
@@ -39,6 +39,11 @@
</developer>
</developers>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -51,14 +56,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
index 022fddf..8a39f12 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
@@ -52,13 +52,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml
index 08ba73d..75f1c8e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml
@@ -52,13 +52,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<runOrder>balanced</runOrder>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
index 479caa3..0efc935 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
@@ -25,6 +25,11 @@
<artifactId>jiras-surefire-1122</artifactId>
<version>1.0</version>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -37,14 +42,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<dependencies>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
index 6a1b46e..daecfc0 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
@@ -28,6 +28,11 @@
<artifactId>surefire-1135-improve-ignore-message-for-testng</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Surefire 1135</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<profiles>
<profile>
@@ -69,14 +74,6 @@
<test>SkipExceptionReportTest</test>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
index 943fac7..d8c5a01 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
@@ -52,14 +52,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- To override fork mode from parrent pom.xml -->
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml
index b35d70e..b183414 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml
@@ -47,17 +47,4 @@
<version>4.0</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
index 3867dd2..77e10e7 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
@@ -52,13 +52,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<rerunFailingTestsCount>2</rerunFailingTestsCount>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml
index fd11c14..bdba56b 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml
@@ -41,13 +41,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -57,7 +50,6 @@
<!--<skip>true</skip>-->
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
index b430563..13ae6b6 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
@@ -41,13 +41,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml
index d93b047..37e65bf 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml
@@ -51,14 +51,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml
index 84bc233..e61abeb 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml
@@ -54,14 +54,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<properties>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml
index 910c7a8..ca15310 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml
@@ -52,13 +52,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
index e25752c..4fb9d72 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
@@ -40,6 +40,11 @@
</developer>
</developers>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -50,16 +55,6 @@
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
index 15fe206..9bb5c27 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
@@ -40,6 +40,11 @@
</developer>
</developers>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -50,16 +55,6 @@
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml
index d8d24f4..98db2a7 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml
@@ -54,14 +54,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml
index b1764ba..d262525 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for testng groups</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.testng</groupId>
@@ -47,14 +52,6 @@
<groups>group</groups>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1364/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1364/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1364/pom.xml
index f93565a..952ca06 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1364/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1364/pom.xml
@@ -34,8 +34,6 @@
<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>
<forkedMode>once</forkedMode>
</properties>
@@ -54,6 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
<configuration>
<testIncludes>
<testInclude>FirstTest.java</testInclude>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1367/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1367/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1367/pom.xml
index 4bca308..b1d3ac3 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1367/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1367/pom.xml
@@ -34,8 +34,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
index 5d6da34..30e5199 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
@@ -25,6 +25,11 @@
<artifactId>surefire-test-classpath-provider</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Test provider</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
index 1c441a8..be5cf97 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>pluggableproviders-classpath-test</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
index dded577..10a40c4 100644
--- a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
@@ -27,8 +27,10 @@
<name>Test provider</name>
<properties>
- <surefire.version>2.12.4</surefire.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
@@ -44,18 +46,6 @@
<targetPath>META-INF</targetPath>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
index 14f9739..1a92a0c 100644
--- a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
@@ -39,7 +39,10 @@
<properties>
<surefire.version>2.12.4</surefire.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
+
<build>
<plugins>
<plugin>
@@ -59,15 +62,6 @@
</dependency>
</dependencies>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml b/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
index b222456..671a654 100644
--- a/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for SUREFIRE-146 (forkMode=pertest fails to call setUp)</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
index bd4809f..3eb6175 100644
--- a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
@@ -5,16 +5,13 @@
<artifactId>surefire-162-charsetProvider</artifactId>
<name>Test alternate CharsetProvider</name>
<version>1.0-SNAPSHOT</version>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml b/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
index ff7f25f..74217ef 100644
--- a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for MSUREFIRE-54 (well-formed XML failures)</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
index 02f581d..c3e6738 100644
--- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
@@ -1,11 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.maven.surefire-257-rerunningTests</groupId>
<artifactId>surefire-257-rerunningTests</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<build>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml b/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
index 8d555b3..16035fe 100644
--- a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>surefire-260-testsWithIdenticalNames</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml b/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
index f01e319..541f499 100644
--- a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
@@ -28,9 +28,10 @@
<version>1.0-SNAPSHOT</version>
<name>Surefire-34-SecurityManager</name>
-
<properties>
<junitVersion>3.8.1</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,14 +47,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml b/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml
index f01e319..541f499 100644
--- a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml
@@ -28,9 +28,10 @@
<version>1.0-SNAPSHOT</version>
<name>Surefire-34-SecurityManager</name>
-
<properties>
<junitVersion>3.8.1</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,14 +47,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml b/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml
index 72a1c7b..ac94779 100644
--- a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for two test cases</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml
index f65975b..ce01272 100644
--- a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml
@@ -8,9 +8,9 @@
<name>surefire-500-puzzling-error</name>
<url>http://maven.apache.org</url>
<properties>
- <java.source.version>1.5</java.source.version>
- <java.target.version>1.5</java.target.version>
<junit.version>4.4</junit.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
@@ -24,16 +24,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <source>${java.source.version}</source>
- <target>${java.target.version}</target>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -41,7 +31,6 @@
<useFile>true</useFile>
</configuration>
</plugin>
-
</plugins>
</pluginManagement>
</build>
[2/4] maven-surefire git commit: [SUREFIRE-1463] integration tests
should run on the top of JDK 9
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml b/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
index b6534c4..5cb7b92 100644
--- a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
@@ -28,16 +28,14 @@
<version>1.0-SNAPSHOT</version>
<name>Surefire-510-systemprops</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
index 0bd6b91..b3238ea 100644
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
@@ -1,11 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.maven.surefire-report</groupId>
<artifactId>surefire-570-multipleReportDirectories</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<build>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml b/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
index 02a2dc8..8175d3f 100644
--- a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
@@ -7,6 +7,10 @@
<version>1.0-SNAPSHOT</version>
<name>junit4-test</name>
<url>http://maven.apache.org</url>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -18,14 +22,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
index ef9e6f3..412035d 100644
--- a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
@@ -9,6 +9,8 @@
<url>http://maven.apache.org</url>
<properties>
<junit.version>4.8.1</junit.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
@@ -20,16 +22,6 @@
<build>
<testSourceDirectory>src/it/java</testSourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
</build>
<profiles>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml b/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
index 571e7fb..9c975a8 100644
--- a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
@@ -10,6 +10,8 @@
<properties>
<junit.version>4.8.1</junit.version>
<parallel>methods</parallel>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
@@ -22,14 +24,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml b/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
index cc023ec..211a99d 100644
--- a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
@@ -28,9 +28,10 @@
<version>1.0-SNAPSHOT</version>
<name>Test for warning about system properties that cannot be set</name>
-
<properties>
<junitVersion>4.4</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,14 +47,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml b/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml
index 378f5fa..985d8df 100644
--- a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml
@@ -52,13 +52,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
index 18b402d..e7a7fad 100644
--- a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
@@ -52,13 +52,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml b/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml
index 72eb549..0b03c13 100644
--- a/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml
@@ -6,18 +6,15 @@
<name>surefire-673-mockito</name>
<version>1.0.0-SNAPSHOT</version>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml b/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
index 2b7a8b0..398a225 100644
--- a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
@@ -18,14 +18,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -43,5 +35,7 @@
<properties>
<junit.version>4.8.1</junit.version>
<forkMode>once</forkMode>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml b/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
index 5e6d272..eb40366 100644
--- a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>surefire-685-commaseparatedIncludes</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml b/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml
index 9f1872c..52663e5 100644
--- a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Tests summary with long/multiline exception messages</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml b/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
index da2299e..acb0d5e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
@@ -50,5 +50,7 @@
<properties>
<junit.version>4.8.1</junit.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml
index 31610dd..9c039d4 100644
--- a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml
@@ -11,6 +11,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -26,11 +28,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml
index d4a436c..ae8ad78 100644
--- a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml
@@ -11,6 +11,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -26,11 +28,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
index 7b09393..296ded6 100644
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for single test in one of multiple executions</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml
index 717417f..74e261a 100644
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for single test in one of multiple executions</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
index 68ed936..30f1708 100644
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
@@ -31,6 +31,8 @@
<properties>
<junit.version>4.8.1</junit.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,14 +48,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
index f229292..983e5bb 100644
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
@@ -17,6 +17,7 @@
<artifactId>testng-group-expressions</artifactId>
<version>1.0-SNAPSHOT</version>
<name>TestNG group expressions tests</name>
+
<dependencies>
<dependency>
<groupId>org.testng</groupId>
@@ -29,6 +30,8 @@
<properties>
<groups>!CategoryC</groups>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<plugins>
@@ -37,14 +40,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
index 2da8cc3..61be350 100644
--- a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
@@ -6,18 +6,15 @@
<name>surefire-812-log4j-classloader</name>
<version>1.0.0-SNAPSHOT</version>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
index 8a27298..8f48176 100644
--- a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
@@ -52,13 +52,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
index 08768f7..cef444e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
@@ -6,6 +6,11 @@
<version>0.0.1-SNAPSHOT</version>
<name>cyril</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -24,11 +29,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
index 4207278..2d005b6 100644
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
@@ -32,6 +32,8 @@
<properties>
<junitVersion>4.8.1</junitVersion>
<groups>junit4.CategoryA,junit4.CategoryB</groups>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -47,14 +49,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
index ea83f5d..989f8af 100644
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
@@ -17,6 +17,12 @@
<artifactId>testng-group-expressions</artifactId>
<version>1.0-SNAPSHOT</version>
<name>TestNG group expressions tests</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.testng</groupId>
@@ -38,15 +44,6 @@
<excludedGroups>${excludedGroups}</excludedGroups>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <groups>${groups}</groups>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
index afabbbe..895dd91 100644
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
@@ -32,6 +32,8 @@
<properties>
<junitVersion>4.8.1</junitVersion>
<groups>junit4.CategoryA,junit4.CategoryB</groups>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -47,14 +49,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
index c321c6e..18cb679 100644
--- a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
@@ -42,15 +42,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -63,5 +54,7 @@
</build>
<properties>
<defaultSuiteFile>${basedir}/src/test/resources/suite.xml</defaultSuiteFile>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml
index fdc17fc..e0d4ee2 100644
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml
@@ -66,14 +66,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.3</version>
<executions>
@@ -88,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>attach-javadoc</id>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml
index c6e15fc..01dc71e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml
@@ -65,14 +65,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.3</version>
<executions>
@@ -87,7 +79,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>attach-javadoc</id>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml
index 61502c8..2d2cd5d 100644
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml
@@ -66,14 +66,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.3</version>
<executions>
@@ -88,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>attach-javadoc</id>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml
index 683628a..8535068 100644
--- a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml
@@ -11,6 +11,8 @@
<properties>
<surefire.version>2.12.4</surefire.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
@@ -30,11 +32,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
-
- <plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml b/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml
index 8f34a43..6232149 100644
--- a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml
@@ -12,20 +12,13 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml b/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml
index 01fb7b3..3b2958f 100644
--- a/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml
@@ -10,6 +10,8 @@
<properties>
<surefire.version>2.13</surefire.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
@@ -27,11 +29,6 @@
</dependency>
</dependencies>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
</plugins>
</pluginManagement>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
index fa8fd48..53bb0a3 100644
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
@@ -26,6 +26,11 @@
<version>1.0-SNAPSHOT</version>
<name>Tests killing the main maven process when using reusable forks</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -50,14 +55,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml b/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
index 8994838..811be93 100644
--- a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
@@ -12,6 +12,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -46,11 +48,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
index 711048e..7a2ac4d 100644
--- a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
@@ -9,6 +9,10 @@
<module>class-rule</module>
<module>boom</module>
</modules>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<build>
<pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml b/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml
index dd6ec41..49848d6 100755
--- a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml
@@ -9,6 +9,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -27,11 +29,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml
index ccd8a05..79e1c7d 100644
--- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml
@@ -6,6 +6,11 @@
<version>1.0</version>
<name>surefire-979-base</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -23,11 +28,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml
index a0c12a9..cae9147 100644
--- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml
@@ -6,6 +6,11 @@
<version>1.0</version>
<name>surefire-979</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -24,11 +29,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml
index d540d1b..c9c1f91 100644
--- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml
@@ -12,14 +12,14 @@
<module>module2</module>
</modules>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml
index ba90b5b..607015e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml
@@ -41,14 +41,6 @@
<groups>sample.CategoryActivated</groups>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml
index d483c43..4662f24 100644
--- a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml
@@ -55,13 +55,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/system-properties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/system-properties/pom.xml b/surefire-integration-tests/src/test/resources/system-properties/pom.xml
index 0fcfb22..1d2952d 100644
--- a/surefire-integration-tests/src/test/resources/system-properties/pom.xml
+++ b/surefire-integration-tests/src/test/resources/system-properties/pom.xml
@@ -91,6 +91,8 @@
<properties>
<setOnArgLineWorkAround>fool</setOnArgLineWorkAround>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml b/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml
index 51b15b0..4a01e23 100644
--- a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml
+++ b/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml
@@ -12,6 +12,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -52,11 +54,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml b/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml
index 5ad8dbc..0b96853 100644
--- a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>TestNG failure after suite</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -62,20 +67,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
-
</plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml b/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
index 277024a..1072958 100644
--- a/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>TestNG @BeforeMethod annotation</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -62,21 +67,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
-
</plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml b/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
index f05f369..88b6a4e 100644
--- a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>TestNG failure in @BeforeMethod annotation</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -62,20 +67,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
-
</plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml b/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
index c6809dc..7e06dbe 100644
--- a/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test proper output from forked execution in case of uncatched error during suite run</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -61,13 +66,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml b/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml
index 5cb7c0f..4405bd3 100644
--- a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml
@@ -78,14 +78,6 @@
<forkCount>0</forkCount>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-groups/pom.xml b/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
index 5abccb2..f6b7447 100644
--- a/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for testng groups</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.testng</groupId>
@@ -44,14 +49,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml b/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml
index c7bc3c3..337f71c 100644
--- a/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for testng jdk14 integration</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml b/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
index 295d1cb..93c9942 100644
--- a/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>TestNG and Junit Together</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -71,15 +76,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml b/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml
index afe9f05..e8efb68 100644
--- a/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml
@@ -47,17 +47,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml b/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml
index 809c4b7..af6ac28 100644
--- a/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>TestNG listener and reporter test</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -69,14 +74,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -90,5 +87,4 @@
</plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
index 760211d..41768cd 100644
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for Testng</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -56,22 +61,12 @@
</dependency>
</dependencies>
</profile>
- </profiles>
-
+ </profiles>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
index 760211d..41768cd 100644
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for Testng</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -56,22 +61,12 @@
</dependency>
</dependencies>
</profile>
- </profiles>
-
+ </profiles>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
index 760211d..50b08bf 100644
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for Testng</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -63,15 +68,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml
index 84378e8..eef5f57 100644
--- a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml
@@ -51,14 +51,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml b/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml
index 9019a07..ee76f09 100644
--- a/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml
@@ -59,14 +59,6 @@
</properties>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml
index c90c6e0..e3e347b 100644
--- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml
@@ -75,14 +75,6 @@
</properties>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml
index ca93853..9464c84 100644
--- a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml
@@ -17,6 +17,10 @@
<artifactId>testng-group-thread-parallel</artifactId>
<version>1.0-SNAPSHOT</version>
<name>TestNG group/parallel thread tests, with parallel settings set by @Test(threadPoolSize)</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<dependencies>
<dependency>
<groupId>org.testng</groupId>
@@ -33,14 +37,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml b/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml
index 5f2e8e7..3f1138a 100644
--- a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>TestNG test in a path with spaces</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -62,21 +67,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
-
</plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-simple/pom.xml b/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
index ebf9f03..6ed8614 100644
--- a/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
@@ -75,21 +75,14 @@
<properties>
<surefire.testng.verbose>0</surefire.testng.verbose>
<argLine/>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
@@ -103,9 +96,7 @@
</properties>
</configuration>
</plugin>
-
</plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml b/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
index 1f84839..a10bd0f 100644
--- a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for Testng</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.testng</groupId>
@@ -40,15 +45,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml b/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
index e2fbaa7..32ebfaf 100644
--- a/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Test for Testng</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -63,15 +68,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml b/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
index 96438a0..ec02455 100644
--- a/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>TestNG Suite XML File</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -71,14 +76,6 @@
</suiteXmlFiles>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml
index 8955a30..818d53e 100644
--- a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml
@@ -66,14 +66,6 @@
</properties>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml
index abdf7a1..f7477fe 100644
--- a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>TestNG Suite XML with two test cases</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<profiles>
<profile>
<id>testng-old</id>
@@ -70,16 +75,7 @@
</suiteXmlFiles>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml b/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml
index ef9ea09..fc95eb3 100644
--- a/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml
+++ b/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml
@@ -28,6 +28,11 @@
<version>1.0-SNAPSHOT</version>
<name>Timeout forked process</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml b/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml
index 2a385b5..31dd0d0 100644
--- a/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml
+++ b/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -48,11 +50,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml b/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml
index 40366ab..fa19695 100644
--- a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml
+++ b/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml
@@ -21,10 +21,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>localhost</groupId>
<artifactId>working-directory-test</artifactId>
<version>1.0</version>
<name>Don't run tests if working directory is invalid property.</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml b/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml
index 677f6d3..515a414 100644
--- a/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml
+++ b/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml
@@ -25,6 +25,10 @@
<artifactId>working-directory-test</artifactId>
<version>1.0</version>
<name>Run tests in a nonexistent working directory</name>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<dependencies>
<dependency>
<groupId>junit</groupId>