activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r564622 - in /activemq/trunk: assembly/pom.xml assembly/src/main/descriptors/unix-bin.xml assembly/src/main/descriptors/windows-bin.xml pom.xml
Date Fri, 10 Aug 2007 15:39:06 GMT
Author: jstrachan
Date: Fri Aug 10 08:39:05 2007
New Revision: 564622

URL: http://svn.apache.org/viewvc?view=rev&rev=564622
Log:
Patched the ActiveMQ build to work with Camel 1.1

Modified:
    activemq/trunk/assembly/pom.xml
    activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
    activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?view=diff&rev=564622&r1=564621&r2=564622
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Fri Aug 10 08:39:05 2007
@@ -120,6 +120,16 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-activemq</artifactId>
     </dependency>
+    <!-- for the XML parsing -->
+    <dependency>
+      <groupId>javax.xml</groupId>
+      <artifactId>jaxb-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+    </dependency>
+
 
     <!-- commons -->
     <dependency>

Modified: activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?view=diff&rev=564622&r1=564621&r2=564622
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Fri Aug 10 08:39:05 2007
@@ -158,6 +158,12 @@
         <include>org.apache.camel:camel-spring</include>
         <include>org.apache.camel:camel-jms</include>
         <include>org.apache.camel:camel-activemq</include>
+				<!-- Java 5 only -->
+        <include>javax.xml:jaxb-api</include>
+        <include>javax.activation:activation</include>
+        <include>com.sun.xml.bind:jaxb-impl</include>
+        <include>stax:stax-api</include>
+        <include>stax:stax</include>
       </includes>
     </dependencySet>
     <dependencySet>

Modified: activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?view=diff&rev=564622&r1=564621&r2=564622
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Fri Aug 10 08:39:05 2007
@@ -163,6 +163,12 @@
         <include>org.apache.camel:camel-spring</include>
         <include>org.apache.camel:camel-jms</include>
         <include>org.apache.camel:camel-activemq</include>
+				<!-- Java 5 only -->
+        <include>javax.xml:jaxb-api</include>
+        <include>javax.activation:activation</include>
+        <include>com.sun.xml.bind:jaxb-impl</include>
+        <include>stax:stax-api</include>
+        <include>stax:stax</include>
       </includes>
     </dependencySet>
     <dependencySet>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?view=diff&rev=564622&r1=564621&r2=564622
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Aug 10 08:39:05 2007
@@ -414,6 +414,34 @@
         </exclusions>
       </dependency>
 
+			<!-- for the XML parsing -->
+      <dependency>
+        <groupId>javax.xml</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>2.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.xml</groupId>
+            <artifactId>jsr173</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>2.0.3</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.jws</groupId>
+            <artifactId>jsr181-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
       <!-- camel testing -->
       <dependency>
         <groupId>org.apache.camel</groupId>



Mime
View raw message