diff --git a/batcher/api/pom.xml b/batcher/api/pom.xml
index 39469f21d..e8d3ca55f 100644
--- a/batcher/api/pom.xml
+++ b/batcher/api/pom.xml
@@ -43,7 +43,7 @@
       <artifactId>dsbulk-sampler</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
@@ -51,8 +51,8 @@
       <artifactId>reactive-streams</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
diff --git a/batcher/reactor/pom.xml b/batcher/reactor/pom.xml
index 3d47b09fd..1b71aeb2b 100644
--- a/batcher/reactor/pom.xml
+++ b/batcher/reactor/pom.xml
@@ -43,7 +43,7 @@
       <artifactId>dsbulk-batcher-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
diff --git a/bom/pom.xml b/bom/pom.xml
index 067b29034..2747984a0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -161,7 +161,7 @@
       </dependency>
       <!-- DataStax Java Driver BOM -->
       <dependency>
-        <groupId>com.datastax.oss</groupId>
+        <groupId>org.apache.cassandra</groupId>
         <artifactId>java-driver-core</artifactId>
         <version>${driver.version}</version>
         <exclusions>
@@ -177,7 +177,7 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>com.datastax.oss</groupId>
+        <groupId>org.apache.cassandra</groupId>
         <artifactId>java-driver-test-infra</artifactId>
         <version>${driver.version}</version>
         <exclusions>
@@ -189,7 +189,7 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>com.datastax.oss</groupId>
+        <groupId>org.apache.cassandra</groupId>
         <artifactId>java-driver-bom</artifactId>
         <version>${driver.version}</version>
         <type>pom</type>
@@ -382,6 +382,16 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.github.stephenc.jcip</groupId>
+        <artifactId>jcip-annotations</artifactId>
+        <version>${jcip.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-annotations</artifactId>
+        <version>${spotbugs.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
diff --git a/codecs/api/pom.xml b/codecs/api/pom.xml
index 52be5dda6..6bf3c28a4 100644
--- a/codecs/api/pom.xml
+++ b/codecs/api/pom.xml
@@ -39,12 +39,12 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>com.esri.geometry</groupId>
diff --git a/codecs/jdk/pom.xml b/codecs/jdk/pom.xml
index 04d0df993..e75e867ca 100644
--- a/codecs/jdk/pom.xml
+++ b/codecs/jdk/pom.xml
@@ -43,8 +43,8 @@
       <artifactId>dsbulk-codecs-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/codecs/text/pom.xml b/codecs/text/pom.xml
index c12eeb567..76260ebda 100644
--- a/codecs/text/pom.xml
+++ b/codecs/text/pom.xml
@@ -43,8 +43,8 @@
       <artifactId>dsbulk-codecs-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/codecs/text/src/test/java/com/datastax/oss/dsbulk/codecs/text/json/JsonNodeToVectorCodecTest.java b/codecs/text/src/test/java/com/datastax/oss/dsbulk/codecs/text/json/JsonNodeToVectorCodecTest.java
index 4913b6cac..8c9ec07b7 100644
--- a/codecs/text/src/test/java/com/datastax/oss/dsbulk/codecs/text/json/JsonNodeToVectorCodecTest.java
+++ b/codecs/text/src/test/java/com/datastax/oss/dsbulk/codecs/text/json/JsonNodeToVectorCodecTest.java
@@ -83,13 +83,10 @@ void should_not_convert_from_invalid_internal() {
     assertThat(dsbulkCodec).cannotConvertFromInternal("not a valid vector");
   }
 
-  // To keep usage consistent with VectorCodec we confirm that we support encoding when too many
-  // elements are
-  // available but not when too few are.  Note that it's actually VectorCodec that enforces this
-  // constraint so we
-  // have to go through encode() rather than the internal/external methods.
+  // VectorCodec throws IllegalArgumentExcpetion if we don't have exactly the expected number
+  // of elements in our vector
   @Test
-  void should_encode_too_many_but_not_too_few() {
+  void should_fail_to_encode_too_many_or_too_few() {
 
     ArrayList<Float> tooMany = Lists.newArrayList(values);
     tooMany.add(6.6f);
@@ -100,7 +97,8 @@ void should_encode_too_many_but_not_too_few() {
     CqlVector<Float> tooFewVector = CqlVector.newInstance(tooFew);
     JsonNode tooFewNode = dsbulkCodec.internalToExternal(tooFewVector);
 
-    assertThat(dsbulkCodec.encode(tooManyNode, ProtocolVersion.DEFAULT)).isNotNull();
+    assertThatThrownBy(() -> dsbulkCodec.encode(tooManyNode, ProtocolVersion.DEFAULT))
+        .isInstanceOf(IllegalArgumentException.class);
     assertThatThrownBy(() -> dsbulkCodec.encode(tooFewNode, ProtocolVersion.DEFAULT))
         .isInstanceOf(IllegalArgumentException.class);
   }
diff --git a/codecs/text/src/test/java/com/datastax/oss/dsbulk/codecs/text/string/StringToVectorCodecTest.java b/codecs/text/src/test/java/com/datastax/oss/dsbulk/codecs/text/string/StringToVectorCodecTest.java
index d13112c85..0418ec7b6 100644
--- a/codecs/text/src/test/java/com/datastax/oss/dsbulk/codecs/text/string/StringToVectorCodecTest.java
+++ b/codecs/text/src/test/java/com/datastax/oss/dsbulk/codecs/text/string/StringToVectorCodecTest.java
@@ -67,13 +67,10 @@ void should_not_convert_from_invalid_internal() {
     assertThat(dsbulkCodec).cannotConvertFromInternal("not a valid vector");
   }
 
-  // To keep usage consistent with VectorCodec we confirm that we support encoding when too many
-  // elements are
-  // available but not when too few are.  Note that it's actually VectorCodec that enforces this
-  // constraint so we
-  // have to go through encode() rather than the internal/external methods.
+  // VectorCodec throws IllegalArgumentExcpetion if we don't have exactly the expected number
+  // of elements in our vector
   @Test
-  void should_encode_too_many_but_not_too_few() {
+  void should_fail_to_encode_too_many_or_too_few() {
 
     ArrayList<Float> tooMany = Lists.newArrayList(values);
     tooMany.add(6.6f);
@@ -84,7 +81,8 @@ void should_encode_too_many_but_not_too_few() {
     CqlVector<Float> tooFewVector = CqlVector.newInstance(tooFew);
     String tooFewString = dsbulkCodec.internalToExternal(tooFewVector);
 
-    assertThat(dsbulkCodec.encode(tooManyString, ProtocolVersion.DEFAULT)).isNotNull();
+    assertThatThrownBy(() -> dsbulkCodec.encode(tooManyString, ProtocolVersion.DEFAULT))
+        .isInstanceOf(IllegalArgumentException.class);
     assertThatThrownBy(() -> dsbulkCodec.encode(tooFewString, ProtocolVersion.DEFAULT))
         .isInstanceOf(IllegalArgumentException.class);
   }
diff --git a/config/pom.xml b/config/pom.xml
index 3af5fcca0..d5eb61a8a 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -43,8 +43,8 @@
       <artifactId>config</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -56,7 +56,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/connectors/api/pom.xml b/connectors/api/pom.xml
index 52e6d714c..3ec0916b8 100644
--- a/connectors/api/pom.xml
+++ b/connectors/api/pom.xml
@@ -39,7 +39,7 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
@@ -47,8 +47,8 @@
       <artifactId>config</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.reactivestreams</groupId>
diff --git a/connectors/csv/pom.xml b/connectors/csv/pom.xml
index ed1d691d8..d32cac186 100644
--- a/connectors/csv/pom.xml
+++ b/connectors/csv/pom.xml
@@ -59,8 +59,8 @@
       <artifactId>config</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>com.univocity</groupId>
diff --git a/connectors/json/pom.xml b/connectors/json/pom.xml
index 64cc05235..dd8101201 100644
--- a/connectors/json/pom.xml
+++ b/connectors/json/pom.xml
@@ -59,8 +59,8 @@
       <artifactId>config</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 9edc028f8..128ee659f 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -40,7 +40,7 @@
   <dependencies>
     <!-- driver -->
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <!-- supported connectors -->
@@ -218,7 +218,7 @@
                     <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                       <resource>META-INF/io.netty.versions.properties</resource>
                     </transformer>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                   </transformers>
                 </configuration>
               </execution>
@@ -247,7 +247,7 @@
                   <doctitle>DataStax Bulk Loader ${project.version} API</doctitle>
                   <windowtitle>DataStax Bulk Loader ${project.version} API</windowtitle>
                   <links>
-                    <link>https://www.javadoc.io/doc/com.datastax.oss/java-driver-core/${driver.version}</link>
+                    <link>https://www.javadoc.io/doc/org.apache.cassandra/java-driver-core/${driver.version}</link>
                     <link>https://www.javadoc.io/doc/io.netty/netty-all/${netty.version}</link>
                     <link>https://www.javadoc.io/doc/com.typesafe/config/${config.version}</link>
                     <link>https://www.reactive-streams.org/reactive-streams-${reactive-streams.version}-javadoc/</link>
diff --git a/executor/api/pom.xml b/executor/api/pom.xml
index ad4bdd837..24c8e941e 100644
--- a/executor/api/pom.xml
+++ b/executor/api/pom.xml
@@ -43,7 +43,7 @@
       <artifactId>dsbulk-sampler</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
@@ -51,8 +51,8 @@
       <artifactId>reactive-streams</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jctools</groupId>
diff --git a/executor/reactor/pom.xml b/executor/reactor/pom.xml
index e9565f73f..f53f2ad19 100644
--- a/executor/reactor/pom.xml
+++ b/executor/reactor/pom.xml
@@ -43,7 +43,7 @@
       <artifactId>dsbulk-executor-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
diff --git a/format/pom.xml b/format/pom.xml
index a9988e5ff..82330225a 100644
--- a/format/pom.xml
+++ b/format/pom.xml
@@ -39,12 +39,12 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/io/pom.xml b/io/pom.xml
index c71ec405f..5ed304c2e 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -39,8 +39,8 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/manual/settings.md b/manual/settings.md
index 0e6807e23..6f1b2bfb2 100644
--- a/manual/settings.md
+++ b/manual/settings.md
@@ -1,4 +1,4 @@
-# DataStax Bulk Loader v1.11.0-SNAPSHOT Options
+# DataStax Bulk Loader v1.11.1-SNAPSHOT Options
 
 *NOTE:* The long options described here can be persisted in `conf/application.conf` and thus permanently override defaults and avoid specifying options on the command line.
 
diff --git a/mapping/pom.xml b/mapping/pom.xml
index 9d0d9af18..1bf9ec86a 100644
--- a/mapping/pom.xml
+++ b/mapping/pom.xml
@@ -51,8 +51,8 @@
       <artifactId>antlr4-runtime</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
diff --git a/partitioner/pom.xml b/partitioner/pom.xml
index 7cd8ad844..c9bfce885 100644
--- a/partitioner/pom.xml
+++ b/partitioner/pom.xml
@@ -39,12 +39,12 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>com.datastax.oss</groupId>
@@ -67,7 +67,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-test-infra</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index cb8a065c9..b5229eedc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,24 +59,24 @@
     make sure the resulting binary tarball contains only
     required jars, and that no jar has an offending license.
     -->
-    <driver.version>4.17.0</driver.version>
+    <driver.version>4.19.2</driver.version>
     <reactive-streams.version>1.0.3</reactive-streams.version>
     <reactor.version>2020.0.19</reactor.version>
     <config.version>1.4.2</config.version>
-    <netty.version>4.1.94.Final</netty.version>
+    <netty.version>4.1.119.Final</netty.version>
     <!-- Note: Caffeine 3 requires java 11 or higher -->
     <caffeine.version>2.9.3</caffeine.version>
     <jctools.version>3.3.0</jctools.version>
-    <slf4j.version>1.7.36</slf4j.version>
-    <logback.version>1.2.11</logback.version>
+    <slf4j.version>2.0.16</slf4j.version>
+    <logback.version>1.3.15</logback.version>
     <metrics.version>4.2.9</metrics.version>
     <lz4.version>1.8.0</lz4.version>
-    <snappy.version>1.1.7.3</snappy.version>
+    <snappy.version>1.1.10.8</snappy.version>
     <hdr.version>2.1.12</hdr.version>
-    <jackson.version>2.13.3</jackson.version>
+    <jackson.version>2.20.1</jackson.version>
     <univocity.version>2.9.1</univocity.version>
-    <commons-compress.version>1.21</commons-compress.version>
-    <compress.zstd.version>1.5.2-1</compress.zstd.version>
+    <commons-compress.version>1.28.0</commons-compress.version>
+    <compress.zstd.version>1.5.7-6</compress.zstd.version>
     <compress.xz.version>1.9</compress.xz.version>
     <compress.brotli.version>0.1.2</compress.brotli.version>
     <!-- ANTLR 4.10+ requires Java 11 -->
@@ -84,9 +84,9 @@
     <spotbugs.version>4.5.3</spotbugs.version>
     <esri.version>1.2.1</esri.version>
     <jackson-core-asl.version>1.9.13</jackson-core-asl.version>
-    <org-json.version>20220320</org-json.version>
+    <org-json.version>20250517</org-json.version>
     <jansi.version>1.18</jansi.version>
-    <aws.sdk.version>2.17.121</aws.sdk.version>
+    <aws.sdk.version>2.40.7</aws.sdk.version>
     <prometheus.client.version>0.15.0</prometheus.client.version>
     <!-- Test dependencies -->
     <junit.version>5.8.2</junit.version>
@@ -98,6 +98,8 @@
     <awaitility.version>4.2.0</awaitility.version>
     <commons-exec.version>1.3</commons-exec.version>
     <surefire.version>2.22.2</surefire.version>
+    <jcip.version>1.0-1</jcip.version>
+    <spotbugs.version>4.5.3</spotbugs.version>
     <max.simulacron.clusters>4</max.simulacron.clusters>
     <max.ccm.clusters>2</max.ccm.clusters>
   </properties>
@@ -191,7 +193,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-text</artifactId>
-        <version>1.9</version>
+        <version>1.15.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/runner/pom.xml b/runner/pom.xml
index bd7d48fb0..6f9232c88 100644
--- a/runner/pom.xml
+++ b/runner/pom.xml
@@ -55,7 +55,7 @@
       <artifactId>dsbulk-url</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
@@ -71,8 +71,8 @@
       <artifactId>snappy-java</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.fusesource.jansi</groupId>
@@ -82,6 +82,10 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
@@ -93,7 +97,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-test-infra</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/sampler/pom.xml b/sampler/pom.xml
index 7c78a6005..4945c47aa 100644
--- a/sampler/pom.xml
+++ b/sampler/pom.xml
@@ -39,7 +39,7 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
diff --git a/tests/pom.xml b/tests/pom.xml
index 7365bae81..b5e352517 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -51,12 +51,12 @@
       <artifactId>dsbulk-codecs-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe</groupId>
diff --git a/url/pom.xml b/url/pom.xml
index dc4aabbfd..d089b490f 100644
--- a/url/pom.xml
+++ b/url/pom.xml
@@ -39,8 +39,8 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/workflow/api/pom.xml b/workflow/api/pom.xml
index 4f2aa8abe..4bdedbbc7 100644
--- a/workflow/api/pom.xml
+++ b/workflow/api/pom.xml
@@ -39,7 +39,7 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
diff --git a/workflow/commons/pom.xml b/workflow/commons/pom.xml
index d86ab643b..08920afe0 100644
--- a/workflow/commons/pom.xml
+++ b/workflow/commons/pom.xml
@@ -83,7 +83,7 @@
       <artifactId>dsbulk-executor-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
@@ -127,8 +127,8 @@
       <artifactId>simpleclient_dropwizard</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
@@ -158,6 +158,10 @@
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.github.stephenc.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
diff --git a/workflow/count/pom.xml b/workflow/count/pom.xml
index d84ca8cd5..b8446455f 100644
--- a/workflow/count/pom.xml
+++ b/workflow/count/pom.xml
@@ -55,7 +55,7 @@
       <artifactId>dsbulk-executor-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
@@ -67,12 +67,16 @@
       <artifactId>reactor-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/workflow/load/pom.xml b/workflow/load/pom.xml
index 71bf191a6..8fcc4695b 100644
--- a/workflow/load/pom.xml
+++ b/workflow/load/pom.xml
@@ -59,7 +59,7 @@
       <artifactId>dsbulk-executor-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
@@ -71,12 +71,16 @@
       <artifactId>reactor-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/workflow/unload/pom.xml b/workflow/unload/pom.xml
index c29eb8637..0e6b0ba4b 100644
--- a/workflow/unload/pom.xml
+++ b/workflow/unload/pom.xml
@@ -55,7 +55,7 @@
       <artifactId>dsbulk-executor-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
     <dependency>
@@ -67,12 +67,16 @@
       <artifactId>reactor-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>java-driver-guava-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+    </dependency>
   </dependencies>
 </project>