Author: brett
Date: Sun Jan 7 18:42:56 2007
New Revision: 493914
URL: http://svn.apache.org/viewvc?view=rev&rev=493914
Log:
make sure this always compiles and runs with Java 1.4+
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml?view=diff&rev=493914&r1=493913&r2=493914
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml Sun Jan 7
18:42:56 2007
@@ -30,4 +30,21 @@
<version>4.0</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <jvm>${java.home}/bin/java</jvm>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml?view=diff&rev=493914&r1=493913&r2=493914
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Sun Jan 7
18:42:56 2007
@@ -52,28 +52,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>jdk1.3</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>false</fork>
- <compilerVersion>1.4</compilerVersion>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <jvm>${JAVA_1_3_HOME}/bin/java</jvm>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
<build>
<plugins>
<plugin>
@@ -86,7 +64,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <fork>false</fork>
+ <jvm>${java.home}/bin/java</jvm>
</configuration>
</plugin>
</plugins>
