You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2018/02/04 02:47:44 UTC
[2/4] maven-surefire git commit: [SUREFIRE-1463] integration tests
should run on the top of JDK 9
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/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..5cb7b92 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..b3238ea 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<build>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/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..8175d3f 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..412035d 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..9c975a8 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..211a99d 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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/e340afd4/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/e340afd4/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..0b03c13 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..398a225 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/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..eb40366 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.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/e340afd4/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..52663e5 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.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/e340afd4/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..acb0d5e 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/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..9c039d4 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..ae8ad78 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..296ded6 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.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/e340afd4/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..74e261a 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.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/e340afd4/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..30f1708 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..983e5bb 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..61be350 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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/e340afd4/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..cef444e 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..2d005b6 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..989f8af 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..895dd91 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..18cb679 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/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/e340afd4/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/e340afd4/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/e340afd4/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..8535068 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..6232149 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..3b2958f 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..53bb0a3 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..811be93 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..7a2ac4d 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<build>
<pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/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..49848d6 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..79e1c7d 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..cae9147 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..c9c1f91 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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/e340afd4/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/e340afd4/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..1d2952d 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e340afd4/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..4a01e23 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..0b96853 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..1072958 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..88b6a4e 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..7e06dbe 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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/e340afd4/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..f6b7447 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..337f71c 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.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/e340afd4/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..93c9942 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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/e340afd4/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..af6ac28 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..41768cd 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..41768cd 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..50b08bf 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.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/e340afd4/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/e340afd4/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/e340afd4/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/e340afd4/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..9464c84 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..3f1138a 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..6ed8614 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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..a10bd0f 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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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/e340afd4/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/e340afd4/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/e340afd4/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/e340afd4/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/e340afd4/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/e340afd4/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/e340afd4/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/e340afd4/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>