You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2011/09/08 14:47:42 UTC

svn commit: r1166661 - in /camel/branches/camel-2.8.x: ./ parent/pom.xml

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 @@
     <smpp-version>2.1.0_1</smpp-version>
     <spring-integration-version>2.0.4.RELEASE</spring-integration-version>
     <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
-    <spring-version>3.0.5.RELEASE</spring-version>
+    <spring-version>3.0.6.RELEASE</spring-version>
     <spring-osgi-version>1.2.0</spring-osgi-version>
-    <spring-security-version>3.0.5.RELEASE</spring-security-version>
+    <spring-security-version>3.0.6.RELEASE</spring-security-version>
     <spring-ws-version>2.0.2.RELEASE</spring-ws-version>
     <spymemcached-version>2.5</spymemcached-version>
     <stax-api-version>1.0.1</stax-api-version>