Repository: camel Updated Branches: refs/heads/master 43bdad7da -> 6845fd8cf
Upgrade Datastax Cassandra driver to version 2.1.6 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6845fd8c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6845fd8c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6845fd8c Branch: refs/heads/master Commit: 6845fd8cfb444516220c451be735f9c38d552c4f Parents: 43bdad7 Author: Andrea Cosentino <[email protected]> Authored: Tue Jun 2 11:14:25 2015 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Tue Jun 2 11:15:04 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 2 +- platforms/karaf/features/src/main/resources/features.xml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6845fd8c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index ea2dd1a..0ad496c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -78,7 +78,7 @@ <build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version> <c3p0-version>0.9.1.2</c3p0-version> <camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId> - <cassandra-driver-version>2.1.5</cassandra-driver-version> + <cassandra-driver-version>2.1.6</cassandra-driver-version> <cassandra-driver-guava-version>16.0.1</cassandra-driver-guava-version> <cassandra-version>2.1.5</cassandra-version> <cassandra-unit-version>2.1.3.1</cassandra-unit-version> http://git-wip-us.apache.org/repos/asf/camel/blob/6845fd8c/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 1e26ccf..23955a2 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -223,7 +223,12 @@ <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/${netty3-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> + <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-codec/${netty-version}</bundle> <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${metrics-version}</bundle> <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${metrics-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
