Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1463 e2db07600 -> b025dc170 (forced update)
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/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/b025dc17/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/b025dc17/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/b025dc17/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml index fdc17fc..e0d4ee2 100644 --- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml @@ -66,14 +66,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <version>2.3</version> <executions> @@ -88,7 +80,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> + <version>3.0.0</version> <executions> <execution> <id>attach-javadoc</id> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml index c6e15fc..01dc71e 100644 --- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml @@ -65,14 +65,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <version>2.3</version> <executions> @@ -87,7 +79,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> + <version>3.0.0</version> <executions> <execution> <id>attach-javadoc</id> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml index 61502c8..2d2cd5d 100644 --- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml @@ -66,14 +66,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <version>2.3</version> <executions> @@ -88,7 +80,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> + <version>3.0.0</version> <executions> <execution> <id>attach-javadoc</id> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/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/b025dc17/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/b025dc17/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/b025dc17/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/b025dc17/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/b025dc17/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/b025dc17/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/b025dc17/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..d6baf4b 100644 --- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml @@ -6,6 +6,11 @@ <version>1.0</version> <name>surefire-979-base</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> @@ -23,11 +28,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/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..6387f35 100644 --- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml @@ -6,6 +6,11 @@ <version>1.0</version> <name>surefire-979</name> + <properties> + <maven.compiler.source>1.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/b025dc17/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/b025dc17/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml index ba90b5b..607015e 100644 --- a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml @@ -41,14 +41,6 @@ <groups>sample.CategoryActivated</groups> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml index d483c43..4662f24 100644 --- a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml @@ -55,13 +55,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/system-properties/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/system-properties/pom.xml b/surefire-integration-tests/src/test/resources/system-properties/pom.xml index 0fcfb22..726042b 100644 --- a/surefire-integration-tests/src/test/resources/system-properties/pom.xml +++ b/surefire-integration-tests/src/test/resources/system-properties/pom.xml @@ -91,6 +91,8 @@ <properties> <setOnArgLineWorkAround>fool</setOnArgLineWorkAround> + <maven.compiler.source>1.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/b025dc17/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> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml b/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml index 5ad8dbc..788d400 100644 --- a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>TestNG failure after suite</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -62,20 +67,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> - </plugins> </build> - </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml b/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml index 277024a..40085f5 100644 --- a/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>TestNG @BeforeMethod annotation</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -62,21 +67,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> - </plugins> </build> - </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml b/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml index f05f369..2d81795 100644 --- a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>TestNG failure in @BeforeMethod annotation</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -62,20 +67,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> - </plugins> </build> - </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml b/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml index c6809dc..7e9b9b3 100644 --- a/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test proper output from forked execution in case of uncatched error during suite run</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -61,13 +66,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml b/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml index 5cb7c0f..4405bd3 100644 --- a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml @@ -78,14 +78,6 @@ <forkCount>0</forkCount> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-groups/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-groups/pom.xml b/surefire-integration-tests/src/test/resources/testng-groups/pom.xml index 5abccb2..1d679e7 100644 --- a/surefire-integration-tests/src/test/resources/testng-groups/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-groups/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test for testng groups</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>org.testng</groupId> @@ -44,14 +49,6 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml b/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml index c7bc3c3..19d9a99 100644 --- a/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test for testng jdk14 integration</name> + <properties> + <maven.compiler.source>1.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/b025dc17/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml b/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml index 295d1cb..3342796 100644 --- a/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>TestNG and Junit Together</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -71,15 +76,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml b/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml index afe9f05..e8efb68 100644 --- a/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml @@ -47,17 +47,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml b/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml index 809c4b7..cc7d86f 100644 --- a/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>TestNG listener and reporter test</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -69,14 +74,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> @@ -90,5 +87,4 @@ </plugins> </build> - </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml index 760211d..0e7bf15 100644 --- a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test for Testng</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -56,22 +61,12 @@ </dependency> </dependencies> </profile> - </profiles> - + </profiles> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml index 760211d..0e7bf15 100644 --- a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test for Testng</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -56,22 +61,12 @@ </dependency> </dependencies> </profile> - </profiles> - + </profiles> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml index 760211d..ddfe977 100644 --- a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test for Testng</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -63,15 +68,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml index 84378e8..eef5f57 100644 --- a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml @@ -51,14 +51,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml b/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml index 9019a07..ee76f09 100644 --- a/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml @@ -59,14 +59,6 @@ </properties> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml index c90c6e0..e3e347b 100644 --- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml @@ -75,14 +75,6 @@ </properties> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml index ca93853..87fd811 100644 --- a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml @@ -17,6 +17,10 @@ <artifactId>testng-group-thread-parallel</artifactId> <version>1.0-SNAPSHOT</version> <name>TestNG group/parallel thread tests, with parallel settings set by @Test(threadPoolSize)</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>org.testng</groupId> @@ -33,14 +37,6 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml b/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml index 5f2e8e7..5882ad7 100644 --- a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>TestNG test in a path with spaces</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -62,21 +67,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> - </plugins> </build> - </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-simple/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-simple/pom.xml b/surefire-integration-tests/src/test/resources/testng-simple/pom.xml index ebf9f03..51f5313 100644 --- a/surefire-integration-tests/src/test/resources/testng-simple/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-simple/pom.xml @@ -75,21 +75,14 @@ <properties> <surefire.testng.verbose>0</surefire.testng.verbose> <argLine/> + <maven.compiler.source>1.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> @@ -103,9 +96,7 @@ </properties> </configuration> </plugin> - </plugins> </build> - </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml b/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml index 1f84839..198e388 100644 --- a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test for Testng</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>org.testng</groupId> @@ -40,15 +45,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml b/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml index e2fbaa7..4dbbac9 100644 --- a/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Test for Testng</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -63,15 +68,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml b/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml index 96438a0..280c217 100644 --- a/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>TestNG Suite XML File</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -71,14 +76,6 @@ </suiteXmlFiles> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml index 8955a30..818d53e 100644 --- a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml @@ -66,14 +66,6 @@ </properties> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml index abdf7a1..b6f315f 100644 --- a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>TestNG Suite XML with two test cases</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <profiles> <profile> <id>testng-old</id> @@ -70,16 +75,7 @@ </suiteXmlFiles> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> - </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml b/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml index ef9ea09..f798643 100644 --- a/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml +++ b/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml @@ -28,6 +28,11 @@ <version>1.0-SNAPSHOT</version> <name>Timeout forked process</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml b/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml index 2a385b5..8face48 100644 --- a/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml +++ b/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml @@ -30,6 +30,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -48,11 +50,6 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b025dc17/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml b/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml index 40366ab..4f5973a 100644 --- a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml +++ b/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml @@ -21,10 +21,17 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> + <groupId>localhost</groupId> <artifactId>working-directory-test</artifactId> <version>1.0</version> <name>Don't run tests if working directory is invalid property.</name> + + <properties> + <maven.compiler.source>1.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/b025dc17/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml b/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml index 677f6d3..fe15fea 100644 --- a/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml +++ b/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml @@ -25,6 +25,10 @@ <artifactId>working-directory-test</artifactId> <version>1.0</version> <name>Run tests in a nonexistent working directory</name> + <properties> + <maven.compiler.source>1.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/b025dc17/surefire-integration-tests/src/test/resources/working-directory/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/working-directory/pom.xml b/surefire-integration-tests/src/test/resources/working-directory/pom.xml index 88d7f46..3f41154 100644 --- a/surefire-integration-tests/src/test/resources/working-directory/pom.xml +++ b/surefire-integration-tests/src/test/resources/working-directory/pom.xml @@ -28,6 +28,12 @@ <version>1.0-SNAPSHOT</version> <name>Test for working directory configuration (parent)</name> <packaging>pom</packaging> + + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <modules> <module>child</module> </modules>
