[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/19100053 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/19100053 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/19100053 Branch: refs/heads/SUREFIRE-1463 Commit: 1910005314a5079f4fee22de9f8743bff67debef Parents: 27a5e6a Author: Tibor17 <tibordig...@apache.org> Authored: Sat Jan 13 23:22:07 2018 +0100 Committer: Tibor17 <tibordig...@apache.org> Committed: Mon Jan 15 00:32:54 2018 +0100 ---------------------------------------------------------------------- Jenkinsfile | 8 +++---- README.md | 4 ++-- maven-failsafe-plugin/pom.xml | 1 + .../src/it/jetty-war-test-failing/pom.xml | 4 ++-- .../src/it/jetty-war-test-passing/pom.xml | 4 ++-- .../src/it/multiple-summaries-failing/pom.xml | 8 +++++++ .../src/it/multiple-summaries/pom.xml | 8 +++++++ .../src/it/working-directory/pom.xml | 8 +++++++ surefire-integration-tests/pom.xml | 25 ++++---------------- .../maven/surefire/its/AbstractJigsawIT.java | 23 +++++++----------- .../maven/surefire/its/Java9FullApiIT.java | 5 +++- .../apache/maven/surefire/its/RunOrderIT.java | 1 - .../surefire/its/fixture/SurefireLauncher.java | 9 ++++--- ...urefire1295AttributeJvmCrashesToTestsIT.java | 4 ++-- .../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 +++++ 186 files changed, 583 insertions(+), 1144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/19100053/Jenkinsfile ---------------------------------------------------------------------- diff --git a/Jenkinsfile b/Jenkinsfile index 9863659..0d386f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,8 +6,8 @@ pipeline { 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')}\\\"" + withEnv(["JAVA_HOME=${tool('JDK 1.8 (latest)')}", "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 -Dsurefire.useFile=false -Dfailsafe.useFile=false -Dintegration-test-port=8084 \\\"-Djdk.home=${tool('JDK 1.9 (latest)')}\\\"" } 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' @@ -16,8 +16,8 @@ pipeline { 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" + withEnv(["JAVA_HOME=${tool('JDK 1.8 (latest)')}", "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 -Dsurefire.useFile=false -Dfailsafe.useFile=false -Dintegration-test-port=8084" } } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/19100053/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 2361f5d..20d31ad 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"* + **(on Windows)** *set 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"* * 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/19100053/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/19100053/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..3fc8886 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 @@ -122,8 +122,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/19100053/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..79c46e5 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 @@ -122,8 +122,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/19100053/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..0f0b706 100644 --- a/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml +++ b/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml @@ -77,6 +77,14 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/19100053/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..fcb5e2f 100644 --- a/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml +++ b/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml @@ -72,6 +72,14 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/19100053/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..4530c7e 100644 --- a/maven-failsafe-plugin/src/it/working-directory/pom.xml +++ b/maven-failsafe-plugin/src/it/working-directory/pom.xml @@ -51,6 +51,14 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/19100053/surefire-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml index c1a6c4a..5930e4e 100644 --- a/surefire-integration-tests/pom.xml +++ b/surefire-integration-tests/pom.xml @@ -76,8 +76,10 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> + <!-- Java 9 requires version 3.6+ (todo put it in parent POM. Note: commons-lang3:3.7 is compiled with Java 7) --> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <version>3.7</version> </dependency> </dependencies> @@ -93,11 +95,12 @@ <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:+UseStringDeduplication -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.awt.headless=true</argLine> <includes> <include>org/apache/**/*IT*.java</include> </includes> @@ -201,24 +204,6 @@ <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> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/19100053/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/19100053/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/19100053/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/19100053/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..28bd690 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 @@ -36,6 +36,10 @@ 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 final MavenLauncher mavenLauncher; private final String surefireVersion = System.getProperty( "surefire.version" ); @@ -66,9 +70,9 @@ public final class SurefireLauncher setInProcessJavaHome(); } - public SurefireLauncher setInProcessJavaHome() + private void setInProcessJavaHome() { - String javaHome = System.getenv( "JAVA_HOME" ); + String javaHome = EXT_JDK_HOME == null ? System.getenv( "JAVA_HOME" ) : EXT_JDK_HOME; if ( javaHome != null && !javaHome.isEmpty() ) { try @@ -84,7 +88,6 @@ public final class SurefireLauncher throw new RuntimeException( e ); } } - return this; } public SurefireLauncher setLauncherJavaHome( String javaHome ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/19100053/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..0a703fc 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 @@ -28,8 +28,8 @@ import org.junit.Test; import java.util.Iterator; -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; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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/19100053/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>
