You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/02/09 05:43:24 UTC
svn commit: r742254 - in /camel/branches/camel-1.x: ./
components/camel-jms/pom.xml
Author: ningjiang
Date: Mon Feb 9 04:43:24 2009
New Revision: 742254
URL: http://svn.apache.org/viewvc?rev=742254&view=rev
Log:
Merged revisions 742231 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r742231 | ningjiang | 2009-02-09 10:05:45 +0800 (Mon, 09 Feb 2009) | 1 line
CAMEL-1326 Removed the circular denpendency in camel-jms
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-jms/pom.xml
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 9 04:43:24 2009
@@ -1 +1 @@
-/camel/trunk:739733,739904,740251,740295,740306,740596,740663,741848
+/camel/trunk:739733,739904,740251,740295,740306,740596,740663,741848,742231
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-jms/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/pom.xml?rev=742254&r1=742253&r2=742254&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-jms/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-jms/pom.xml Mon Feb 9 04:43:24 2009
@@ -96,6 +96,12 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-camel</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jms</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
<!-- to avoid the cycle dependency here -->
<exclusions>