Author: janstey
Date: Fri Dec  7 19:36:05 2012
New Revision: 1418453

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

Modified:
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1418453&r1=1418452&r2=1418453&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Dec  7 19:36:05 2012
@@ -137,7 +137,6 @@
     <gmaven-plugin-version>1.4</gmaven-plugin-version>
     <google-app-engine-version>1.6.6</google-app-engine-version>
     <google-gdata-version>1.41.5.w1</google-gdata-version>
-    <google-guava-bundle-version>11_1</google-guava-bundle-version> <!-- FIXME 
cmueller: not in sync! -->
     <google-guava-version>13.0.1</google-guava-version>
     <groovy-version>2.0.5</groovy-version>
     <gson-version>2.2.2</gson-version>

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1418453&r1=1418452&r2=1418453&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri 
Dec  7 19:36:05 2012
@@ -286,7 +286,7 @@
   <feature name="camel-elasticsearch" version="${project.version}" 
resolver="(obr)" start-level="50">
     <feature version='${project.version}'>camel-core</feature>
     <feature>http</feature>
-    <bundle 
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guava/${google-guava-bundle-version}</bundle>
+    <bundle 
dependency="true">mvn:com.google.guava/guava/${google-guava-version}</bundle>
     <bundle 
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf-java-bundle-version}</bundle>
     <bundle 
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
     <bundle 
dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}</bundle>


Reply via email to