(camel-spring-boot) branch main updated: CAMEL-21465: Update camel-cassandraql-starter with org.apache.cassandra java-driver dependencies

[jamesnetherton]

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-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
     new d85a691af72 CAMEL-21465: Update camel-cassandraql-starter with 
org.apache.cassandra java-driver dependencies
d85a691af72 is described below

commit d85a691af72d686e610aecc01fa95e7f580149f7
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Thu Dec 5 10:05:41 2024 +0000

    CAMEL-21465: Update camel-cassandraql-starter with org.apache.cassandra 
java-driver dependencies
---
 components-starter/camel-cassandraql-starter/pom.xml   | 18 ++++++++++++------
 .../component/cassandra/MockLoadBalancingPolicy.java   |  7 ++-----
 .../resources/spring-boot-fix-dependencies.properties  |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/components-starter/camel-cassandraql-starter/pom.xml 
b/components-starter/camel-cassandraql-starter/pom.xml
index c2a410238dd..ac03be2479b 100644
--- a/components-starter/camel-cassandraql-starter/pom.xml
+++ b/components-starter/camel-cassandraql-starter/pom.xml
@@ -47,21 +47,27 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.github.stephenc.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <version>${jcip-annotations-version}</version>
+      <scope>test</scope>
+    </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.camel.springboot</groupId>
+      <artifactId>camel-core-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
       <version>${cassandra-driver-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-query-builder</artifactId>
       <version>${cassandra-driver-version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.springboot</groupId>
-      <artifactId>camel-core-starter</artifactId>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <profiles>
diff --git 
a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/MockLoadBalancingPolicy.java
 
b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/MockLoadBalancingPolicy.java
index 8a68c078946..15b28d678c0 100644
--- 
a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/MockLoadBalancingPolicy.java
+++ 
b/components-starter/camel-cassandraql-starter/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/tooling/camel-spring-boot-generator-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
 
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
index c1d0e28b8d7..68c749e1b70 100644
--- 
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
+++ 
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
@@ -25,7 +25,7 @@ global=org.apache.camel.springboot:camel-core-starter
 camel-core=org.apache.camel.springboot:camel-spring-boot
 camel-core-engine=org.apache.camel.springboot:camel-spring-boot
 
-camel-cassandraql=com.datastax.oss:java-driver-core:${cassandra-driver-version},com.datastax.oss:java-driver-query-builder:${cassandra-driver-version}
+camel-cassandraql=org.apache.cassandra:java-driver-core:${cassandra-driver-version},org.apache.cassandra:java-driver-query-builder:${cassandra-driver-version}
 
 
camel-github=org.eclipse.mylyn.github:org.eclipse.egit.github.core:${egit-github-core-version}
 camel-guava-eventbus=com.google.guava:guava:${guava-version}