Return-Path: 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 DF81B1185B for ; Wed, 6 Aug 2014 07:53:01 +0000 (UTC) Received: (qmail 68015 invoked by uid 500); 6 Aug 2014 07:53:01 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 67961 invoked by uid 500); 6 Aug 2014 07:53:01 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 67952 invoked by uid 99); 6 Aug 2014 07:53:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Aug 2014 07:53:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 52FB088A45B; Wed, 6 Aug 2014 07:53:01 +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 Date: Wed, 06 Aug 2014 07:53:02 -0000 Message-Id: <4da38fb7b6f84192883af808fa0f50d0@git.apache.org> In-Reply-To: <09b58d824fd746d080ceb385b10adadf@git.apache.org> References: <09b58d824fd746d080ceb385b10adadf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Upgrade to jclouds 1.8.0 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 Authored: Wed Aug 6 09:52:51 2014 +0200 Committer: Claus Ibsen 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 @@ 1.0.0.Final

3.1.4.GA

1.3.18.GA - 1.7.2 + 1.8.0 - 15.0 + 17.0

2.0

1.1_4

1.1.3 @@ -254,6 +254,7 @@ 0.9.1

1.2

1.0.1 + 1.1.1

2.1.0_4

6.7

6.7_1 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 @@ jclouds jclouds-blobstore jclouds-compute - camel-core + camel-core + mvn:javax.ws.rs/jsr311-api/${jsr311-api-version} mvn:org.apache.camel/camel-jclouds/${project.version}