From dac3daf3dcaf4a61d1f4c08b63f1061f5895c578 Mon Sep 17 00:00:00 2001
From: Oleksandr Porunov <alexandr.porunov@gmail.com>
Date: Thu, 6 Nov 2025 11:39:08 +0000
Subject: [PATCH] Transition DataStax Java Driver to Cassandra Java Driver

Signed-off-by: Oleksandr Porunov <alexandr.porunov@gmail.com>
---
 janusgraph-benchmark/pom.xml | 4 ++--
 janusgraph-cql/pom.xml       | 4 ++--
 janusgraph-scylla/pom.xml    | 8 ++++----
 pom.xml                      | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/janusgraph-benchmark/pom.xml b/janusgraph-benchmark/pom.xml
index ddb6bb6b12..6feab43fda 100644
--- a/janusgraph-benchmark/pom.xml
+++ b/janusgraph-benchmark/pom.xml
@@ -61,12 +61,12 @@
 
         <!-- needed by Cassandra ccm -->
         <dependency>
-            <groupId>com.datastax.oss</groupId>
+            <groupId>org.apache.cassandra</groupId>
             <artifactId>java-driver-test-infra</artifactId>
             <version>${cassandra-driver.version}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>com.datastax.oss</groupId>
+                    <groupId>org.apache.cassandra</groupId>
                     <artifactId>java-driver-core</artifactId>
                 </exclusion>
             </exclusions>
diff --git a/janusgraph-cql/pom.xml b/janusgraph-cql/pom.xml
index f94ca9e05d..810891194b 100644
--- a/janusgraph-cql/pom.xml
+++ b/janusgraph-cql/pom.xml
@@ -74,7 +74,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.datastax.oss</groupId>
+            <groupId>org.apache.cassandra</groupId>
             <artifactId>java-driver-core</artifactId>
             <version>${cassandra-driver.version}</version>
             <exclusions>
@@ -105,7 +105,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>
             <exclusions>
diff --git a/janusgraph-scylla/pom.xml b/janusgraph-scylla/pom.xml
index 1151c8ba3e..4955589563 100644
--- a/janusgraph-scylla/pom.xml
+++ b/janusgraph-scylla/pom.xml
@@ -57,11 +57,11 @@
             <version>${project.version}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>com.datastax.oss</groupId>
+                    <groupId>org.apache.cassandra</groupId>
                     <artifactId>java-driver-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.datastax.oss</groupId>
+                    <groupId>org.apache.cassandra</groupId>
                     <artifactId>java-driver-query-builder</artifactId>
                 </exclusion>
             </exclusions>
@@ -156,11 +156,11 @@
             <type>test-jar</type>
             <exclusions>
                 <exclusion>
-                    <groupId>com.datastax.oss</groupId>
+                    <groupId>org.apache.cassandra</groupId>
                     <artifactId>java-driver-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.datastax.oss</groupId>
+                    <groupId>org.apache.cassandra</groupId>
                     <artifactId>java-driver-query-builder</artifactId>
                 </exclusion>
             </exclusions>
diff --git a/pom.xml b/pom.xml
index f27593176b..ff378b377b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,8 +98,8 @@
         <!-- https://downloads.apache.org/cassandra/4.0.6/apache-cassandra-4.0.6-bin.tar.gz.sha256 -->
         <cassandra-dist.version>4.0.6</cassandra-dist.version>
         <cassandra-dist.version.sha256>86d14a8e158e4e8554388b1aab598efcb879ddb09c480edecabb3c350b58fe6b</cassandra-dist.version.sha256>
-        <cassandra-driver.version>4.17.0</cassandra-driver.version>
-        <scylla-driver.version>4.18.0.1</scylla-driver.version>
+        <cassandra-driver.version>4.19.1</cassandra-driver.version>
+        <scylla-driver.version>4.19.0.1</scylla-driver.version>
         <scylladb.version>6.2.0</scylladb.version>
         <testcontainers.version>1.20.1</testcontainers.version>
         <easymock.version>5.4.0</easymock.version>