This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git
The following commit(s) were added to refs/heads/master by this push:
new 049c457 [KARAF-6749] Upgrade to cassandra java driver 4.6.1
new ab4fdb7 Merge pull request #175 from jbonofre/KARAF-6749
049c457 is described below
commit 049c457008bed9919336e58a521bf4c331fa102f
Author: jbonofre <[email protected]>
AuthorDate: Tue Jun 9 14:03:02 2020 +0200
[KARAF-6749] Upgrade to cassandra java driver 4.6.1
---
appender/cassandra/pom.xml | 2 +-
assembly/src/main/feature/feature.xml | 16 ++++++++--------
pom.xml | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/appender/cassandra/pom.xml b/appender/cassandra/pom.xml
index d4127c9..45e1d2c 100644
--- a/appender/cassandra/pom.xml
+++ b/appender/cassandra/pom.xml
@@ -146,7 +146,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
- <version>4.1.34.Final</version>
+ <version>4.1.45.Final</version>
<scope>test</scope>
</dependency>
diff --git a/assembly/src/main/feature/feature.xml
b/assembly/src/main/feature/feature.xml
index 7e0baf0..b385102 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -339,13 +339,13 @@
org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-appender-cassandra-core"
version="${project.version}" description="Karaf Decanter Cassandra Appender
core">
<feature>decanter-common</feature>
<bundle dependency="true">mvn:com.google.guava/guava/25.1-jre</bundle>
- <bundle
dependency="true">mvn:io.netty/netty-handler/4.1.34.Final</bundle>
- <bundle
dependency="true">mvn:io.netty/netty-transport-native-epoll/4.1.34.Final</bundle>
- <bundle
dependency="true">mvn:io.netty/netty-buffer/4.1.34.Final</bundle>
- <bundle
dependency="true">mvn:io.netty/netty-common/4.1.34.Final</bundle>
- <bundle
dependency="true">mvn:io.netty/netty-transport/4.1.34.Final</bundle>
- <bundle
dependency="true">mvn:io.netty/netty-codec/4.1.34.Final</bundle>
- <bundle
dependency="true">mvn:io.netty/netty-resolver/4.1.34.Final</bundle>
+ <bundle
dependency="true">mvn:io.netty/netty-handler/4.1.45.Final</bundle>
+ <bundle
dependency="true">mvn:io.netty/netty-transport-native-epoll/4.1.45.Final</bundle>
+ <bundle
dependency="true">mvn:io.netty/netty-buffer/4.1.45.Final</bundle>
+ <bundle
dependency="true">mvn:io.netty/netty-common/4.1.45.Final</bundle>
+ <bundle
dependency="true">mvn:io.netty/netty-transport/4.1.45.Final</bundle>
+ <bundle
dependency="true">mvn:io.netty/netty-codec/4.1.45.Final</bundle>
+ <bundle
dependency="true">mvn:io.netty/netty-resolver/4.1.45.Final</bundle>
<bundle
dependency="true">mvn:io.dropwizard.metrics/metrics-core/4.0.5</bundle>
<bundle
dependency="true">mvn:io.dropwizard.metrics/metrics-json/4.0.5</bundle>
<bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.9.8</bundle>
@@ -354,7 +354,7 @@
org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<bundle
dependency="true">mvn:com.datastax.oss/java-driver-core-shaded/${cassandra.driver.version}</bundle>
<bundle
dependency="true">mvn:com.datastax.oss/java-driver-query-builder/${cassandra.driver.version}</bundle>
<bundle
dependency="true">mvn:com.datastax.oss/java-driver-shaded-guava/25.1-jre</bundle>
- <bundle
dependency="true">mvn:com.datastax.oss/native-protocol/1.4.5</bundle>
+ <bundle
dependency="true">mvn:com.datastax.oss/native-protocol/1.4.10</bundle>
<bundle dependency="true">mvn:com.typesafe/config/1.3.3</bundle>
<bundle
dependency="true">mvn:org.hdrhistogram/HdrHistogram/2.1.11</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.cassandra/${project.version}</bundle>
diff --git a/pom.xml b/pom.xml
index 0e2088c..daea2e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<baseline.skip>true</baseline.skip>
<activemq.version>5.15.12</activemq.version>
<camel.version>2.25.0</camel.version>
- <cassandra.driver.version>4.1.0</cassandra.driver.version>
+ <cassandra.driver.version>4.6.1</cassandra.driver.version>
<glassfish-json.version>1.1.4</glassfish-json.version>
<json-api.version>1.1.4</json-api.version>
<kafka.version>2.4.1</kafka.version>
