You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/11/13 21:09:04 UTC
svn commit: r594627 - in /activemq/camel/trunk: camel-core/pom.xml
components/camel-jms/pom.xml
components/camel-jms/src/test/resources/log4j.properties
components/camel-spring/pom.xml pom.xml
Author: jstrachan
Date: Tue Nov 13 12:08:58 2007
New Revision: 594627
URL: http://svn.apache.org/viewvc?rev=594627&view=rev
Log:
upgraded to the newer version of JAXB as per this thread... http://www.nabble.com/camel-spring-pom-jaxb-version-tf4781385s22882.html
Modified:
activemq/camel/trunk/camel-core/pom.xml
activemq/camel/trunk/components/camel-jms/pom.xml
activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties
activemq/camel/trunk/components/camel-spring/pom.xml
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=594627&r1=594626&r2=594627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Tue Nov 13 12:08:58 2007
@@ -47,6 +47,10 @@
<groupId>javax.xml</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
<!-- we could move the StAX code into a separate module? -->
<dependency>
@@ -65,11 +69,6 @@
</dependency>
<!-- testing -->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: activemq/camel/trunk/components/camel-jms/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/pom.xml?rev=594627&r1=594626&r2=594627&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jms/pom.xml Tue Nov 13 12:08:58 2007
@@ -71,7 +71,12 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>apache-activemq</artifactId>
+ <artifactId>activemq-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties?rev=594627&r1=594626&r2=594627&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties (original)
+++ activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties Tue Nov 13 12:08:58 2007
@@ -35,7 +35,7 @@
#
# The logging properties used during tests..
#
-log4j.rootLogger=DEBUG, stdout
+log4j.rootLogger=INFO, out
log4j.logger.org.apache.activemq.spring=WARN
Modified: activemq/camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/pom.xml?rev=594627&r1=594626&r2=594627&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Tue Nov 13 12:08:58 2007
@@ -50,7 +50,6 @@
<dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxb-api</artifactId>
- <optional>false</optional>
</dependency>
<!-- for parsing the XML -->
Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=594627&r1=594626&r2=594627&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Tue Nov 13 12:08:58 2007
@@ -402,30 +402,21 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.0.3</version>
+ <!--<version>2.0.3</version>-->
+ <version>2.1.3</version>
<exclusions>
- <!--
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173</artifactId>
- </exclusion>
- -->
<exclusion>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
</exclusion>
- <!--
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- -->
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
+ <!-- TODO upgrade when a new version available -->
<version>2.0.3</version>
+ <!--<version>2.1.3</version>-->
</dependency>
<dependency>