Repository: maven-surefire Updated Branches: refs/heads/master 12d2c4b4a -> 3c662f89c
[SUREFIRE-1131] Remove obsolete maven profiles Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3c662f89 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3c662f89 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3c662f89 Branch: refs/heads/master Commit: 3c662f89cc7005450e037f5f4210268320a494d6 Parents: 12d2c4b Author: Tibor17 <tibo...@lycos.com> Authored: Sun Dec 28 10:13:03 2014 +0100 Committer: Tibor17 <tibo...@lycos.com> Committed: Sun Dec 28 10:13:03 2014 +0100 ---------------------------------------------------------------------- maven-failsafe-plugin/pom.xml | 16 -------- maven-surefire-report-plugin/pom.xml | 18 --------- .../surefire-testng-utils/pom.xml | 39 ++++---------------- surefire-providers/surefire-testng/pom.xml | 39 ++++---------------- 4 files changed, 14 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3c662f89/maven-failsafe-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 16ae10d..2d9bd30 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -220,22 +220,6 @@ </reporting> <profiles> - <!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 --> - <profile> - <id>jdk1.3</id> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <fork>false</fork> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> <profile> <id>ci</id> <activation> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3c662f89/maven-surefire-report-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 2a13789..f6e7ccc 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -169,24 +169,6 @@ </reporting> <profiles> - <!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 --> - <profile> - <id>jdk1.3</id> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <childDelegation>true</childDelegation> - <jvm>${java.home}/bin/java</jvm> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> <profile> <id>ci</id> <activation> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3c662f89/surefire-providers/surefire-testng-utils/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng-utils/pom.xml b/surefire-providers/surefire-testng-utils/pom.xml index 5fc3bc3..64d8518 100644 --- a/surefire-providers/surefire-testng-utils/pom.xml +++ b/surefire-providers/surefire-testng-utils/pom.xml @@ -46,6 +46,13 @@ <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-grouper</artifactId> </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.7</version> + <classifier>jdk15</classifier> + <scope>provided</scope> + </dependency> </dependencies> <build> @@ -78,36 +85,4 @@ </plugin> </plugins> </build> - - <!-- TODO: do we include both? Or just 1.5? No need for profile --> - <profiles> - <profile> - <id>jdk14</id> - <activation> - <jdk>1.4</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.7</version> - <classifier>jdk14</classifier> - </dependency> - </dependencies> - </profile> - <profile> - <id>jdk15</id> - <activation> - <jdk>!1.4</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.7</version> - <classifier>jdk15</classifier> - </dependency> - </dependencies> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3c662f89/surefire-providers/surefire-testng/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml index a709815..78ac427 100644 --- a/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml @@ -48,6 +48,13 @@ <artifactId>surefire-testng-utils</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.7</version> + <classifier>jdk15</classifier> + <scope>provided</scope> + </dependency> </dependencies> <build> @@ -69,36 +76,4 @@ </plugin> </plugins> </build> - - <!-- TODO: do we include both? Or just 1.5? No need for profile --> - <profiles> - <profile> - <id>jdk14</id> - <activation> - <jdk>1.4</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.7</version> - <classifier>jdk14</classifier> - </dependency> - </dependencies> - </profile> - <profile> - <id>jdk15</id> - <activation> - <jdk>!1.4</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.7</version> - <classifier>jdk15</classifier> - </dependency> - </dependencies> - </profile> - </profiles> </project>