Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1463 e4deb5ec6 -> c1598b51f (forced update)
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c1598b51/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/c1598b51/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/c1598b51/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..52fa027 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 @@ -35,6 +35,11 @@ <version>1.0-SNAPSHOT</version> <name>TestNG group/parallel thread tests</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> @@ -78,14 +83,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/c1598b51/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/c1598b51/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/c1598b51/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..03b5b3d 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 @@ -32,6 +32,11 @@ <version>1.0-SNAPSHOT</version> <name>TestNG and Junit4 Together</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> @@ -47,17 +52,4 @@ </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/c1598b51/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/c1598b51/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/c1598b51/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/c1598b51/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/c1598b51/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..c51d3cb 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 @@ -35,6 +35,8 @@ <properties> <included/> <excluded/> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <dependencies> @@ -51,14 +53,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/c1598b51/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..ba8760d 100644 --- a/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml @@ -35,6 +35,11 @@ <version>1.0</version> <name>TestNG using custom object factory.</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> @@ -59,14 +64,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/c1598b51/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..34681ea 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 @@ -48,6 +48,11 @@ </developer> </developers> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>org.testng</groupId> @@ -75,14 +80,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/c1598b51/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/c1598b51/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/c1598b51/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/c1598b51/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/c1598b51/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/c1598b51/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/c1598b51/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..5bafa96 100644 --- a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml @@ -35,6 +35,11 @@ <version>1.0</version> <name>TestNG using custom test runner factory</name> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + <dependencies> <dependency> <!-- @@ -66,14 +71,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/c1598b51/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/c1598b51/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>