You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/04/02 01:02:35 UTC
svn commit: r1308210 - in /activemq/activemq-apollo/trunk:
apollo-openwire-generator/pom.xml apollo-openwire/pom.xml
Author: chirino
Date: Sun Apr 1 23:02:35 2012
New Revision: 1308210
URL: http://svn.apache.org/viewvc?rev=1308210&view=rev
Log:
Fixes build on JDK 1.7 OS X machines.
Modified:
activemq/activemq-apollo/trunk/apollo-openwire-generator/pom.xml
activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
Modified: activemq/activemq-apollo/trunk/apollo-openwire-generator/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire-generator/pom.xml?rev=1308210&r1=1308209&r2=1308210&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire-generator/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire-generator/pom.xml Sun Apr 1 23:02:35 2012
@@ -48,4 +48,43 @@
</dependencies>
+ <profiles>
+ <profile>
+ <id>lib/tools.jar</id>
+ <activation>
+ <file>
+ <exists>${java.home}/lib/tools.jar</exists>
+ </file>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.6.0</version>
+ <scope>system</scope>
+ <optional>true</optional>
+ <systemPath>${java.home}/lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>../lib/tools.jar</id>
+ <activation>
+ <file>
+ <exists>${java.home}/../lib/tools.jar</exists>
+ </file>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.6.0</version>
+ <scope>system</scope>
+ <optional>true</optional>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
Modified: activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/pom.xml?rev=1308210&r1=1308209&r2=1308210&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/pom.xml Sun Apr 1 23:02:35 2012
@@ -198,5 +198,60 @@
</plugins>
</build>
-
+
+ <profiles>
+ <profile>
+ <id>lib/tools.jar</id>
+ <activation>
+ <file>
+ <exists>${java.home}/lib/tools.jar</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.6.0</version>
+ <scope>system</scope>
+ <optional>true</optional>
+ <systemPath>${java.home}/lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>../lib/tools.jar</id>
+ <activation>
+ <file>
+ <exists>${java.home}/../lib/tools.jar</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.6.0</version>
+ <scope>system</scope>
+ <optional>true</optional>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>