You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/06/19 07:11:21 UTC
svn commit: r1351569 - in /camel/trunk:
components/camel-guava-eventbus/pom.xml parent/pom.xml
Author: davsclaus
Date: Tue Jun 19 05:11:20 2012
New Revision: 1351569
URL: http://svn.apache.org/viewvc?rev=1351569&view=rev
Log:
CAMEL-5138: Karaf tests do not support Guava v12
Modified:
camel/trunk/components/camel-guava-eventbus/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-guava-eventbus/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guava-eventbus/pom.xml?rev=1351569&r1=1351568&r2=1351569&view=diff
==============================================================================
--- camel/trunk/components/camel-guava-eventbus/pom.xml (original)
+++ camel/trunk/components/camel-guava-eventbus/pom.xml Tue Jun 19 05:11:20 2012
@@ -45,6 +45,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <version>${google-guava-version}</version>
</dependency>
<dependency>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1351569&r1=1351568&r2=1351569&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Jun 19 05:11:20 2012
@@ -1259,14 +1259,7 @@
<version>${guiceyfruit-version}</version>
</dependency>
- <!-- optional guava dependencies -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-guava-version}</version>
- </dependency>
-
- <!-- optional castor dependencies -->
+ <!-- optional castor dependencies -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.castor</artifactId>