You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/11/04 08:32:20 UTC
svn commit: r711202 - in /activemq/camel/branches/camel-1.x: ./ pom.xml
Author: davsclaus
Date: Mon Nov 3 23:32:20 2008
New Revision: 711202
URL: http://svn.apache.org/viewvc?rev=711202&view=rev
Log:
Merged revisions 711200 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r711200 | davsclaus | 2008-11-04 08:25:37 +0100 (ti, 04 nov 2008) | 1 line
CAMEL-1050: Upgrade to Spring 2.5.6, and testng 5.8 as well.
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
svn:mergeinfo = /activemq/camel/trunk:711200
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 3 23:32:20 2008
@@ -1 +1 @@
-/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-709849,709851-710013
+/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-709849,709851-710013,711200
Modified: activemq/camel/branches/camel-1.x/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/pom.xml?rev=711202&r1=711201&r2=711202&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/pom.xml Mon Nov 3 23:32:20 2008
@@ -51,7 +51,7 @@
<jetty-version>6.1.11</jetty-version>
<slf4j-version>1.5.5</slf4j-version>
<openjpa-version>1.2.0</openjpa-version>
- <spring-version>2.5.5</spring-version>
+ <spring-version>2.5.6</spring-version>
<spring-osgi-version>1.1.2</spring-osgi-version>
<mina-version>1.1.7</mina-version>
<uface-version>1.0-m1</uface-version>
@@ -77,7 +77,7 @@
<saxon-version>9.1.0.1</saxon-version>
<scala-version>2.7.2-rc1</scala-version>
<scala-plugin-version>2.7.1</scala-plugin-version>
- <testng-version>5.7</testng-version>
+ <testng-version>5.8</testng-version>
<xbean-spring-version>3.4</xbean-spring-version>
<!-- Repositories -->