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/06/10 08:10:16 UTC
camel git commit: removed netty41-version placeholder
Repository: camel
Updated Branches:
refs/heads/master eab2b1cda -> e59d3d7b2
removed netty41-version placeholder
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e59d3d7b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e59d3d7b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e59d3d7b
Branch: refs/heads/master
Commit: e59d3d7b22e480336f64b3e9827e131182754bf6
Parents: eab2b1c
Author: Arno Noordover <an...@users.noreply.github.com>
Authored: Fri Jun 10 09:40:30 2016 +0200
Committer: Arno Noordover <an...@users.noreply.github.com>
Committed: Fri Jun 10 09:40:30 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 -
.../karaf/features/src/main/resources/features.xml | 14 +++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e59d3d7b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bb13d24..a8da831 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -425,7 +425,6 @@
<neethi-bundle-version>3.0.1</neethi-bundle-version>
<netty3-version>3.10.5.Final</netty3-version>
<netty-version>4.1.1.Final</netty-version>
- <netty41-version>4.1.1.Final</netty41-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/e59d3d7b/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 68a74a8..7ed8366 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -446,13 +446,13 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-afterburner/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-common/${netty41-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty41-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-resolver/${netty41-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-transport/${netty41-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-handler/${netty41-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-codec/${netty41-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty41-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-resolver/${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-codec/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
<bundle dependency='true'>mvn:org.mousio/etcd4j/${etcd4j-version}</bundle>
<bundle>mvn:org.apache.camel/camel-etcd/${project.version}</bundle>
</feature>