This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git
The following commit(s) were added to refs/heads/main by this push:
new 1b1b7ed8 Bump cassandra.driver.version from 4.9.0 to 4.17.0 (#377)
1b1b7ed8 is described below
commit 1b1b7ed853182dbcd4ea6c1f69ace3dcfaa7ada4
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Feb 10 20:32:04 2025 +0100
Bump cassandra.driver.version from 4.9.0 to 4.17.0 (#377)
---
appender/cassandra/pom.xml | 6 ++++++
.../appender/cassandra/CassandraAppender.java | 2 --
.../appender/cassandra/CassandraAppenderTest.java | 2 --
assembly/src/main/feature/feature.xml | 19 ++++++++-----------
pom.xml | 2 +-
5 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/appender/cassandra/pom.xml b/appender/cassandra/pom.xml
index 1834181b..1d9096a1 100644
--- a/appender/cassandra/pom.xml
+++ b/appender/cassandra/pom.xml
@@ -158,6 +158,12 @@
<version>5.16.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <version>5.16.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
diff --git
a/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
b/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
index 5860bf66..a06fd445 100644
---
a/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
+++
b/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
@@ -120,8 +120,6 @@ public class CassandraAppender implements EventHandler {
.withBoolean(DefaultDriverOption.RECONNECT_ON_INIT,
true)
.withString(DefaultDriverOption.LOAD_BALANCING_POLICY,
"")
.withString(DefaultDriverOption.LOAD_BALANCING_POLICY_CLASS,
"DefaultLoadBalancingPolicy")
- .withString(DefaultDriverOption.RETRY_POLICY, "")
- .withString(DefaultDriverOption.RETRY_POLICY_CLASS,
"DefaultRetryPolicy")
.withString(DefaultDriverOption.SPECULATIVE_EXECUTION_POLICY, "")
.withString(DefaultDriverOption.SPECULATIVE_EXECUTION_POLICY_CLASS,
"NoSpeculativeExecutionPolicy")
.withString(DefaultDriverOption.ADDRESS_TRANSLATOR_CLASS,
"PassThroughAddressTranslator")
diff --git
a/appender/cassandra/src/test/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppenderTest.java
b/appender/cassandra/src/test/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppenderTest.java
index f279f8f1..68aa3352 100644
---
a/appender/cassandra/src/test/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppenderTest.java
+++
b/appender/cassandra/src/test/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppenderTest.java
@@ -196,8 +196,6 @@ public class CassandraAppenderTest {
.withBoolean(DefaultDriverOption.RECONNECT_ON_INIT,
true)
.withString(DefaultDriverOption.LOAD_BALANCING_POLICY,
"")
.withString(DefaultDriverOption.LOAD_BALANCING_POLICY_CLASS,
"DefaultLoadBalancingPolicy")
- .withString(DefaultDriverOption.RETRY_POLICY, "")
- .withString(DefaultDriverOption.RETRY_POLICY_CLASS,
"DefaultRetryPolicy")
.withString(DefaultDriverOption.SPECULATIVE_EXECUTION_POLICY, "")
.withString(DefaultDriverOption.SPECULATIVE_EXECUTION_POLICY_CLASS,
"NoSpeculativeExecutionPolicy")
.withString(DefaultDriverOption.ADDRESS_TRANSLATOR_CLASS,
"PassThroughAddressTranslator")
diff --git a/assembly/src/main/feature/feature.xml
b/assembly/src/main/feature/feature.xml
index dfe1aa5b..8cd46287 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -354,7 +354,7 @@
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>
+ <feature>jackson</feature>
<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>
@@ -362,16 +362,13 @@
org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<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>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.9.8</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.8</bundle>
- <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.10</bundle>
- <bundle dependency="true">mvn:com.typesafe/config/1.3.3</bundle>
+ <bundle
dependency='true'>mvn:io.dropwizard.metrics/metrics-core/4.2.30</bundle>
+ <bundle
dependency="true">mvn:io.dropwizard.metrics/metrics-json/4.2.30</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.datastax.oss/native-protocol/1.5.1</bundle>
+ <bundle
dependency="true">mvn:com.datastax.oss/java-driver-shaded-guava/25.1-jre-graal-sub-1</bundle>
+ <bundle dependency="true">mvn:com.typesafe/config/1.4.1</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>
</feature>
diff --git a/pom.xml b/pom.xml
index 654231db..fcb5381b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<baseline.skip>true</baseline.skip>
<activemq.version>5.18.6</activemq.version>
<camel.version>3.22.3</camel.version>
- <cassandra.driver.version>4.9.0</cassandra.driver.version>
+ <cassandra.driver.version>4.17.0</cassandra.driver.version>
<glassfish-json.version>1.1.4</glassfish-json.version>
<json-api.version>1.1.4</json-api.version>
<kafka.version>3.3.2</kafka.version>
