camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] git commit: Upgrade to jclouds 1.8.0
Date Wed, 06 Aug 2014 07:53:02 GMT
Upgrade to jclouds 1.8.0


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d4a164bc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d4a164bc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d4a164bc

Branch: refs/heads/master
Commit: d4a164bc1af0bdb33ecd951ccd6fc3a35da72c7e
Parents: bdcfbe0
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Aug 6 09:52:51 2014 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Aug 6 09:52:51 2014 +0200

----------------------------------------------------------------------
 parent/pom.xml                                           | 5 +++--
 platforms/karaf/features/src/main/resources/features.xml | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d4a164bc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ed74ef3..032ee02 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -219,9 +219,9 @@
     <jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
     <jboss-logging-version>3.1.4.GA</jboss-logging-version>
     <jboss-marshalling-version>1.3.18.GA</jboss-marshalling-version>
-    <jclouds-version>1.7.2</jclouds-version>
+    <jclouds-version>1.8.0</jclouds-version>
     <!-- jclouds must use this guava version -->
-    <jclouds-google-guava-version>15.0</jclouds-google-guava-version>
+    <jclouds-google-guava-version>17.0</jclouds-google-guava-version>
     <jcr-version>2.0</jcr-version>
     <jdom-bundle-version>1.1_4</jdom-bundle-version>
     <jdom-version>1.1.3</jdom-version>
@@ -254,6 +254,7 @@
     <json-path-version>0.9.1</json-path-version>
     <json-smart-version>1.2</json-smart-version>
     <jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
+    <jsr311-api-version>1.1.1</jsr311-api-version>
     <jsmpp-bundle-version>2.1.0_4</jsmpp-bundle-version>
     <jt400-version>6.7</jt400-version>
     <jt400-bundle-version>6.7_1</jt400-bundle-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/d4a164bc/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index c762c82..7d3fc4f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -635,7 +635,8 @@
     <feature version='${jclouds-version}'>jclouds</feature>
     <feature version='${jclouds-version}'>jclouds-blobstore</feature>
     <feature version='${jclouds-version}'>jclouds-compute</feature>
-    <feature version='${project.version}'>camel-core</feature>
+    <feature version='${project.version}'>camel-core</feature>   
+    <bundle>mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-jclouds/${project.version}</bundle>
   </feature>
   <feature name='camel-jcr' version='${project.version}' resolver='(obr)' start-level='50'>


Mime
View raw message