activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r805665 - /activemq/sandbox/activemq-flow/activemq-broker/pom.xml
Date Wed, 19 Aug 2009 05:23:47 GMT
Author: chirino
Date: Wed Aug 19 05:23:47 2009
New Revision: 805665

URL: http://svn.apache.org/viewvc?rev=805665&view=rev
Log:
Fixing profile problem the causes the build to fail on OSX

Modified:
    activemq/sandbox/activemq-flow/activemq-broker/pom.xml

Modified: activemq/sandbox/activemq-flow/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/pom.xml?rev=805665&r1=805664&r2=805665&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/pom.xml Wed Aug 19 05:23:47 2009
@@ -210,6 +210,7 @@
             </goals>
           </execution>
         </executions>
+        
         <dependencies>
           <dependency>
             <groupId>com.sun.xml.bind</groupId>
@@ -233,19 +234,7 @@
               </exclusion>
             </exclusions>
           </dependency>
-          <!--
-          Specifying the dependency on tools.jar appears to be required for non OS-X. 
-          Should remove if future versions of mvn fix this
-          -->
-          <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>
@@ -268,24 +257,35 @@
         </dependency>
       </dependencies>
     </profile>
+    
    <profile>
-      <id>default-tools.jar</id>
+      <id>ibmjdk</id>
       <activation>
-        <jdk>1.5</jdk>
-        <property>
-          <name>java.vendor</name>
-          <value>Sun Microsystems Inc.</value>
-        </property>
+        <file>
+          <exists>${java.home}/../lib/tools.jar</exists>
+        </file>
       </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>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-antrun-plugin</artifactId>
+              <dependencies>
+                <dependency>
+                  <groupId>com.sun</groupId>
+                  <artifactId>tools</artifactId>
+                  <!--the real JDK version could be 1.5 or 1.6-->
+                  <version>1.5.0</version>
+                  <scope>system</scope>
+                  <optional>true</optional>
+                  <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                </dependency>
+              </dependencies>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
     </profile>
   </profiles>
 



Mime
View raw message