Updated Branches: refs/heads/master 7b45b8466 -> 1bb756cd2
CAMEL-6555: Preparing for netty upgrade. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20adc69e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20adc69e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20adc69e Branch: refs/heads/master Commit: 20adc69ec7e035d19492950bec849b7508925799 Parents: 7b45b84 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 7 15:13:12 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Aug 7 15:13:12 2013 +0200 ---------------------------------------------------------------------- components/camel-ahc/pom.xml | 2 +- components/camel-avro/pom.xml | 2 +- components/camel-netty/pom.xml | 2 +- parent/pom.xml | 3 ++- platforms/karaf/features/src/main/resources/features.xml | 5 +++-- 5 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/20adc69e/components/camel-ahc/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml index 981759c..afb7147 100644 --- a/components/camel-ahc/pom.xml +++ b/components/camel-ahc/pom.xml @@ -54,7 +54,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> - <version>${netty-version}</version> + <version>${netty3-version}</version> </dependency> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/20adc69e/components/camel-avro/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml index e31592b..807572e 100644 --- a/components/camel-avro/pom.xml +++ b/components/camel-avro/pom.xml @@ -104,7 +104,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> - <version>${netty-version}</version> + <version>${netty3-version}</version> </dependency> <!-- use Jackson version as Camel --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/20adc69e/components/camel-netty/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-netty/pom.xml b/components/camel-netty/pom.xml index 6b7363a..46e9fc2 100644 --- a/components/camel-netty/pom.xml +++ b/components/camel-netty/pom.xml @@ -43,7 +43,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> - <version>${netty-version}</version> + <version>${netty3-version}</version> </dependency> <dependency> <groupId>commons-pool</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/20adc69e/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 92236ac..2741218 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -293,7 +293,8 @@ <mvel-version>2.1.6.Final</mvel-version> <mybatis-version>3.2.2</mybatis-version> <neethi-bundle-version>3.0.1</neethi-bundle-version> - <netty-version>3.6.6.Final</netty-version> + <netty3-version>3.6.6.Final</netty3-version> + <netty-version>4.0.6.Final</netty-version> <ode-version>1.3.4</ode-version> <!-- should be in-sync with deltaspike --> <openwebbeans-version>1.1.5</openwebbeans-version> http://git-wip-us.apache.org/repos/asf/camel/blob/20adc69e/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 009a285..f470ecb 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -56,6 +56,7 @@ <feature name='camel-ahc' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:com.ning/async-http-client/${ahc-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle> <bundle>mvn:org.apache.camel/camel-ahc/${project.version}</bundle> </feature> <feature name='camel-amqp' version='${project.version}' resolver='(obr)' start-level='50'> @@ -89,7 +90,7 @@ <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snappy-java/${snappy-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version}</bundle> @@ -691,7 +692,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:io.netty/netty/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> <bundle>mvn:org.apache.camel/camel-netty/${project.version}</bundle> </feature>
