This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new c8951b46612 CAMEL-21465: Upgrade Cassandra java-driver dependencies to
4.18.1
c8951b46612 is described below
commit c8951b46612503d84903e613c29e3e69355b37d1
Author: James Netherton <[email protected]>
AuthorDate: Thu Dec 5 09:53:56 2024 +0000
CAMEL-21465: Upgrade Cassandra java-driver dependencies to 4.18.1
---
components/camel-cassandraql/pom.xml | 12 ++++++++++--
.../camel/component/cassandra/MockLoadBalancingPolicy.java | 7 ++-----
parent/pom.xml | 3 ++-
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/components/camel-cassandraql/pom.xml
b/components/camel-cassandraql/pom.xml
index c77562ec972..66cb8402814 100644
--- a/components/camel-cassandraql/pom.xml
+++ b/components/camel-cassandraql/pom.xml
@@ -49,7 +49,7 @@
<!-- cassandra -->
<dependency>
- <groupId>com.datastax.oss</groupId>
+ <groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-core</artifactId>
<version>${cassandra-driver-version}</version>
<exclusions>
@@ -60,7 +60,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.datastax.oss</groupId>
+ <groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-query-builder</artifactId>
<version>${cassandra-driver-version}</version>
</dependency>
@@ -78,6 +78,14 @@
<scope>test</scope>
</dependency>
+ <!-- Provided scope in java-driver-core but required due to compiler
annotation processing throwing CNFE -->
+ <dependency>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>${jcip-annotations-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- test infra -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git
a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/MockLoadBalancingPolicy.java
b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/MockLoadBalancingPolicy.java
index 8a68c078946..0bcd8c2e74f 100644
---
a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/MockLoadBalancingPolicy.java
+++
b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/MockLoadBalancingPolicy.java
@@ -23,20 +23,17 @@ import com.datastax.oss.driver.api.core.metadata.Node;
import com.datastax.oss.driver.api.core.session.Request;
import com.datastax.oss.driver.api.core.session.Session;
import
com.datastax.oss.driver.internal.core.loadbalancing.DefaultLoadBalancingPolicy;
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
public class MockLoadBalancingPolicy extends DefaultLoadBalancingPolicy {
public static boolean used;
- public MockLoadBalancingPolicy(@NonNull DriverContext context, @NonNull
String profileName) {
+ public MockLoadBalancingPolicy(DriverContext context, String profileName) {
super(context, profileName);
}
- @NonNull
@Override
- public Queue<Node> newQueryPlan(@Nullable Request request, @Nullable
Session session) {
+ public Queue<Node> newQueryPlan(Request request, Session session) {
MockLoadBalancingPolicy.used = true;
return super.newQueryPlan(request, session);
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 56e29857d6a..a937b3a72c0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -92,7 +92,7 @@
<californium-scandium-version>3.11.0</californium-scandium-version>
<camunda-version>7.22.0</camunda-version>
<camel-k-version>2.5.0</camel-k-version>
- <cassandra-driver-version>4.17.0</cassandra-driver-version>
+ <cassandra-driver-version>4.18.1</cassandra-driver-version>
<jta-api-1.2-version>1.2</jta-api-1.2-version>
<cglib-version>3.3.0</cglib-version>
<chicocy-version>0.0.12</chicocy-version>
@@ -271,6 +271,7 @@
<jboss-transaction-spi-version>7.6.1.Final</jboss-transaction-spi-version>
<jboss-xnio-version>3.8.14.Final</jboss-xnio-version>
<jcache-version>1.1.1</jcache-version>
+ <jcip-annotations-version>1.0-1</jcip-annotations-version>
<jcr-version>2.0</jcr-version>
<jedis-client-version>5.2.0</jedis-client-version>
<jetcd-version>0.8.4</jetcd-version>
