Author: brett
Date: Sat Apr 29 17:38:35 2006
New Revision: 398255
URL: http://svn.apache.org/viewcvs?rev=398255&view=rev
Log:
removing extra warnings and deployment restrictions - relying on CI process to
check JDK 1.3
Modified:
maven/surefire/branches/surefire-testng/pom.xml
Modified: maven/surefire/branches/surefire-testng/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/pom.xml?rev=398255&r1=398254&r2=398255&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/pom.xml (original)
+++ maven/surefire/branches/surefire-testng/pom.xml Sat Apr 29 17:38:35 2006
@@ -52,6 +52,15 @@
<url>http://svn.apache.org/viewcvs.cgi/maven/surefire/trunk</url>
</scm>
<build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<plugin>
@@ -93,68 +102,4 @@
</plugins>
</build>
</profile>
-
- <!-- ignore JDK 1.3 requirement for handy testing -->
- <profile>
- <id>ignoreJdk</id>
- </profile>
-
- <!-- print a warning when not using the JDK 1.3 profile, and prevent
deployment
- NOTE prevent deployment actually don't work as the deploy plugin is
called
- before the antrun in the deploy phase.
- In multimodule the first module will be deployed and build will fail
after
- -->
- <profile>
- <id>nojdk1.3</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>java1.3-validate</id>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <echo/>
- <echo>=== WARNING: You are not building with Java 1.3 as
required ===</echo>
- <echo>Set JAVA_1_3_HOME pointing to the JDK 1.3
installation folder</echo>
- <echo>and run Maven with -Pjdk1.3 to activate the Java 1.3
profile</echo>
- <echo>Building anyway.</echo>
- <echo/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>java1.3-deploy</id>
- <phase>deploy</phase>
- <configuration>
- <tasks>
- <echo/>
- <echo>=== ERROR: You are not building with Java 1.3 as
required ===</echo>
- <echo>Set JAVA_1_3_HOME pointing to the JDK 1.3
installation folder</echo>
- <echo>and run Maven with -Pjdk1.3 to activate the Java 1.3
profile</echo>
- <echo/>
- <echo>You could also run Maven with -PignoreJdk to use any
JDK version (be aware of the implications)</echo>
- <echo/>
- <fail>ERROR: You can not deploy without using Java
1.3.</fail>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
