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 2012/12/07 20:39:18 UTC

svn commit: r1418455 - /camel/branches/camel-2.10.x/parent/pom.xml

Author: janstey
Date: Fri Dec  7 19:39:17 2012
New Revision: 1418455

URL: http://svn.apache.org/viewvc?rev=1418455&view=rev
Log:
CAMEL-5855 - Use guava 13.0.1 rather than SMX bundle


Conflicts:
	parent/pom.xml
	platforms/karaf/features/src/main/resources/features.xml

Modified:
    camel/branches/camel-2.10.x/parent/pom.xml

Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1418455&r1=1418454&r2=1418455&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Fri Dec  7 19:39:17 2012
@@ -87,7 +87,7 @@
     <geronimo-servlet-spec-version>1.1.2</geronimo-servlet-spec-version>
     <google-app-engine-version>1.6.6</google-app-engine-version>
     <google-gdata-version>1.41.5.w1</google-gdata-version>
-    <google-guava-version>12.0</google-guava-version>
+    <google-guava-version>13.0.1</google-guava-version>
     <groovy-version>1.8.6</groovy-version>
     <gson-version>2.1</gson-version>
     <guiceyfruit-version>2.0</guiceyfruit-version>