[camel] branch master updated: Since Async http client is based on Netty 4.1.x since 2.1.x, we can use that version and get rid of Netty 4.0.x

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new eb24e27  Since Async http client is based on Netty 4.1.x since 2.1.x, 
we can use that version and get rid of Netty 4.0.x
eb24e27 is described below

commit eb24e271f3e689d82687031f0e3be8d4f8b2ed1b
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Feb 8 15:56:10 2018 +0100

    Since Async http client is based on Netty 4.1.x since 2.1.x, we can use 
that version and get rid of Netty 4.0.x
---
 components/camel-ahc/pom.xml                             | 2 +-
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index a4f62fe..ccc9488 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>
-      <version>${netty40-version}</version>
+      <version>${netty-version}</version>
     </dependency>
 
     <!-- testing -->
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index d8330e3..bfb8630 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -86,7 +86,7 @@
     <bundle 
dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty-version}</bundle>
     <bundle 
dependency='true'>mvn:io.netty/netty-transport-native-unix-common/${netty-version}</bundle>
     <bundle 
dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-codec-http/${netty40-version}</bundle>
+    <bundle 
dependency='true'>mvn:io.netty/netty-codec-http/${netty-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>

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.