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 07:15:21 UTC
[1/2] camel git commit: changed camel-version to 4.1.1.Final,
maven-resource-plugin upgrade, features.xml solved
Repository: camel
Updated Branches:
refs/heads/master 540daa010 -> eab2b1cda
changed camel-version to 4.1.1.Final, maven-resource-plugin upgrade, features.xml solved
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eab2b1cd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eab2b1cd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eab2b1cd
Branch: refs/heads/master
Commit: eab2b1cdac1ec24e87955b8316f7baa19cab8c7f
Parents: 559cca8
Author: Arno Noordover <an...@users.noreply.github.com>
Authored: Thu Jun 9 22:31:13 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Jun 10 09:14:24 2016 +0200
----------------------------------------------------------------------
components/camel-netty4/pom.xml | 2 +-
parent/pom.xml | 4 ++--
.../karaf/features/src/main/resources/features.xml | 12 +++++++++---
3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/eab2b1cd/components/camel-netty4/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index 11ccf72..c9ff493 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>${netty41-version}</version>
+ <version>${netty-version}</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/eab2b1cd/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 68fa304..bb13d24 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -398,7 +398,7 @@
<maven-jboss-as-maven-plugin-version>7.7.Final</maven-jboss-as-maven-plugin-version>
<maven-remote-resources-plugin-version>1.4</maven-remote-resources-plugin-version>
<!-- resources plugin needed by Camel maven archetypes -->
- <maven-resources-plugin-version>2.7</maven-resources-plugin-version>
+ <maven-resources-plugin-version>3.0.1</maven-resources-plugin-version>
<maven-reporting-api-version>2.2.1</maven-reporting-api-version>
<maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
<maven-scr-plugin-version>1.19.0</maven-scr-plugin-version>
@@ -424,7 +424,7 @@
<mybatis-version>3.4.0</mybatis-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
<netty3-version>3.10.5.Final</netty3-version>
- <netty-version>4.0.37.Final</netty-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 -->
http://git-wip-us.apache.org/repos/asf/camel/blob/eab2b1cd/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 6cfedbc..68a74a8 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -95,10 +95,12 @@
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-client-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.apache.qpid/proton-j/${qpid-proton-j-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-transport/${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>mvn:org.apache.camel/camel-amqp/${project.version}</bundle>
</feature>
@@ -253,6 +255,7 @@
<feature name='camel-cassandraql' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:com.google.guava/guava/${cassandra-driver-guava-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-resolver/${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-buffer/${netty-version}</bundle>
@@ -1184,12 +1187,13 @@
</feature>
<feature name='camel-netty4' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
+ <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-transport/${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-codec/${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:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle>mvn:org.apache.camel/camel-netty4/${project.version}</bundle>
</feature>
@@ -1280,6 +1284,7 @@
<bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
<bundle>mvn:org.apache.camel/camel-pgevent/${project.version}</bundle>
</feature>
@@ -1762,6 +1767,7 @@
<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:io.netty/netty-resolver/${netty-version}</bundle>
<bundle dependency='true'>mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle>
<bundle dependency='true'>mvn:com.eclipsesource.minimal-json/minimal-json/${minimal-json-version}</bundle>
<bundle dependency='true'>wrap:mvn:io.vertx/vertx-core/${vertx-version}</bundle>
[2/2] camel git commit: CAMEL-10002: migrate to netty 4.1.0.Final
Posted by ac...@apache.org.
CAMEL-10002: migrate to netty 4.1.0.Final
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/559cca80
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/559cca80
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/559cca80
Branch: refs/heads/master
Commit: 559cca80db9451680327a1827cdc1c676633c65a
Parents: 540daa0
Author: Arno Noordover <an...@users.noreply.github.com>
Authored: Wed Jun 8 13:53:56 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Jun 10 09:14:24 2016 +0200
----------------------------------------------------------------------
components/camel-netty4/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/559cca80/components/camel-netty4/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index c9ff493..11ccf72 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>${netty-version}</version>
+ <version>${netty41-version}</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>