You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/11/11 12:00:35 UTC
[2/2] camel git commit: CAMEL-10465 - camel ahc uses netty 4.0.41
transitively but 4.1.5 explicitly - leads to runtime exceptions. Renamed
property.
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/a5666f24
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a5666f24
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a5666f24
Branch: refs/heads/camel-2.18.x
Commit: a5666f245db242c71565858d89ae0c6f979bfb21
Parents: 325729b
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Nov 11 12:12:33 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Nov 11 12:51:50 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/a5666f24/components/camel-ahc/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index 350af2c..1d10a7e 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-ahc-version}</version>
+ <version>${netty40-version}</version>
</dependency>
<!-- testing -->
http://git-wip-us.apache.org/repos/asf/camel/blob/a5666f24/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b700903..0b0b559 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -446,7 +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>
+ <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/a5666f24/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 a8542fe..f8a5b9e 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>mvn:org.apache.camel/camel-ahc/${project.version}</bundle>
</feature>
<feature name='camel-ahc-ws' version='${project.version}' resolver='(obr)' start-level='50'>