http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/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..ec78055 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 @@ -42,6 +42,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -59,13 +63,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/fc297334/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..88f7bab 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 @@ -30,6 +30,10 @@ <artifactId>jiras-surefire-1053</artifactId> <version>1.0</version> <url>http://maven.apache.org</url> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <developers> <developer> <id>tibordigana</id> @@ -52,13 +56,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/fc297334/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..44d9583 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 @@ -37,6 +37,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -52,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/fc297334/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..4f6e966 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/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..869a8a6 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/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..b7beffe 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 @@ -41,6 +41,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -52,13 +56,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/fc297334/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..b439eba 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 @@ -41,6 +41,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -52,13 +56,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/fc297334/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..e0e2a13 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/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..84b69f6 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/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..4a101e9 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 @@ -37,6 +37,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -52,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> <!-- To override fork mode from parrent pom.xml --> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/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..ea6e9fe 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 @@ -40,6 +40,11 @@ </contributor> </contributors> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> @@ -47,17 +52,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/fc297334/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..89fe369 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 @@ -41,6 +41,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -52,13 +56,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/fc297334/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..6e3f94a 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 @@ -36,18 +36,13 @@ <failIfNoTests>true</failIfNoTests> <failsafe.rerunFailingTestsCount>2</failsafe.rerunFailingTestsCount> <surefire.rerunFailingTestsCount>2</surefire.rerunFailingTestsCount> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <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 +52,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/fc297334/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..0ed3b0c 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 @@ -30,6 +30,10 @@ <artifactId>jiras-surefire-1153</artifactId> <version>1.0</version> <url>http://maven.apache.org</url> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -41,13 +45,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/fc297334/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..3f19b33 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 @@ -33,6 +33,11 @@ <artifactId>surefire-1158</artifactId> <version>1.0</version> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>org.testng</groupId> @@ -51,14 +56,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/fc297334/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..12a3cc4 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 @@ -42,6 +42,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>org.testng</groupId> @@ -54,14 +58,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/fc297334/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..bf149f4 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml @@ -41,6 +41,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -52,13 +56,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/fc297334/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..6b2d53d 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/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..df69bbc 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/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..eb01a10 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml @@ -35,6 +35,8 @@ <properties> <junit/> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -54,14 +56,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/fc297334/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..6d04864 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/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..4d334cf 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,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> <forkedMode>once</forkedMode> </properties> @@ -54,6 +54,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/fc297334/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/fc297334/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..f464a38 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/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..6ebfc30 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/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..f6b6b41 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml b/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml index f01e319..d409355 100644 --- a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml @@ -28,9 +28,10 @@ <version>1.0-SNAPSHOT</version> <name>Surefire-34-SecurityManager</name> - <properties> <junitVersion>3.8.1</junitVersion> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -46,14 +47,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml b/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml index f01e319..d409355 100644 --- a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml @@ -28,9 +28,10 @@ <version>1.0-SNAPSHOT</version> <name>Surefire-34-SecurityManager</name> - <properties> <junitVersion>3.8.1</junitVersion> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -46,14 +47,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml index f65975b..ccd82ac 100644 --- a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml @@ -8,9 +8,9 @@ <name>surefire-500-puzzling-error</name> <url>http://maven.apache.org</url> <properties> - <java.source.version>1.5</java.source.version> - <java.target.version>1.5</java.target.version> <junit.version>4.4</junit.version> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> <dependency> @@ -24,16 +24,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <source>${java.source.version}</source> - <target>${java.target.version}</target> - </configuration> - </plugin> - - <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> @@ -41,7 +31,6 @@ <useFile>true</useFile> </configuration> </plugin> - </plugins> </pluginManagement> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml b/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml index b6534c4..58a7f79 100644 --- a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml @@ -28,16 +28,14 @@ <version>1.0-SNAPSHOT</version> <name>Surefire-510-systemprops</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml b/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml index 02a2dc8..9278e02 100644 --- a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml @@ -7,6 +7,10 @@ <version>1.0-SNAPSHOT</version> <name>junit4-test</name> <url>http://maven.apache.org</url> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml index ef9e6f3..8109e39 100644 --- a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml @@ -9,6 +9,8 @@ <url>http://maven.apache.org</url> <properties> <junit.version>4.8.1</junit.version> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> <dependency> @@ -20,16 +22,6 @@ <build> <testSourceDirectory>src/it/java</testSourceDirectory> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> </build> <profiles> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml b/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml index 571e7fb..9ce689d 100644 --- a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml @@ -10,6 +10,8 @@ <properties> <junit.version>4.8.1</junit.version> <parallel>methods</parallel> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> <dependency> @@ -22,14 +24,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml b/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml index cc023ec..45e1ff1 100644 --- a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml @@ -28,9 +28,10 @@ <version>1.0-SNAPSHOT</version> <name>Test for warning about system properties that cannot be set</name> - <properties> <junitVersion>4.4</junitVersion> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -46,14 +47,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml b/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml index 378f5fa..a13baab 100644 --- a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml @@ -41,6 +41,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -52,13 +56,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemProperties> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml index 18b402d..335a739 100644 --- a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml @@ -41,6 +41,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -52,13 +56,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemPropertyVariables> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml b/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml index 72eb549..eeef7f7 100644 --- a/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml @@ -6,18 +6,15 @@ <name>surefire-673-mockito</name> <version>1.0.0-SNAPSHOT</version> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml b/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml index 2b7a8b0..319c4d6 100644 --- a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml @@ -18,14 +18,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> @@ -43,5 +35,7 @@ <properties> <junit.version>4.8.1</junit.version> <forkMode>once</forkMode> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml index 31610dd..f2fe509 100644 --- a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml @@ -11,6 +11,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -26,11 +28,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml index d4a436c..2791186 100644 --- a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml @@ -11,6 +11,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -26,11 +28,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml index 68ed936..38dd327 100644 --- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml @@ -31,6 +31,8 @@ <properties> <junit.version>4.8.1</junit.version> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml index f229292..c3debfc 100644 --- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml @@ -17,6 +17,7 @@ <artifactId>testng-group-expressions</artifactId> <version>1.0-SNAPSHOT</version> <name>TestNG group expressions tests</name> + <dependencies> <dependency> <groupId>org.testng</groupId> @@ -29,6 +30,8 @@ <properties> <groups>!CategoryC</groups> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <build> <plugins> @@ -37,14 +40,6 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml index 2da8cc3..e55b44e 100644 --- a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml @@ -6,18 +6,15 @@ <name>surefire-812-log4j-classloader</name> <version>1.0.0-SNAPSHOT</version> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</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/fc297334/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml index 8a27298..df0a0d0 100644 --- a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml @@ -41,6 +41,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -52,13 +56,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>always</forkMode> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml index 08768f7..04a5d85 100644 --- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml @@ -6,6 +6,11 @@ <version>0.0.1-SNAPSHOT</version> <name>cyril</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> @@ -24,11 +29,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml index 4207278..cb3d412 100644 --- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml @@ -32,6 +32,8 @@ <properties> <junitVersion>4.8.1</junitVersion> <groups>junit4.CategoryA,junit4.CategoryB</groups> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -47,14 +49,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml index ea83f5d..77d5e7a 100644 --- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml @@ -17,6 +17,12 @@ <artifactId>testng-group-expressions</artifactId> <version>1.0-SNAPSHOT</version> <name>TestNG group expressions tests</name> + + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>org.testng</groupId> @@ -38,15 +44,6 @@ <excludedGroups>${excludedGroups}</excludedGroups> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <groups>${groups}</groups> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml index afabbbe..2b5a438 100644 --- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml @@ -32,6 +32,8 @@ <properties> <junitVersion>4.8.1</junitVersion> <groups>junit4.CategoryA,junit4.CategoryB</groups> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -47,14 +49,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml index c321c6e..9aca4a7 100644 --- a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml @@ -42,15 +42,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> @@ -63,5 +54,7 @@ </build> <properties> <defaultSuiteFile>${basedir}/src/test/resources/suite.xml</defaultSuiteFile> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml index fdc17fc..6efb89e 100644 --- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml @@ -42,6 +42,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -66,14 +70,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <version>2.3</version> <executions> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml index c6e15fc..93694fa 100644 --- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml @@ -41,6 +41,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -65,14 +69,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <version>2.3</version> <executions> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml index 61502c8..9685d1c 100644 --- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml @@ -42,6 +42,10 @@ <timezone>Europe/Bratislava</timezone> </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -66,14 +70,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <version>2.3</version> <executions> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml index 683628a..cb91aa9 100644 --- a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml @@ -11,6 +11,8 @@ <properties> <surefire.version>2.12.4</surefire.version> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> <dependency> @@ -30,11 +32,6 @@ </configuration> </plugin> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> - - <plugin> <artifactId>maven-failsafe-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml b/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml index 8f34a43..8b9cf60 100644 --- a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml @@ -12,20 +12,13 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml b/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml index 01fb7b3..a4a8d8a 100644 --- a/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml @@ -10,6 +10,8 @@ <properties> <surefire.version>2.13</surefire.version> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <build> @@ -27,11 +29,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> </plugins> </pluginManagement> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml index fa8fd48..6cdefa2 100644 --- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml @@ -26,6 +26,11 @@ <version>1.0-SNAPSHOT</version> <name>Tests killing the main maven process when using reusable forks</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> @@ -50,14 +55,6 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml b/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml index 8994838..f950829 100644 --- a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml @@ -12,6 +12,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -46,11 +48,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml index 711048e..20db6c8 100644 --- a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml @@ -9,6 +9,10 @@ <module>class-rule</module> <module>boom</module> </modules> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <build> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml b/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml index dd6ec41..de8f847 100755 --- a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml @@ -9,6 +9,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -27,11 +29,6 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml index ccd8a05..f08b7b5 100644 --- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml @@ -23,11 +23,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml index a0c12a9..f05eb22 100644 --- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml @@ -24,11 +24,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml index d540d1b..bdc566f 100644 --- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml @@ -12,14 +12,14 @@ <module>module2</module> </modules> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml index ba90b5b..149a56d 100644 --- a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml @@ -22,6 +22,11 @@ <artifactId>surefire-985</artifactId> <name>Tests Parameterized runner together with @Categories</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> @@ -41,14 +46,6 @@ <groups>sample.CategoryActivated</groups> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fc297334/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml index d483c43..45b027f 100644 --- a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml @@ -32,6 +32,8 @@ <url>http://maven.apache.org</url> <properties> <version.junit>4.12</version.junit> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <developers> <developer> @@ -55,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/fc297334/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml b/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml index 51b15b0..4b976e5 100644 --- a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml +++ b/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml @@ -12,6 +12,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -52,11 +54,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> </plugins> </build> </project>