Return-Path: 
 <commits-return-22304-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 6CF41D7DE
	for <apmail-camel-commits-archive@www.apache.org>;
 Wed, 15 Aug 2012 16:27:20 +0000 (UTC)
Received: (qmail 61253 invoked by uid 500); 15 Aug 2012 16:27:20 -0000
Delivered-To: apmail-camel-commits-archive@camel.apache.org
Received: (qmail 61201 invoked by uid 500); 15 Aug 2012 16:27:20 -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 61194 invoked by uid 99); 15 Aug 2012 16:27:20 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2012 16:27:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2012 16:27:18 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B203D2388A6C;
	Wed, 15 Aug 2012 16:26:28 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1373514 - /camel/branches/camel-2.9.x/parent/pom.xml
Date: Wed, 15 Aug 2012 16:26:28 -0000
To: commits@camel.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120815162628.B203D2388A6C@eris.apache.org>

Author: dkulp
Date: Wed Aug 15 16:26:28 2012
New Revision: 1373514

URL: http://svn.apache.org/viewvc?rev=1373514&view=rev
Log:
Merged revisions 1373498 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x

........
  r1373498 | dkulp | 2012-08-15 12:09:02 -0400 (Wed, 15 Aug 2012) | 10 lines

  Merged revisions 1372320 via  git cherry-pick from
  https://svn.apache.org/repos/asf/camel/trunk

  ........
    r1372320 | davsclaus | 2012-08-13 04:48:48 -0400 (Mon, 13 Aug 2012) | 2 lines

    Upgraded to Jettison 1.3.2

  ........

........

Modified:
    camel/branches/camel-2.9.x/parent/pom.xml

Modified: camel/branches/camel-2.9.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1373514&r1=1373513&r2=1373514&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Wed Aug 15 16:26:28 2012
@@ -105,7 +105,7 @@
     <jclouds-feature-version>1.3.2_3</jclouds-feature-version>
     <jdom-version>1.1</jdom-version>
     <jetty-version>7.5.4.v20111024</jetty-version>
-    <jettison-version>1.3</jettison-version>
+    <jettison-version>1.3.2</jettison-version>
     <jexcelapi-version>2.4.2</jexcelapi-version>
     <jibx-version>1.2.4.5</jibx-version>
     <jruby-version>1.6.7</jruby-version>