Repository: camel Updated Branches: refs/heads/camel-2.18.x 2395b7dd2 -> a5666f245
CAMEL-10465 - camel ahc uses netty 4.0.41 transitively but 4.1.5 explicitly - leads to runtime exceptions Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/325729bb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/325729bb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/325729bb Branch: refs/heads/camel-2.18.x Commit: 325729bb4e5dd2290cba30a6e37d75c1d5f292f3 Parents: 2395b7d Author: Andrea Cosentino <[email protected]> Authored: Fri Nov 11 11:47:30 2016 +0100 Committer: Andrea Cosentino <[email protected]> Committed: Fri Nov 11 12:42:16 2016 +0100 ---------------------------------------------------------------------- components/camel-ahc/pom.xml | 2 +- parent/pom.xml | 1 + .../karaf/features/src/main/resources/features.xml | 15 +++++++-------- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/325729bb/components/camel-ahc/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml index abcd585..350af2c 100644 --- a/components/camel-ahc/pom.xml +++ b/components/camel-ahc/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> - <version>${netty-version}</version> + <version>${netty-ahc-version}</version> </dependency> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/325729bb/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 7508b88..b700903 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -446,6 +446,7 @@ <neethi-bundle-version>3.0.1</neethi-bundle-version> <netty3-version>3.10.6.Final</netty3-version> <netty-version>4.1.5.Final</netty-version> + <netty-ahc-version>4.0.41.Final</netty-ahc-version> <noggit-bundle-version>0.5_1</noggit-bundle-version> <!-- should be in-sync with deltaspike --> <openwebbeans1-version>1.2.7</openwebbeans1-version> http://git-wip-us.apache.org/repos/asf/camel/blob/325729bb/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 bb61f13..a8542fe 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -87,14 +87,13 @@ <feature name='camel-ahc' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>wrap:mvn:org.asynchttpclient/async-http-client/${ahc-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-common/${netty-ahc-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-ahc-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-transport/${netty-ahc-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-handler/${netty-ahc-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty-ahc-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-ahc-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-ahc-version}</bundle> <bundle>mvn:org.apache.camel/camel-ahc/${project.version}</bundle> </feature> <feature name='camel-ahc-ws' version='${project.version}' resolver='(obr)' start-level='50'>
