http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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..e9d6a6c 100644 --- a/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml @@ -54,18 +54,12 @@ <properties> <argLine/> + <jacoco.agent/> </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> <configuration> <argLine>${argLine} ${jacoco.agent}</argLine> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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/6b331b0a/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>
