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 2012/07/12 07:24:54 UTC

svn commit: r1360529 - in /camel/branches/camel-2.10.x: ./ parent/pom.xml

Author: davsclaus
Date: Thu Jul 12 05:24:54 2012
New Revision: 1360529

URL: http://svn.apache.org/viewvc?rev=1360529&view=rev
Log:
Upgrade to Netty 3.5.2

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/parent/pom.xml

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1360526

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 12 05:24:54 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360526

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=1360529&r1=1360528&r2=1360529&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Thu Jul 12 05:24:54 2012
@@ -141,7 +141,7 @@
     <mybatis-version>3.1.1</mybatis-version>
     <!-- transitive dependency from avro, to use older netty bundle -->
     <netty-bundle-version>3.2.7.Final_1</netty-bundle-version>
-    <netty-version>3.5.1.Final</netty-version>
+    <netty-version>3.5.2.Final</netty-version>
     <ode-version>1.3.4</ode-version>
     <openwebbeans-version>1.1.3</openwebbeans-version>
     <ognl-version>3.0.5_1</ognl-version>