Sure. I will rename. -- Andrea Cosentino ---------------------------------- Apache Camel PMC Member Apache Karaf Committer Apache Servicemix Committer Email: ancosen1...@yahoo.com Twitter: @oscerd2 Github: oscerd
On Friday, November 11, 2016 12:05 PM, Claus Ibsen <claus.ib...@gmail.com> wrote: Hi Maybe name the key netty40-version instead of netty-ahc-version as there may be others that may require different netty versions in the future, eg netty41 netty42 etc On Fri, Nov 11, 2016 at 11:50 AM, <acosent...@apache.org> wrote: > Repository: camel > Updated Branches: > refs/heads/master e8ca6615a -> f89e7682f > > > 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/f89e7682 > Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f89e7682 > Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f89e7682 > > Branch: refs/heads/master > Commit: f89e7682f0fada49a5fe2b7dd9f863d7684af6f1 > Parents: e8ca661 > Author: Andrea Cosentino <anco...@gmail.com> > Authored: Fri Nov 11 11:47:30 2016 +0100 > Committer: Andrea Cosentino <anco...@gmail.com> > Committed: Fri Nov 11 11:48:06 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/f89e7682/components/camel-ahc/pom.xml > ---------------------------------------------------------------------- > diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml > index c1d98da..1951187 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-version}</version> > + <version>${netty-ahc-version}</version> > </dependency> > > <!-- testing --> > > http://git-wip-us.apache.org/repos/asf/camel/blob/f89e7682/parent/pom.xml > ---------------------------------------------------------------------- > diff --git a/parent/pom.xml b/parent/pom.xml > index 6c1b231..2e53669 100644 > --- a/parent/pom.xml > +++ b/parent/pom.xml > @@ -448,6 +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> > <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/f89e7682/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 17b4b9e..50fc7ff 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 > 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> > -- Claus Ibsen ----------------- http://davsclaus.com @davsclaus Camel in Action 2: https://www.manning.com/ibsen2
