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 7A9361094D for ; Sat, 12 Oct 2013 09:39:50 +0000 (UTC) Received: (qmail 38423 invoked by uid 500); 12 Oct 2013 09:39:47 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 38363 invoked by uid 500); 12 Oct 2013 09:39:46 -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 38258 invoked by uid 99); 12 Oct 2013 09:39:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Oct 2013 09:39:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0F3E9838106; Sat, 12 Oct 2013 09:39:45 +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: Sat, 12 Oct 2013 09:39:47 -0000 Message-Id: <0ec6e7ad919b4f0bb05d06de4cffdfd1@git.apache.org> In-Reply-To: <6207f995204840818ddbc65e3e4f399a@git.apache.org> References: <6207f995204840818ddbc65e3e4f399a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: Dependency upgrades Dependency upgrades Conflicts: parent/pom.xml Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4eaf3f71 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4eaf3f71 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4eaf3f71 Branch: refs/heads/camel-2.12.x Commit: 4eaf3f717ca45c1eb82084c21fbeb8bce346b847 Parents: 2928bc1 Author: Claus Ibsen Authored: Sat Oct 12 11:37:56 2013 +0200 Committer: Claus Ibsen Committed: Sat Oct 12 11:39:29 2013 +0200 ---------------------------------------------------------------------- parent/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4eaf3f71/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 784e2b8..8ca52f9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -170,7 +170,7 @@ 2.1 1.9 1.6 - 1.17 + 1.18 2.6 0.94.10 0.94.6_1 @@ -290,8 +290,8 @@ 2.0.7 1.7 1.9.5 - 2.11.2 - 1.5 + 2.11.3 + 1.6 20050913 0.8.13 0.8.13_1/ @@ -377,7 +377,7 @@ 2.5_2 2.8.4 0.8.0 - 1.17 + 1.18 1.0.1 3.1.1 4.0.2_2