You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2008/11/24 19:06:27 UTC
svn commit: r720242 - in /activemq/camel/branches/camel-1.x: ./
components/camel-xstream/pom.xml
Author: janstey
Date: Mon Nov 24 10:06:26 2008
New Revision: 720242
URL: http://svn.apache.org/viewvc?rev=720242&view=rev
Log:
Merged revisions 720230 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r720230 | janstey | 2008-11-24 13:32:11 -0330 (Mon, 24 Nov 2008) | 1 line
Exclude optional xom dependency from xstream, it is LGPL.
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-xstream/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/components/camel-xstream/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-xstream/pom.xml?rev=720242&r1=720241&r2=720242&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-xstream/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-xstream/pom.xml Mon Nov 24 10:06:26 2008
@@ -45,8 +45,16 @@
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
+ <artifactId>xstream</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- xom is an optional dependency of xstream. Its also
+ LGPL, so its really not ASF compatible. -->
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>