Repository: camel Updated Branches: refs/heads/master f89e7682f -> c5203c033
CAMEL-10465 - camel ahc uses netty 4.0.41 transitively but 4.1.5 explicitly - leads to runtime exceptions. Renamed property. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c5203c03 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5203c03 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5203c03 Branch: refs/heads/master Commit: c5203c033557b97903f011f633e50644ef6fdde0 Parents: f89e768 Author: Andrea Cosentino <[email protected]> Authored: Fri Nov 11 12:12:33 2016 +0100 Committer: Andrea Cosentino <[email protected]> Committed: Fri Nov 11 12:12:33 2016 +0100 ---------------------------------------------------------------------- components/camel-ahc/pom.xml | 2 +- parent/pom.xml | 2 +- .../karaf/features/src/main/resources/features.xml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c5203c03/components/camel-ahc/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml index 1951187..b0e4a52 100644 --- a/components/camel-ahc/pom.xml +++ b/components/camel-ahc/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> - <version>${netty-ahc-version}</version> + <version>${netty40-version}</version> </dependency> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/c5203c03/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2e53669..f2cfc05 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -448,7 +448,7 @@ <neethi-bundle-version>3.0.1</neethi-bundle-version> <netty3-version>3.10.6.Final</netty3-version> <netty-version>4.1.6.Final</netty-version> - <netty-ahc-version>4.0.41.Final</netty-ahc-version> + <netty40-version>4.0.41.Final</netty40-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/c5203c03/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 50fc7ff..335fec5 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -87,13 +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-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 dependency='true'>mvn:io.netty/netty-common/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-transport/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-handler/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty40-version}</bundle> <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-ahc/${project.version}</bundle>
