From 9d6d5bd1cb492fa82d5af91986e46e9bd95dbf02 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Thu, 11 Dec 2025 17:55:32 -0600 Subject: [PATCH 1/8] Bump logback/slf4j version to the same version we're moving to with the Java driver. See https://github.com/apache/cassandra-java-driver/pull/2051 for additional detail. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cb8a065c9..b5efacd14 100644 --- a/pom.xml +++ b/pom.xml @@ -67,8 +67,8 @@ 2.9.3 3.3.0 - 1.7.36 - 1.2.11 + 2.0.16 + 1.3.15 4.2.9 1.8.0 1.1.7.3 From 12b557892ed4d50badaaf2f3045d5b6a40cf5809 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Thu, 11 Dec 2025 17:58:02 -0600 Subject: [PATCH 2/8] Bumping snappy-java to most recent version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b5efacd14..99f0b4f6a 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 1.3.15 4.2.9 1.8.0 - 1.1.7.3 + 1.1.10.8 2.1.12 2.13.3 2.9.1 From 666d351843651e755e873f07ca2f61a9d707d742 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Thu, 11 Dec 2025 18:02:59 -0600 Subject: [PATCH 3/8] Bump commons-compress and commons-text dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 99f0b4f6a..811048e2d 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 2.1.12 2.13.3 2.9.1 - 1.21 + 1.28 1.5.2-1 1.9 0.1.2 @@ -191,7 +191,7 @@ org.apache.commons commons-text - 1.9 + 1.15 From fc6e3d76d372c5d49146abcc67b8e462ac6a8275 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Thu, 11 Dec 2025 18:14:44 -0600 Subject: [PATCH 4/8] Unit tests are all passig now. Still need to add the s3 + Java driver update --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 811048e2d..43b496dcd 100644 --- a/pom.xml +++ b/pom.xml @@ -75,8 +75,8 @@ 2.1.12 2.13.3 2.9.1 - 1.28 - 1.5.2-1 + 1.28.0 + 1.5.7-6 1.9 0.1.2 @@ -191,7 +191,7 @@ org.apache.commons commons-text - 1.15 + 1.15.0 From 16a11a275657d31afc552a07bea56a547976f9f6 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Thu, 11 Dec 2025 18:20:21 -0600 Subject: [PATCH 5/8] Update AWS SDK JAR to latest --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 43b496dcd..beaacaba2 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 1.9.13 20220320 1.18 - 2.17.121 + 2.40.7 0.15.0 5.8.2 From 10e38c592bd5953f63467a9fb6a993fd1963caba Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Thu, 11 Dec 2025 23:08:38 -0600 Subject: [PATCH 6/8] Update to Java driver 4.19.2 --- batcher/api/pom.xml | 6 +++--- batcher/reactor/pom.xml | 2 +- bom/pom.xml | 16 +++++++++++++--- codecs/api/pom.xml | 6 +++--- codecs/jdk/pom.xml | 4 ++-- codecs/text/pom.xml | 4 ++-- .../text/json/JsonNodeToVectorCodecTest.java | 12 +++++------- .../text/string/StringToVectorCodecTest.java | 12 +++++------- config/pom.xml | 6 +++--- connectors/api/pom.xml | 6 +++--- connectors/csv/pom.xml | 4 ++-- connectors/json/pom.xml | 4 ++-- distribution/pom.xml | 6 +++--- executor/api/pom.xml | 6 +++--- executor/reactor/pom.xml | 2 +- format/pom.xml | 6 +++--- io/pom.xml | 4 ++-- manual/settings.md | 2 +- mapping/pom.xml | 4 ++-- partitioner/pom.xml | 8 ++++---- pom.xml | 4 +++- runner/pom.xml | 12 ++++++++---- sampler/pom.xml | 2 +- tests/pom.xml | 6 +++--- url/pom.xml | 4 ++-- workflow/api/pom.xml | 2 +- workflow/commons/pom.xml | 10 +++++++--- workflow/count/pom.xml | 10 +++++++--- workflow/load/pom.xml | 10 +++++++--- workflow/unload/pom.xml | 10 +++++++--- 30 files changed, 109 insertions(+), 81 deletions(-) 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 @@ dsbulk-sampler - com.datastax.oss + org.apache.cassandra java-driver-core @@ -51,8 +51,8 @@ reactive-streams - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded io.netty 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 @@ dsbulk-batcher-api - com.datastax.oss + org.apache.cassandra java-driver-core 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 @@ - com.datastax.oss + org.apache.cassandra java-driver-core ${driver.version} @@ -177,7 +177,7 @@ - com.datastax.oss + org.apache.cassandra java-driver-test-infra ${driver.version} @@ -189,7 +189,7 @@ - com.datastax.oss + org.apache.cassandra java-driver-bom ${driver.version} pom @@ -382,6 +382,16 @@ pom import + + com.github.stephenc.jcip + jcip-annotations + ${jcip.version} + + + com.github.spotbugs + spotbugs-annotations + ${spotbugs.version} + 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 @@ - com.datastax.oss + org.apache.cassandra java-driver-core - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded com.esri.geometry 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 @@ dsbulk-codecs-api - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.slf4j 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 @@ dsbulk-codecs-api - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.slf4j 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 tooMany = Lists.newArrayList(values); tooMany.add(6.6f); @@ -100,7 +97,8 @@ void should_encode_too_many_but_not_too_few() { CqlVector 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 tooMany = Lists.newArrayList(values); tooMany.add(6.6f); @@ -84,7 +81,8 @@ void should_encode_too_many_but_not_too_few() { CqlVector 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 @@ config - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.slf4j @@ -56,7 +56,7 @@ test - com.datastax.oss + org.apache.cassandra java-driver-core test 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 @@ - com.datastax.oss + org.apache.cassandra java-driver-core @@ -47,8 +47,8 @@ config - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.reactivestreams 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 @@ config - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded com.univocity 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 @@ config - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded com.fasterxml.jackson.core 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 @@ - com.datastax.oss + org.apache.cassandra java-driver-core @@ -218,7 +218,7 @@ META-INF/io.netty.versions.properties - + @@ -247,7 +247,7 @@ DataStax Bulk Loader ${project.version} API DataStax Bulk Loader ${project.version} API - https://www.javadoc.io/doc/com.datastax.oss/java-driver-core/${driver.version} + https://www.javadoc.io/doc/org.apache.cassandra/java-driver-core/${driver.version} https://www.javadoc.io/doc/io.netty/netty-all/${netty.version} https://www.javadoc.io/doc/com.typesafe/config/${config.version} https://www.reactive-streams.org/reactive-streams-${reactive-streams.version}-javadoc/ 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 @@ dsbulk-sampler - com.datastax.oss + org.apache.cassandra java-driver-core @@ -51,8 +51,8 @@ reactive-streams - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.jctools 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 @@ dsbulk-executor-api - com.datastax.oss + org.apache.cassandra java-driver-core 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 @@ - com.datastax.oss + org.apache.cassandra java-driver-core - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.slf4j 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 @@ - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.apache.commons 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 @@ antlr4-runtime - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded com.github.ben-manes.caffeine 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 @@ - com.datastax.oss + org.apache.cassandra java-driver-core - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded com.datastax.oss @@ -67,7 +67,7 @@ test - com.datastax.oss + org.apache.cassandra java-driver-test-infra test diff --git a/pom.xml b/pom.xml index beaacaba2..1a103e132 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ make sure the resulting binary tarball contains only required jars, and that no jar has an offending license. --> - 4.17.0 + 4.19.2 1.0.3 2020.0.19 1.4.2 @@ -98,6 +98,8 @@ 4.2.0 1.3 2.22.2 + 1.0-1 + 4.5.3 4 2 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 @@ dsbulk-url - com.datastax.oss + org.apache.cassandra java-driver-core @@ -71,8 +71,8 @@ snappy-java - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.fusesource.jansi @@ -82,6 +82,10 @@ org.slf4j slf4j-api + + com.github.spotbugs + spotbugs-annotations + org.junit.jupiter junit-jupiter-engine @@ -93,7 +97,7 @@ test - com.datastax.oss + org.apache.cassandra java-driver-test-infra test 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 @@ - com.datastax.oss + org.apache.cassandra java-driver-core 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 @@ dsbulk-codecs-api - com.datastax.oss + org.apache.cassandra java-driver-core - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded com.typesafe 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 @@ - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.slf4j 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 @@ - com.datastax.oss + org.apache.cassandra java-driver-core 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 @@ dsbulk-executor-api - com.datastax.oss + org.apache.cassandra java-driver-core @@ -127,8 +127,8 @@ simpleclient_dropwizard - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded com.github.ben-manes.caffeine @@ -158,6 +158,10 @@ org.fusesource.jansi jansi + + com.github.stephenc.jcip + jcip-annotations + org.junit.jupiter junit-jupiter-engine 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 @@ dsbulk-executor-api - com.datastax.oss + org.apache.cassandra java-driver-core @@ -67,12 +67,16 @@ reactor-core - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.slf4j slf4j-api + + com.github.spotbugs + spotbugs-annotations + 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 @@ dsbulk-executor-api - com.datastax.oss + org.apache.cassandra java-driver-core @@ -71,12 +71,16 @@ reactor-core - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.slf4j slf4j-api + + com.github.spotbugs + spotbugs-annotations + 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 @@ dsbulk-executor-api - com.datastax.oss + org.apache.cassandra java-driver-core @@ -67,12 +67,16 @@ reactor-core - com.datastax.oss - java-driver-shaded-guava + org.apache.cassandra + java-driver-guava-shaded org.slf4j slf4j-api + + com.github.spotbugs + spotbugs-annotations + From 4e235d6fdabad95f440b41bc2428436c578544fc Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Thu, 11 Dec 2025 23:40:36 -0600 Subject: [PATCH 7/8] Forgot to bump Netty version to match what's in the new Java driver version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a103e132..2ac37cd32 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 1.0.3 2020.0.19 1.4.2 - 4.1.94.Final + 4.1.119.Final 2.9.3 3.3.0 From 90c4b5113e84bac94d4261e5fe690ca1fcd33ac6 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 12 Dec 2025 11:48:35 -0600 Subject: [PATCH 8/8] Updates to jackson-databind and org.json dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2ac37cd32..b5229eedc 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 1.8.0 1.1.10.8 2.1.12 - 2.13.3 + 2.20.1 2.9.1 1.28.0 1.5.7-6 @@ -84,7 +84,7 @@ 4.5.3 1.2.1 1.9.13 - 20220320 + 20250517 1.18 2.40.7 0.15.0