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 B50D77034 for ; Thu, 8 Sep 2011 12:48:11 +0000 (UTC) Received: (qmail 34830 invoked by uid 500); 8 Sep 2011 12:48:11 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 34769 invoked by uid 500); 8 Sep 2011 12:48:08 -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 34761 invoked by uid 99); 8 Sep 2011 12:48:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Sep 2011 12:48:06 +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; Thu, 08 Sep 2011 12:48:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8BD7423889BB for ; Thu, 8 Sep 2011 12:47:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1166661 - in /camel/branches/camel-2.8.x: ./ parent/pom.xml Date: Thu, 08 Sep 2011 12:47:42 -0000 To: commits@camel.apache.org From: janstey@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110908124742.8BD7423889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: janstey Date: Thu Sep 8 12:47:42 2011 New Revision: 1166661 URL: http://svn.apache.org/viewvc?rev=1166661&view=rev Log: Merged revisions 1165658 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1165658 | jbonofre | 2011-09-06 10:49:12 -0230 (Tue, 06 Sep 2011) | 1 line [CAMEL-4416] Upgrade to Spring 3.0.6.RELEASE ........ Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/parent/pom.xml Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 8 12:47:42 2011 @@ -1 +1 @@ -/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163420,1164557,1164633,1164973-1165000,1165152,1165157,1165971,1165987 +/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163420,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987 Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1166661&r1=1166660&r2=1166661&view=diff ============================================================================== --- camel/branches/camel-2.8.x/parent/pom.xml (original) +++ camel/branches/camel-2.8.x/parent/pom.xml Thu Sep 8 12:47:42 2011 @@ -143,9 +143,9 @@ 2.1.0_1 2.0.4.RELEASE 1.0.0-20090215 - 3.0.5.RELEASE + 3.0.6.RELEASE 1.2.0 - 3.0.5.RELEASE + 3.0.6.RELEASE 2.0.2.RELEASE 2.5 1.0.1