http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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..d15b643 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.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>org.codehaus.plexus</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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..57c8d70 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/f23b41c9/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..3b55340 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/f23b41c9/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..f7a6af5 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.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/f23b41c9/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..e452769 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.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/f23b41c9/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..be7de32 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.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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..0acd6e4 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.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/f23b41c9/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..1cdb4d2 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.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <modules> <module>../child1</module> <module>../child2</module> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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..0e7f5a1 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.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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..10f2d4d 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/f23b41c9/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..7f50e05 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.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/f23b41c9/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..c208614 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.8</maven.compiler.source> + <maven.compiler.target>1.8</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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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..7a525e7 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.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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..0387efb 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.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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/f23b41c9/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/f23b41c9/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..562cac8 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.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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/f23b41c9/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml b/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml index ff7f25f..30f88ca 100644 --- a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test for MSUREFIRE-54 (well-formed XML failures)</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml index 02f581d..287ffd1 100644 --- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml @@ -1,11 +1,16 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.surefire-257-rerunningTests</groupId> <artifactId>surefire-257-rerunningTests</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml b/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml index 8d555b3..49c36f9 100644 --- a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>surefire-260-testsWithIdenticalNames</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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/f23b41c9/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/f23b41c9/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml b/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml index 72a1c7b..b48adfe 100644 --- a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test for two test cases</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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/f23b41c9/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/f23b41c9/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml index 0bd6b91..40a279e 100644 --- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml @@ -1,11 +1,16 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.surefire-report</groupId> <artifactId>surefire-570-multipleReportDirectories</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml b/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml index 378f5fa..985d8df 100644 --- a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml @@ -52,13 +52,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemProperties> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml index 18b402d..e7a7fad 100644 --- a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml @@ -52,13 +52,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemPropertyVariables> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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/f23b41c9/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/f23b41c9/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml b/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml index 5e6d272..f364799 100644 --- a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>surefire-685-commaseparatedIncludes</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml b/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml index 9f1872c..3772db1 100644 --- a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Tests summary with long/multiline exception messages</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml b/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml index da2299e..1350dd4 100644 --- a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml @@ -50,5 +50,7 @@ <properties> <junit.version>4.8.1</junit.version> + <maven.compiler.source>1.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/f23b41c9/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/f23b41c9/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/f23b41c9/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml index 7b09393..c707a8b 100644 --- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test for single test in one of multiple executions</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml index 717417f..cf0eb90 100644 --- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test for single test in one of multiple executions</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml index 8a27298..8f48176 100644 --- a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml @@ -52,13 +52,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>always</forkMode> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f23b41c9/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/f23b41c9/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/f23b41c9/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/f23b41c9/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>
