Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1463 c0f32eb91 -> 727d27ef0 (forced update)
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/727d27ef/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..32ebfaf 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.7</maven.compiler.source> + <maven.compiler.target>1.7</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/727d27ef/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..ec02455 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.7</maven.compiler.source> + <maven.compiler.target>1.7</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/727d27ef/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/727d27ef/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..f7477fe 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.7</maven.compiler.source> + <maven.compiler.target>1.7</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/727d27ef/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..fc95eb3 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.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> + </properties> + <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/727d27ef/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..31dd0d0 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.7</maven.compiler.source> + <maven.compiler.target>1.7</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/727d27ef/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..fa19695 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.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/727d27ef/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..515a414 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.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> + </properties> <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/727d27ef/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..1a7b7d7 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.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> + </properties> + <modules> <module>child</module> </modules>
