From 6bf2ce854e446db82f26c33c5f5f96fb96ae308f Mon Sep 17 00:00:00 2001 From: ShimonSte Date: Tue, 25 Nov 2025 17:13:23 +0200 Subject: [PATCH 1/4] Align Spark 4.0 dependencies with Spark 4.0.1 release - Update Jackson from 2.17.0 to 2.18.2 - Update SLF4J from 2.0.7 to 2.0.16 - Update Jakarta Annotations from 1.3.5 to 2.1.1 All 315 tests pass with these updated dependencies, including: - Arrow 18.1.0 compatibility (Arrow writer tests) - Jackson 2.18.2 compatibility (JSON reader/writer tests) - All data type mappings and cluster operations --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 664dcc5c..563de6dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -48,12 +48,12 @@ spark_40_antlr_version=4.13.1 spark_33_jackson_version=2.13.4 spark_34_jackson_version=2.14.2 spark_35_jackson_version=2.15.2 -spark_40_jackson_version=2.17.0 +spark_40_jackson_version=2.18.2 spark_33_slf4j_version=1.7.32 spark_34_slf4j_version=2.0.6 spark_35_slf4j_version=2.0.7 -spark_40_slf4j_version=2.0.7 +spark_40_slf4j_version=2.0.16 # Align with Apache Spark, and don't bundle them in release jar. commons_lang3_version=3.12.0 @@ -61,7 +61,7 @@ commons_codec_version=1.17.2 # javax annotations removed in jdk 11 # fix build error with jakarta annotations -jakarta_annotation_api_version=1.3.5 +jakarta_annotation_api_version=2.1.1 # Test only kyuubi_version=1.9.2 From 4f2ffb69a1fcdf189fdf71cc6b821e45b932edf5 Mon Sep 17 00:00:00 2001 From: ShimonSte Date: Tue, 25 Nov 2025 17:37:21 +0200 Subject: [PATCH 2/4] Update README to include Spark 4.0 support - Add Spark 4.0 to requirements - Update compatible matrix: main branch now supports Spark 3.3, 3.4, 3.5, 4.0 - Add 0.8.1 version row for Spark 3.3, 3.4, 3.5 - Keep ClickHouse JDBC version as 0.6.3 for main and 0.8.1 --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 71fca8bd..c36d15a6 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ See the [documentation](https://clickhouse.com/docs/en/integrations/apache-spark - Java 8 or 17 - Scala 2.12 or 2.13 -- Apache Spark 3.3 or 3.4 or 3.5 +- Apache Spark 3.3, 3.4, 3.5, or 4.0 Notes: 1. As of 0.5.0, this connector switches from ClickHouse raw gRPC Client to @@ -31,7 +31,8 @@ Notes: | Version | Compatible Spark Versions | ClickHouse JDBC version | |---------|---------------------------|-------------------------| -| main | Spark 3.3, 3.4, 3.5 | 0.6.3 | +| main | Spark 3.3, 3.4, 3.5, 4.0 | 0.6.3 | +| 0.8.1 | Spark 3.3, 3.4, 3.5 | 0.6.3 | | 0.8.0 | Spark 3.3, 3.4, 3.5 | 0.6.3 | | 0.7.3 | Spark 3.3, 3.4 | 0.4.6 | | 0.6.0 | Spark 3.3 | 0.3.2-patch11 | From 71ac7a51c86e098634cca4baa844525293f08a2d Mon Sep 17 00:00:00 2001 From: ShimonSte Date: Wed, 26 Nov 2025 09:48:31 +0200 Subject: [PATCH 3/4] Update dependencies and remove unused jakarta annotations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dependency updates: - Scala 2.13: 2.13.8 → 2.13.16 (for Spark 4.0) - Commons Lang3: 3.12.0 → 3.17.0 (align with Spark 4.0) - Kyuubi: 1.9.2 → 1.10.2 (test dependency) Cleanup: - Remove jakarta.annotation-api dependency (not used in code) - Remove jakarta_annotation_api_version property All 292 tests pass with these changes. --- build.gradle | 2 -- gradle.properties | 10 +++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 6f0af275..85b85d6e 100644 --- a/build.gradle +++ b/build.gradle @@ -235,8 +235,6 @@ project(':clickhouse-core') { api("com.clickhouse:client-v2:${clickhouse_client_v2_version}:all") { transitive = false } - compileOnly "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_api_version" - testFixturesApi "org.slf4j:slf4j-api:$slf4j_version" testFixturesApi "org.scalatest:scalatest_$scala_binary_version:$scalatest_version" testFixturesRuntimeOnly "com.vladsch.flexmark:flexmark-all:$flexmark_version" diff --git a/gradle.properties b/gradle.properties index 563de6dc..bdeca72c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ spark_35_scala_212_version=2.12.18 spark_33_scala_213_version=2.13.8 spark_34_scala_213_version=2.13.8 spark_35_scala_213_version=2.13.8 -spark_40_scala_213_version=2.13.8 +spark_40_scala_213_version=2.13.16 spark_33_antlr_version=4.8 spark_34_antlr_version=4.9.3 @@ -56,15 +56,11 @@ spark_35_slf4j_version=2.0.7 spark_40_slf4j_version=2.0.16 # Align with Apache Spark, and don't bundle them in release jar. -commons_lang3_version=3.12.0 +commons_lang3_version=3.17.0 commons_codec_version=1.17.2 -# javax annotations removed in jdk 11 -# fix build error with jakarta annotations -jakarta_annotation_api_version=2.1.1 - # Test only -kyuubi_version=1.9.2 +kyuubi_version=1.10.2 testcontainers_scala_version=0.41.2 scalatest_version=3.2.19 flexmark_version=0.62.2 From 52be0eb8b840b3b34bb83027f4ceb5abe59bdd1e Mon Sep 17 00:00:00 2001 From: ShimonSte Date: Wed, 26 Nov 2025 12:27:20 +0200 Subject: [PATCH 4/4] Update ClickHouse JDBC version to 0.9.4 and remove obsolete 0.8.0 entry from compatibility matrix --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index c36d15a6..02f5c2b8 100644 --- a/README.md +++ b/README.md @@ -31,9 +31,8 @@ Notes: | Version | Compatible Spark Versions | ClickHouse JDBC version | |---------|---------------------------|-------------------------| -| main | Spark 3.3, 3.4, 3.5, 4.0 | 0.6.3 | +| main | Spark 3.3, 3.4, 3.5, 4.0 | 0.9.4 | | 0.8.1 | Spark 3.3, 3.4, 3.5 | 0.6.3 | -| 0.8.0 | Spark 3.3, 3.4, 3.5 | 0.6.3 | | 0.7.3 | Spark 3.3, 3.4 | 0.4.6 | | 0.6.0 | Spark 3.3 | 0.3.2-patch11 | | 0.5.0 | Spark 3.2, 3.3 | 0.3.2-patch11 |