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

[da...@apache.org]

Author: davsclaus
Date: Fri Nov 30 08:15:19 2012
New Revision: 1415536

URL: http://svn.apache.org/viewvc?rev=1415536&view=rev
Log:
Upgraded to latest Netty and AHC

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:r1415534

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

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=1415536&r1=1415535&r2=1415536&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Fri Nov 30 08:15:19 2012
@@ -37,7 +37,7 @@
     <abdera-version>1.1.2</abdera-version>
     <!-- Note that activemq dependency is only used for testing! -->
     <activemq-version>5.7.0</activemq-version>
-    <ahc-version>1.7.5</ahc-version>
+    <ahc-version>1.7.8</ahc-version>
     <apacheds-version>1.5.7</apacheds-version>
     <aries-blueprint-version>0.3</aries-blueprint-version>
     <asm-bundle-version>3.3_2</asm-bundle-version>
@@ -149,7 +149,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.9.Final</netty-version>
+    <netty-version>3.5.11.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>