Author: dkulp Date: Wed Jul 11 15:57:39 2012 New Revision: 1360247 URL: http://svn.apache.org/viewvc?rev=1360247&view=rev Log: Merged revisions 1359383 via git cherry-pick from https://svn.apache.org/repos/asf/camel/trunk
........ r1359383 | cmueller | 2012-07-09 16:36:28 -0400 (Mon, 09 Jul 2012) | 2 lines upgraded Spring 3.1 profile to 3.1.2.RELEASE ........ Modified: camel/branches/camel-2.10.x/parent/pom.xml Modified: camel/branches/camel-2.10.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1360247&r1=1360246&r2=1360247&view=diff ============================================================================== --- camel/branches/camel-2.10.x/parent/pom.xml (original) +++ camel/branches/camel-2.10.x/parent/pom.xml Wed Jul 11 15:57:39 2012 @@ -1802,7 +1802,7 @@ <profile> <id>spring3.1</id> <properties> - <spring-version>3.1.1.RELEASE</spring-version> + <spring-version>3.1.2.RELEASE</spring-version> </properties> </profile> <profile>