Repository: camel Updated Branches: refs/heads/camel-2.13.x 80015c52a -> 5ded80e80 refs/heads/camel-2.14.x ee9f56261 -> 13e613332
Upgraded Spring 3.2.x version to 3.2.11 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bfe2c537 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bfe2c537 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bfe2c537 Branch: refs/heads/camel-2.13.x Commit: bfe2c5371371b9f8324c363ba71bf5ccbe2354dd Parents: 80015c5 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Tue Oct 21 16:22:12 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Tue Oct 21 16:22:12 2014 +0800 ---------------------------------------------------------------------- parent/pom.xml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bfe2c537/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 9ec4f30..3ae7cbc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -32,7 +32,7 @@ <properties> <compiler.fork>true</compiler.fork> - + <!-- dependency versions --> <abdera-version>1.1.3</abdera-version> <!-- Note that activemq dependency is only used for testing! --> @@ -185,7 +185,7 @@ <httpunit-version>1.7</httpunit-version> <httpcore4-version>4.3.2</httpcore4-version> <httpclient4-version>4.3.3</httpclient4-version> - <httpclient-version>3.1</httpclient-version> + <httpclient-version>3.1</httpclient-version> <ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version> <ibatis-version>2.3.4.726</ibatis-version> <ical4j-version>1.0.5.2</ical4j-version> @@ -337,7 +337,7 @@ <pdfbox-version>1.6.0</pdfbox-version> <plexus-container-default-version>1.0-alpha-48</plexus-container-default-version> <plexus-utils-version>1.5.6</plexus-utils-version> - <pojosr-version>0.2.1</pojosr-version> + <pojosr-version>0.2.1</pojosr-version> <protobuf-version>2.5.0</protobuf-version> <qpid-bundle-version>0.26_1</qpid-bundle-version> <qpid-version>0.26</qpid-version> @@ -387,10 +387,10 @@ <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version> <spring-ldap-version>1.3.1.RELEASE</spring-ldap-version> <spring-ldap-bundle-version>1.3.1.RELEASE_2</spring-ldap-bundle-version> - <spring-retry-version>1.0.3.RELEASE</spring-retry-version> + <spring-retry-version>1.0.3.RELEASE</spring-retry-version> <spring-version-range>[3.2,4)</spring-version-range> - <spring-version>${spring32-version}</spring-version> - <spring32-version>3.2.8.RELEASE</spring32-version> + <spring-version>${spring32-version}</spring-version> + <spring32-version>3.2.11.RELEASE</spring32-version> <spring4-version>4.0.2.RELEASE</spring4-version> <spring-osgi-version>1.2.1</spring-osgi-version> <spring-security-version>3.1.4.RELEASE</spring-security-version> @@ -887,7 +887,7 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-jsonpath</artifactId> <version>${project.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jt400</artifactId> @@ -1132,7 +1132,7 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-splunk</artifactId> <version>${project.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-snmp</artifactId> @@ -2195,8 +2195,8 @@ </defaultOptions> </configuration> <dependencies> - <!-- needed to add this to get around the following error on - IBM's JDK org.apache.xerces.impl.dv.DVFactoryException: DTD factory class + <!-- needed to add this to get around the following error on + IBM's JDK org.apache.xerces.impl.dv.DVFactoryException: DTD factory class org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl does not extend from DTDDVFactory. --> <dependency> <groupId>xerces</groupId> @@ -2428,8 +2428,8 @@ <version>${maven-war-plugin-version}</version> <configuration> <webResources> - <!-- HACK: Include legal files explicitly, otherwise they will - end up in the wrong path or in another jar file in the war. NOTE: targetPath + <!-- HACK: Include legal files explicitly, otherwise they will + end up in the wrong path or in another jar file in the war. NOTE: targetPath is broken for webResources (as documented) --> <resource> <directory>${project.build.outputDirectory}</directory> @@ -2704,7 +2704,7 @@ <activeByDefault>true</activeByDefault> </activation> </profile> - + <profile> <id>fastinstall</id> <activation> @@ -2718,7 +2718,7 @@ <noassembly>true</noassembly> </properties> </profile> - + <profile> <id>sourcecheck</id> <build> @@ -2730,7 +2730,7 @@ </plugins> </build> </profile> - + <profile> <id>setup.eclipse</id> <build> @@ -2753,7 +2753,7 @@ </plugins> </build> </profile> - + <!-- profiles for choosing default spring version --> <profile> <id>spring3.2</id> @@ -2786,5 +2786,5 @@ </dependencies> </profile> </profiles> - + </project>
