Return-Path: 
 <commits-return-42994-apmail-camel-commits-archive=camel.apache.org@camel.apache.org>
X-Original-To: apmail-camel-commits-archive@www.apache.org
Delivered-To: apmail-camel-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3204F18821
	for <apmail-camel-commits-archive@www.apache.org>;
 Thu,  6 Aug 2015 09:20:09 +0000 (UTC)
Received: (qmail 36614 invoked by uid 500); 6 Aug 2015 09:20:09 -0000
Delivered-To: apmail-camel-commits-archive@camel.apache.org
Received: (qmail 36564 invoked by uid 500); 6 Aug 2015 09:20:09 -0000
Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@camel.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@camel.apache.org>
List-Post: <mailto:commits@camel.apache.org>
List-Id: <commits.camel.apache.org>
Reply-To: dev@camel.apache.org
Delivered-To: mailing list commits@camel.apache.org
Received: (qmail 36555 invoked by uid 99); 6 Aug 2015 09:20:09 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Aug 2015 09:20:09 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id E8090E03EC; Thu,  6 Aug 2015 09:20:08 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: davsclaus@apache.org
To: commits@camel.apache.org
Message-Id: <60f3b27836184d0083e6c1e591b34f6c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: camel git commit: camel-jclouds requires guice 3
Date: Thu,  6 Aug 2015 09:20:08 +0000 (UTC)

Repository: camel
Updated Branches:
  refs/heads/master 0a5c9a2c9 -> c9a5fe8e9


camel-jclouds requires guice 3


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

Branch: refs/heads/master
Commit: c9a5fe8e9b51e3a6c7d0fd8312d4df2bf0047546
Parents: 0a5c9a2
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Aug 6 11:26:19 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Aug 6 11:26:19 2015 +0200

----------------------------------------------------------------------
 components/camel-jclouds/pom.xml | 98 ++++++++++++++++++-----------------
 parent/pom.xml                   |  3 +-
 2 files changed, 53 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c9a5fe8e/components/camel-jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 21fec12..bf71510 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -17,60 +17,64 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>components</artifactId>
-        <version>2.16-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>components</artifactId>
+    <version>2.16-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>camel-jclouds</artifactId>
-    <packaging>bundle</packaging>
-    <name>Camel :: JClouds</name>
-    <description>Camel JClouds support</description>
+  <artifactId>camel-jclouds</artifactId>
+  <packaging>bundle</packaging>
+  <name>Camel :: JClouds</name>
+  <description>Camel JClouds support</description>
 
-    <properties>
-        <camel.osgi.import.before.defaults>
-            com.google.common.*;version="${jclouds-google-guava-version-range}",
-        </camel.osgi.import.before.defaults>
+  <properties>
+    <camel.osgi.import.before.defaults>
+      com.google.common.*;version="${jclouds-google-guava-version-range}",
+    </camel.osgi.import.before.defaults>
 
-        <camel.osgi.export.pkg>org.apache.camel.component.jclouds.*</camel.osgi.export.pkg>
-        <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jclouds</camel.osgi.export.service>
-        <google-guava-version>${jclouds-google-guava-version}</google-guava-version>
-    </properties>
+    <camel.osgi.export.pkg>org.apache.camel.component.jclouds.*</camel.osgi.export.pkg>
+    <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jclouds</camel.osgi.export.service>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-        </dependency>
+    <!-- jclouds requires guice 3 -->
+    <google-guava-version>${jclouds-google-guava-version}</google-guava-version>
+    <guice-version>${guice3-version}</guice-version>
+  </properties>
 
-        <!-- jclouds -->
-        <dependency>
-            <groupId>org.apache.jclouds</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
-            <version>${jclouds-version}</version>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
 
-         <dependency>
-            <groupId>org.apache.jclouds</groupId>
-            <artifactId>jclouds-compute</artifactId>
-            <version>${jclouds-version}</version>
-        </dependency>
+    <!-- jclouds -->
+    <dependency>
+      <groupId>org.apache.jclouds</groupId>
+      <artifactId>jclouds-blobstore</artifactId>
+      <version>${jclouds-version}</version>
+    </dependency>
 
-        <!-- test -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
+    <dependency>
+      <groupId>org.apache.jclouds</groupId>
+      <artifactId>jclouds-compute</artifactId>
+      <version>${jclouds-version}</version>
+    </dependency>
 
-    </dependencies>
+    <!-- test -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test-spring</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/camel/blob/c9a5fe8e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b61420..ccdace5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -196,6 +196,7 @@
     <grizzly-websockets-version>2.3.21</grizzly-websockets-version>
     <groovy-version>2.4.4</groovy-version>
     <gson-version>2.3.1</gson-version>
+    <guice3-version>3.0</guice3-version>
     <guice-version>4.0</guice-version>
     <guice-bundle-version>3.0_1</guice-bundle-version>
     <hadoop-bundle-version>1.2.1_1</hadoop-bundle-version>
@@ -256,7 +257,7 @@
     <jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version>
     <jclouds-version>1.9.0</jclouds-version>
     <!-- jclouds must use this guava version -->
-    <jclouds-google-guava-version>16.0</jclouds-google-guava-version>
+    <jclouds-google-guava-version>16.0.1</jclouds-google-guava-version>
     <jclouds-google-guava-version-range>[16.0,17.0)</jclouds-google-guava-version-range>
     <jcr-version>2.0</jcr-version>
     <jdom-bundle-version>1.1_4</jdom-bundle-version>