Author: cmueller
Date: Fri Feb 17 07:26:58 2012
New Revision: 1245333
URL: http://svn.apache.org/viewvc?rev=1245333&view=rev
Log:
CAMEL-5013: Upgrade org.jboss.netty/netty/3.2.6.Final_1 ->
io.netty/netty/3.3.1.Final
Modified:
camel/trunk/components/camel-netty/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-netty/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/pom.xml?rev=1245333&r1=1245332&r2=1245333&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/pom.xml (original)
+++ camel/trunk/components/camel-netty/pom.xml Fri Feb 17 07:26:58 2012
@@ -54,9 +54,9 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.netty</artifactId>
- <version>${netty-bundle-version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${netty-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1245333&r1=1245332&r2=1245333&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Feb 17 07:26:58 2012
@@ -126,7 +126,9 @@
<mongo-java-driver-version>2.7.3</mongo-java-driver-version>
<mvel-version>2.0.18</mvel-version>
<mybatis-version>3.0.6</mybatis-version>
+ <!-- transitive dependency from avro -->
<netty-bundle-version>3.2.6.Final_1</netty-bundle-version>
+ <netty-version>3.3.1.Final</netty-version>
<ode-version>1.3.3</ode-version>
<openwebbeans-version>1.1.3</openwebbeans-version>
<ognl-version>3.0.2_1</ognl-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1245333&r1=1245332&r2=1245333&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri
Feb 17 07:26:58 2012
@@ -516,7 +516,7 @@
</feature>
<feature name='camel-netty' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.netty/${netty-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty/${netty-version}</bundle>
<bundle>mvn:org.apache.camel/camel-netty/${project.version}</bundle>
</feature>
<feature name='camel-ognl' version='${project.version}' resolver='(obr)'
start-level='50'>
