Author: cziegeler
Date: Fri Feb 21 10:23:31 2014
New Revision: 1570512
URL: http://svn.apache.org/r1570512
Log:
Revert setting the dependency to tools.jar depending on the vm
Modified:
sling/trunk/bundles/engine/pom.xml
Modified: sling/trunk/bundles/engine/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=1570512&r1=1570511&r2=1570512&view=diff
==============================================================================
--- sling/trunk/bundles/engine/pom.xml (original)
+++ sling/trunk/bundles/engine/pom.xml Fri Feb 21 10:23:31 2014
@@ -89,6 +89,15 @@
</goals>
</execution>
</executions>
+ <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>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -241,25 +250,6 @@
</dependency>
</dependencies>
<profiles>
- <!-- Dependency to tools.jar for the ant task -->
- <profile>
- <id>default-tools.jar</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
- <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>
- </profile>
<profile>
<id>benchmarks</id>
<build>