Patched the ActiveMQ build to work with Camel 1.1

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@564622 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2007-08-10 15:39:05 +00:00
parent 1963ea4006
commit 9cde47f42c
4 changed files with 50 additions and 0 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

28
pom.xml
View File

@ -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>