Author: ningjiang
Date: Wed Dec 2 03:59:23 2009
New Revision: 886046
URL: http://svn.apache.org/viewvc?rev=886046&view=rev
Log:
CAMEL-2243 revert the last commit which cause the Camel build failed with SUN
JDK
Modified:
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=886046&r1=886045&r2=886046&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Dec 2 03:59:23 2009
@@ -1263,6 +1263,34 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>on-sunjdk</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>Sun Microsystems Inc.</value>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>true</inherited>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=886046&r1=886045&r2=886046&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Wed Dec 2 03:59:23 2009
@@ -623,36 +623,6 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>on-sunjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>true</inherited>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
-
<profile>
<id>rat</id>
<!-- The profile for Apache Release Audit Tool
http://incubator.apache.org/rat/ -->
