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-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new d2a74fa Cassandraql: Upgrade datastax driver to 4.7.2 (from 3.7.2)
d2a74fa is described below
commit d2a74fa8e6a013918cac7ee1b47027a558e9b0f6
Author: JiriOndrusek <[email protected]>
AuthorDate: Thu Jul 23 11:05:10 2020 +0200
Cassandraql: Upgrade datastax driver to 4.7.2 (from 3.7.2)
---
platforms/karaf/features/src/main/resources/features.xml | 14 +++++++++-----
pom.xml | 6 +++++-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index b141b43..45e7a79 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -672,7 +672,7 @@
</feature>
<feature name='camel-cassandraql' version='${project.version}'
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:com.datastax.oss/java-driver-shaded-guava/${cassandra-shaded-guava}</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>
@@ -684,10 +684,14 @@
<!-- need older metrics version -->
<bundle
dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${cassandra-metrics-version}</bundle>
<bundle
dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${cassandra-metrics-version}</bundle>
- <bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
- <bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
- <bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
- <bundle
dependency='true'>mvn:com.datastax.cassandra/cassandra-driver-core/${cassandra-driver-version}</bundle>
+ <bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${cassandra-jackson2-version}</bundle>
+ <bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${cassandra-jackson2-version}</bundle>
+ <bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${cassandra-jackson2-version}</bundle>
+ <bundle
dependency='true'>mvn:com.datastax.oss/java-driver-core/${cassandra-driver-version}</bundle>
+ <bundle
dependency='true'>mvn:com.datastax.oss/java-driver-query-builder/${cassandra-driver-version}</bundle>
+ <bundle
dependency='true'>mvn:com.typesafe/config/${typesafe-config}</bundle>
+ <bundle
dependency='true'>mvn:org.hdrhistogram/HdrHistogram/${hdrhistrogram-version}</bundle>
+ <bundle
dependency='true'>mvn:com.datastax.oss/native-protocol/${datastax-native-protocol}</bundle>
<bundle>mvn:org.apache.camel/camel-cassandraql/${project.version}</bundle>
</feature>
<feature name='camel-cbor' version='${project.version}' start-level='50'>
diff --git a/pom.xml b/pom.xml
index 2944b9a..5bfe21d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,11 +131,14 @@
<bndlib-version>2.4.0</bndlib-version>
<build-helper-maven-plugin-version>1.12</build-helper-maven-plugin-version>
<c3p0-bundle-version>0.9.5.5_1</c3p0-bundle-version>
- <cassandra-metrics-version>3.2.6</cassandra-metrics-version>
+ <cassandra-jackson2-version>2.11.1</cassandra-jackson2-version>
+ <cassandra-metrics-version>4.0.5</cassandra-metrics-version>
+ <cassandra-shaded-guava>25.1-jre-graal-sub-1</cassandra-shaded-guava>
<chunk-templates-bundle-version>3.5.0_1</chunk-templates-bundle-version>
<cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
<commons-httpclient-bundle-version>3.1_7</commons-httpclient-bundle-version>
<consul-client-bundle-version>1.3.3_1</consul-client-bundle-version>
+ <datastax-native-protocol>1.4.10</datastax-native-protocol>
<digitalocean-api-client-bundle-version>2.17_1</digitalocean-api-client-bundle-version>
<digitalpetri-fsm-client>0.2</digitalpetri-fsm-client>
<digitalpetri-netty-client>0.3</digitalpetri-netty-client>
@@ -252,6 +255,7 @@
<testcontainers-version>1.13.0</testcontainers-version>
<threetenbp-version>1.4.0</threetenbp-version>
<tinybundles-version>2.1.1</tinybundles-version>
+ <typesafe-config>1.3.4</typesafe-config>
<twitter4j-bundle-version>4.0.7_1</twitter4j-bundle-version>
<unix-socket-factory-version>2015-01-27T15-02-14</unix-socket-factory-version>
<unix-socket-factory-bundle-version>1.0.0</unix-socket-factory-bundle-version>
