From fc028c152720d9420f0c2d88f71c5aa683b372c6 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Wed, 30 Oct 2024 16:30:43 +0800 Subject: [PATCH 01/15] bump --- .../risingwave-connector-test/pom.xml | 12 +++++----- .../risingwave-sink-deltalake/pom.xml | 2 +- .../risingwave-sink-iceberg/pom.xml | 4 ++-- .../pom.xml | 2 +- .../risingwave-source-cdc/pom.xml | 2 +- .../risingwave-source-test/pom.xml | 6 ++--- java/java-binding-benchmark/pom.xml | 6 ++--- java/java-binding/pom.xml | 2 +- java/pom.xml | 24 ++++++++----------- 9 files changed, 28 insertions(+), 32 deletions(-) diff --git a/java/connector-node/risingwave-connector-test/pom.xml b/java/connector-node/risingwave-connector-test/pom.xml index d3d47b0bc4571..00cdad6194963 100644 --- a/java/connector-node/risingwave-connector-test/pom.xml +++ b/java/connector-node/risingwave-connector-test/pom.xml @@ -41,13 +41,13 @@ io.delta delta-core_2.12 - 2.2.0 + 2.4.0 test io.delta delta-standalone_2.12 - 0.6.0 + 3.2.1 test @@ -98,13 +98,13 @@ org.assertj assertj-core - 3.24.2 + 3.26.3 test com.zaxxer HikariCP - 5.0.1 + 6.0.0 test @@ -128,13 +128,13 @@ com.fasterxml.jackson.core jackson-databind - 2.13.5 + 2.18.1 test com.fasterxml.jackson.core jackson-core - 2.13.5 + 2.18.1 test diff --git a/java/connector-node/risingwave-sink-deltalake/pom.xml b/java/connector-node/risingwave-sink-deltalake/pom.xml index 9a89853ff9f39..86fd704d395cf 100644 --- a/java/connector-node/risingwave-sink-deltalake/pom.xml +++ b/java/connector-node/risingwave-sink-deltalake/pom.xml @@ -44,7 +44,7 @@ io.delta delta-standalone_2.12 - 0.6.0 + 3.2.1 org.apache.parquet diff --git a/java/connector-node/risingwave-sink-iceberg/pom.xml b/java/connector-node/risingwave-sink-iceberg/pom.xml index d8ef3d6db384a..588f39c9a5660 100644 --- a/java/connector-node/risingwave-sink-iceberg/pom.xml +++ b/java/connector-node/risingwave-sink-iceberg/pom.xml @@ -77,7 +77,7 @@ org.apache.parquet parquet-avro - 1.12.3 + 1.14.3 org.apache.hadoop @@ -136,7 +136,7 @@ org.assertj assertj-core - 3.24.2 + 3.26.3 test diff --git a/java/connector-node/risingwave-sink-mock-flink/risingwave-sink-mock-flink-http-sink/pom.xml b/java/connector-node/risingwave-sink-mock-flink/risingwave-sink-mock-flink-http-sink/pom.xml index bc078c80d166b..816f249e271e8 100644 --- a/java/connector-node/risingwave-sink-mock-flink/risingwave-sink-mock-flink-http-sink/pom.xml +++ b/java/connector-node/risingwave-sink-mock-flink/risingwave-sink-mock-flink-http-sink/pom.xml @@ -26,7 +26,7 @@ com.getindata flink-http-connector - 0.10.0 + 0.16.0 com.risingwave diff --git a/java/connector-node/risingwave-source-cdc/pom.xml b/java/connector-node/risingwave-source-cdc/pom.xml index fb1519f6a183c..99f61944ce523 100644 --- a/java/connector-node/risingwave-source-cdc/pom.xml +++ b/java/connector-node/risingwave-source-cdc/pom.xml @@ -61,7 +61,7 @@ com.zendesk mysql-binlog-connector-java - 0.29.0 + 0.30.1 org.postgresql diff --git a/java/connector-node/risingwave-source-test/pom.xml b/java/connector-node/risingwave-source-test/pom.xml index 16bc9e7c75427..60b69ea64a422 100644 --- a/java/connector-node/risingwave-source-test/pom.xml +++ b/java/connector-node/risingwave-source-test/pom.xml @@ -47,13 +47,13 @@ org.assertj assertj-core - 3.24.2 + 3.26.3 test com.zaxxer HikariCP - 5.0.1 + 6.0.0 test @@ -76,7 +76,7 @@ org.mongodb mongodb-driver-sync - 4.11.1 + 5.2.0 com.fasterxml.jackson.core diff --git a/java/java-binding-benchmark/pom.xml b/java/java-binding-benchmark/pom.xml index 80303bc914e67..f6d848fdecb6c 100644 --- a/java/java-binding-benchmark/pom.xml +++ b/java/java-binding-benchmark/pom.xml @@ -24,17 +24,17 @@ org.openjdk.jmh jmh-core - 1.33 + 1.37 org.openjdk.jmh jmh-generator-annprocess - 1.33 + 1.37 junit junit - 3.8.1 + 4.13.2 test diff --git a/java/java-binding/pom.xml b/java/java-binding/pom.xml index d53eaa26b2d57..8b7705ee46db3 100644 --- a/java/java-binding/pom.xml +++ b/java/java-binding/pom.xml @@ -41,7 +41,7 @@ junit junit - 4.13.1 + 4.13.2 test diff --git a/java/pom.xml b/java/pom.xml index 65d6d829c50a1..ecb7d2bb951fc 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -68,14 +68,10 @@ 2.10 0.1.0-SNAPSHOT 2.43.0 - 2.20.0 - 2.0.9 - 1.5.0 - 2.14.0 - 1.10.0 - 3.12.0 + 2.24.1 + 2.0.16 2.6.2.Final - 2.15.0 + 2.18.1 3.3.1 3.4.0 7.17.23 @@ -118,22 +114,22 @@ commons-cli commons-cli - ${commons.cli.version} + 1.9.0 org.apache.commons commons-text - ${commons.text.version} + 1.12.0 commons-io commons-io - ${commons.io.version} + 2.17.0 org.apache.commons commons-lang3 - ${commons.lang3.version} + 3.17.0 com.fasterxml.jackson.core @@ -350,17 +346,17 @@ com.google.guava guava - 33.0.0-jre + 33.3.1-jre org.apache.httpcomponents httpclient - 4.5.13 + 4.5.14 io.prometheus simpleclient_httpserver - 0.5.0 + 0.16.0 org.xerial From 96f8ec7a5130bf6ca810b89018332dfa0830ed6b Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Wed, 30 Oct 2024 16:44:58 +0800 Subject: [PATCH 02/15] bump --- .../risingwave-sink-cassandra/pom.xml | 4 +- .../risingwave-sink-es-7/pom.xml | 8 ---- java/pom.xml | 37 +++++-------------- 3 files changed, 12 insertions(+), 37 deletions(-) diff --git a/java/connector-node/risingwave-sink-cassandra/pom.xml b/java/connector-node/risingwave-sink-cassandra/pom.xml index 9a36cb49284d4..43ee5365791e4 100644 --- a/java/connector-node/risingwave-sink-cassandra/pom.xml +++ b/java/connector-node/risingwave-sink-cassandra/pom.xml @@ -44,9 +44,9 @@ - com.datastax.oss + org.apache.cassandra java-driver-core - ${datastax.version} + 4.18.1 diff --git a/java/connector-node/risingwave-sink-es-7/pom.xml b/java/connector-node/risingwave-sink-es-7/pom.xml index 4ff4bd76ef109..5720dd61b6796 100644 --- a/java/connector-node/risingwave-sink-es-7/pom.xml +++ b/java/connector-node/risingwave-sink-es-7/pom.xml @@ -43,18 +43,10 @@ - - org.elasticsearch - elasticsearch - org.elasticsearch.client elasticsearch-rest-high-level-client - - org.opensearch - opensearch - org.opensearch.client opensearch-rest-high-level-client diff --git a/java/pom.xml b/java/pom.xml index ecb7d2bb951fc..29f4ffec9f6a0 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -60,33 +60,26 @@ 11 11 + 0.1.0-SNAPSHOT 1.0.0 UTF-8 UTF-8 3.21.1 + 1.64.0 - 2.10 - 0.1.0-SNAPSHOT 2.43.0 2.24.1 2.0.16 2.6.2.Final 2.18.1 - 3.3.1 3.4.0 - 7.17.23 - 2.11.1 - 4.15.0 1.18.0 1.17.6 42.5.5 8.3.0 4.11.1 - 3.45.0.0 2.21.42 - 3.1.3 12.0.12 - 1.1.10.5 @@ -187,27 +180,17 @@ org.mongodb mongodb-driver-sync - ${mongodb.driver.sync.version} - - - org.elasticsearch - elasticsearch - ${elasticsearch.version} + 4.11.1 org.elasticsearch.client elasticsearch-rest-high-level-client - ${elasticsearch.version} - - - org.opensearch - opensearch - ${opensearch.version} + 7.17.23 org.opensearch.client opensearch-rest-high-level-client - ${opensearch.version} + 2.11.1 org.apache.httpcomponents @@ -341,7 +324,7 @@ com.google.code.gson gson - ${gson.version} + 2.10 com.google.guava @@ -361,7 +344,7 @@ org.xerial sqlite-jdbc - ${sqlite.version} + 3.45.0.0 software.amazon.awssdk @@ -386,7 +369,7 @@ org.apache.hive hive-metastore - ${hive.version} + 3.1.3 org.apache.hadoop @@ -421,12 +404,12 @@ org.xerial.snappy snappy-java - ${snappy.version} + 1.1.10.5 org.apache.spark spark-sql_2.12 - ${spark_sql.version} + 3.3.1 test From 2a6dc5ca5fdab85572733c77fc4b18bea221e6b7 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Wed, 30 Oct 2024 16:59:02 +0800 Subject: [PATCH 03/15] bump --- java/pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 29f4ffec9f6a0..19b852adda251 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -180,17 +180,17 @@ org.mongodb mongodb-driver-sync - 4.11.1 + 5.2.0 org.elasticsearch.client elasticsearch-rest-high-level-client - 7.17.23 + 7.17.25 org.opensearch.client opensearch-rest-high-level-client - 2.11.1 + 2.17.1 org.apache.httpcomponents @@ -324,7 +324,7 @@ com.google.code.gson gson - 2.10 + 2.11.0 com.google.guava @@ -344,7 +344,7 @@ org.xerial sqlite-jdbc - 3.45.0.0 + 3.47.0.0 software.amazon.awssdk @@ -369,7 +369,7 @@ org.apache.hive hive-metastore - 3.1.3 + 4.0.1 org.apache.hadoop @@ -404,12 +404,12 @@ org.xerial.snappy snappy-java - 1.1.10.5 + 1.1.10.7 org.apache.spark spark-sql_2.12 - 3.3.1 + 3.5.3 test From 9e56295e16a89da043b6bf8afc7080a413659b39 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Wed, 30 Oct 2024 17:08:16 +0800 Subject: [PATCH 04/15] improve --- java/connector-node/risingwave-sink-es-7/pom.xml | 2 -- java/connector-node/risingwave-source-cdc/pom.xml | 2 -- java/connector-node/risingwave-source-test/pom.xml | 2 -- java/pom.xml | 10 +++------- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/java/connector-node/risingwave-sink-es-7/pom.xml b/java/connector-node/risingwave-sink-es-7/pom.xml index 5720dd61b6796..5159bfc461427 100644 --- a/java/connector-node/risingwave-sink-es-7/pom.xml +++ b/java/connector-node/risingwave-sink-es-7/pom.xml @@ -34,12 +34,10 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.fasterxml.jackson.core jackson-core - ${jackson.version} diff --git a/java/connector-node/risingwave-source-cdc/pom.xml b/java/connector-node/risingwave-source-cdc/pom.xml index 99f61944ce523..26a2d5bf1edc0 100644 --- a/java/connector-node/risingwave-source-cdc/pom.xml +++ b/java/connector-node/risingwave-source-cdc/pom.xml @@ -19,12 +19,10 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.fasterxml.jackson.core jackson-core - ${jackson.version} io.debezium diff --git a/java/connector-node/risingwave-source-test/pom.xml b/java/connector-node/risingwave-source-test/pom.xml index 60b69ea64a422..2c5f9439c60db 100644 --- a/java/connector-node/risingwave-source-test/pom.xml +++ b/java/connector-node/risingwave-source-test/pom.xml @@ -81,13 +81,11 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} test com.fasterxml.jackson.core jackson-core - ${jackson.version} test diff --git a/java/pom.xml b/java/pom.xml index 19b852adda251..253a6bb5f5013 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -67,7 +67,6 @@ 3.21.1 1.64.0 - 2.43.0 2.24.1 2.0.16 2.6.2.Final @@ -75,9 +74,6 @@ 3.4.0 1.18.0 1.17.6 - 42.5.5 - 8.3.0 - 4.11.1 2.21.42 12.0.12 @@ -170,12 +166,12 @@ org.postgresql postgresql - ${postgresql.version} + 42.5.5 com.mysql mysql-connector-j - ${mysql.connector.java.version} + 8.3.0 org.mongodb @@ -476,7 +472,7 @@ com.diffplug.spotless spotless-maven-plugin - ${spotless.version} + 2.43.0 From ca7dfbfdf2e0a49c8a754352e21968373cb9865f Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Wed, 30 Oct 2024 17:18:12 +0800 Subject: [PATCH 05/15] bump the rest --- java/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 253a6bb5f5013..8dff346b2329c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -66,16 +66,16 @@ UTF-8 3.21.1 - 1.64.0 + 1.68.1 2.24.1 2.0.16 2.6.2.Final 2.18.1 - 3.4.0 + 3.4.1 1.18.0 - 1.17.6 - 2.21.42 - 12.0.12 + 1.20.3 + 2.29.2 + 12.0.14 From ee23995546451905d27fd5358970a7041dbf91a9 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Wed, 30 Oct 2024 17:21:54 +0800 Subject: [PATCH 06/15] bump --- java/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 8dff346b2329c..2c6b5883a782c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -166,12 +166,12 @@ org.postgresql postgresql - 42.5.5 + 42.7.4 com.mysql mysql-connector-j - 8.3.0 + 9.1.0 org.mongodb From 263ef803c0ccdf38df19a999c6c59c29b2eef787 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Wed, 30 Oct 2024 17:25:31 +0800 Subject: [PATCH 07/15] downgrade mysql --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 2c6b5883a782c..ba668adf98005 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -171,7 +171,7 @@ com.mysql mysql-connector-j - 9.1.0 + 8.4.0 org.mongodb From 31f338fc5b9f4de761b8a56ce3849e504e3c2095 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Wed, 30 Oct 2024 17:58:08 +0800 Subject: [PATCH 08/15] bump mysql-connector-j and protobuf --- java/pom.xml | 4 ++-- java/proto/pom.xml | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index ba668adf98005..8dafa717dc607 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -64,8 +64,8 @@ 1.0.0 UTF-8 UTF-8 - 3.21.1 + 4.28.3 1.68.1 2.24.1 2.0.16 @@ -171,7 +171,7 @@ com.mysql mysql-connector-j - 8.4.0 + 9.1.0 org.mongodb diff --git a/java/proto/pom.xml b/java/proto/pom.xml index cb33ed9574e54..40efc5e4d3652 100644 --- a/java/proto/pom.xml +++ b/java/proto/pom.xml @@ -34,6 +34,11 @@ org.apache.tomcat annotations-api + + com.google.protobuf + protobuf-java + ${protobuf.version} + From e7be2a1568a52af239a08d549b958872bec56c1a Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Fri, 1 Nov 2024 17:41:11 +0800 Subject: [PATCH 09/15] fix runtime error: slf4j --- .../connector-node/risingwave-connector-test/pom.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/java/connector-node/risingwave-connector-test/pom.xml b/java/connector-node/risingwave-connector-test/pom.xml index 00cdad6194963..bec974e4de0d6 100644 --- a/java/connector-node/risingwave-connector-test/pom.xml +++ b/java/connector-node/risingwave-connector-test/pom.xml @@ -62,14 +62,22 @@ org.apache.logging.log4j log4j-core + + org.apache.logging.log4j + log4j-slf4j2-impl + + + org.slf4j + slf4j-api + org.apache.hadoop hadoop-client test - org.slf4j - slf4j-reload4j + ch.qos.reload4j + reload4j From 06ae03521ac1a137210e69feb3b985601eb04a0d Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Fri, 1 Nov 2024 17:41:26 +0800 Subject: [PATCH 10/15] downgrade protobuf to 3.25.5 because of grpc --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 8dafa717dc607..e772c1358240d 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -65,7 +65,7 @@ UTF-8 UTF-8 - 4.28.3 + 3.25.5 1.68.1 2.24.1 2.0.16 From 27f8385548b55893322005d8e27534753d69d71e Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Fri, 15 Nov 2024 14:43:35 +0800 Subject: [PATCH 11/15] add assertj-core into dependencyManagement --- java/connector-node/risingwave-sink-deltalake-test/pom.xml | 5 ++--- java/connector-node/risingwave-sink-iceberg/pom.xml | 1 - java/connector-node/risingwave-source-cdc-test/pom.xml | 1 - java/pom.xml | 6 ++++++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/java/connector-node/risingwave-sink-deltalake-test/pom.xml b/java/connector-node/risingwave-sink-deltalake-test/pom.xml index 5f2f6655978c6..9c06148bc670b 100644 --- a/java/connector-node/risingwave-sink-deltalake-test/pom.xml +++ b/java/connector-node/risingwave-sink-deltalake-test/pom.xml @@ -115,7 +115,6 @@ org.assertj assertj-core - 3.26.3 test @@ -123,13 +122,13 @@ com.fasterxml.jackson.core jackson-databind - 2.18.1 + 2.13.5 test com.fasterxml.jackson.core jackson-core - 2.18.1 + 2.13.5 test diff --git a/java/connector-node/risingwave-sink-iceberg/pom.xml b/java/connector-node/risingwave-sink-iceberg/pom.xml index 588f39c9a5660..32e714b518a30 100644 --- a/java/connector-node/risingwave-sink-iceberg/pom.xml +++ b/java/connector-node/risingwave-sink-iceberg/pom.xml @@ -136,7 +136,6 @@ org.assertj assertj-core - 3.26.3 test diff --git a/java/connector-node/risingwave-source-cdc-test/pom.xml b/java/connector-node/risingwave-source-cdc-test/pom.xml index fca8255a0c97e..db7d207bb4a6f 100644 --- a/java/connector-node/risingwave-source-cdc-test/pom.xml +++ b/java/connector-node/risingwave-source-cdc-test/pom.xml @@ -52,7 +52,6 @@ org.assertj assertj-core - 3.26.3 test diff --git a/java/pom.xml b/java/pom.xml index bd01fda75dea4..bd7d60a781db9 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -237,6 +237,12 @@ 4.13.2 test + + org.assertj + assertj-core + 3.26.3 + test + com.risingwave proto From a01d22a0b934ec1ec2df0c96ca67fad4d5365d26 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Fri, 15 Nov 2024 16:55:25 +0800 Subject: [PATCH 12/15] fix UT finally --- .../risingwave-connector-service/pom.xml | 15 ++++++++ .../risingwave-sink-deltalake-test/pom.xml | 35 +++++++----------- .../risingwave-sink-deltalake/pom.xml | 3 +- .../risingwave-sink-iceberg/pom.xml | 4 +++ java/connector-node/s3-common/pom.xml | 2 ++ java/pom.xml | 36 ------------------- 6 files changed, 35 insertions(+), 60 deletions(-) diff --git a/java/connector-node/risingwave-connector-service/pom.xml b/java/connector-node/risingwave-connector-service/pom.xml index 0a5e9f0b9d602..c2ce04c82691d 100644 --- a/java/connector-node/risingwave-connector-service/pom.xml +++ b/java/connector-node/risingwave-connector-service/pom.xml @@ -73,6 +73,21 @@ junit test + + org.apache.logging.log4j + log4j-api + test + + + org.apache.logging.log4j + log4j-core + test + + + org.apache.logging.log4j + log4j-slf4j2-impl + test + diff --git a/java/connector-node/risingwave-sink-deltalake-test/pom.xml b/java/connector-node/risingwave-sink-deltalake-test/pom.xml index 9c06148bc670b..6ef03b14992bf 100644 --- a/java/connector-node/risingwave-sink-deltalake-test/pom.xml +++ b/java/connector-node/risingwave-sink-deltalake-test/pom.xml @@ -20,7 +20,9 @@ - 1.0.0 + + 3.5.3 + 3.2.1 @@ -41,14 +43,14 @@ io.delta - delta-core_2.12 - 2.4.0 + delta-spark_2.12 + ${delta.version} test io.delta delta-standalone_2.12 - 3.2.1 + ${delta.version} test @@ -71,18 +73,16 @@ log4j-slf4j2-impl test - - org.apache.logging.log4j - log4j-slf4j2-impl - org.slf4j slf4j-api + test org.apache.hadoop hadoop-client test + 3.3.4 ch.qos.reload4j @@ -93,18 +93,7 @@ org.apache.spark spark-sql_2.12 - test - - - org.apache.iceberg - iceberg-spark-3.2_2.12 - ${iceberg.version} - test - - - org.apache.iceberg - iceberg-arrow - ${iceberg.version} + ${spark.version} test @@ -118,17 +107,17 @@ test - + com.fasterxml.jackson.core jackson-databind - 2.13.5 + 2.15.4 test com.fasterxml.jackson.core jackson-core - 2.13.5 + 2.15.4 test diff --git a/java/connector-node/risingwave-sink-deltalake/pom.xml b/java/connector-node/risingwave-sink-deltalake/pom.xml index 86fd704d395cf..386ab0ad70fe5 100644 --- a/java/connector-node/risingwave-sink-deltalake/pom.xml +++ b/java/connector-node/risingwave-sink-deltalake/pom.xml @@ -18,7 +18,7 @@ 11 11 - 1.14.0 + 1.14.4 true @@ -74,6 +74,7 @@ org.apache.hadoop hadoop-client + ${hadoop.version} diff --git a/java/connector-node/risingwave-sink-iceberg/pom.xml b/java/connector-node/risingwave-sink-iceberg/pom.xml index 32e714b518a30..ac099739abadc 100644 --- a/java/connector-node/risingwave-sink-iceberg/pom.xml +++ b/java/connector-node/risingwave-sink-iceberg/pom.xml @@ -82,18 +82,22 @@ org.apache.hadoop hadoop-common + ${hadoop.version} org.apache.hadoop hadoop-mapreduce-client-core + ${hadoop.version} org.apache.hadoop hadoop-mapreduce-client-common + ${hadoop.version} org.apache.hadoop hadoop-mapreduce-client-jobclient + ${hadoop.version} org.apache.iceberg diff --git a/java/connector-node/s3-common/pom.xml b/java/connector-node/s3-common/pom.xml index b1c8033fc1f84..de5e7a997ba04 100644 --- a/java/connector-node/s3-common/pom.xml +++ b/java/connector-node/s3-common/pom.xml @@ -22,10 +22,12 @@ org.apache.hadoop hadoop-common + ${hadoop.version} org.apache.hadoop hadoop-aws + ${hadoop.version} com.risingwave diff --git a/java/pom.xml b/java/pom.xml index bd7d60a781db9..362874c6d882e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -216,21 +216,6 @@ 6.0.53 provided - - org.apache.hadoop - hadoop-client - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - org.apache.hadoop - hadoop-aws - ${hadoop.version} - junit junit @@ -373,21 +358,6 @@ hive-metastore 4.0.1 - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-mapreduce-client-common - ${hadoop.version} - - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - ${hadoop.version} - org.eclipse.jetty jetty-client @@ -408,12 +378,6 @@ snappy-java 1.1.10.7 - - org.apache.spark - spark-sql_2.12 - 3.5.3 - test - org.testcontainers testcontainers From 0852f6334f1e9d66bb0f66673d3d039e7f8214fa Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Fri, 15 Nov 2024 17:06:38 +0800 Subject: [PATCH 13/15] minor --- java/connector-node/risingwave-sink-mock-flink/pom.xml | 1 + java/pom.xml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/connector-node/risingwave-sink-mock-flink/pom.xml b/java/connector-node/risingwave-sink-mock-flink/pom.xml index 135abc7ec6094..548fd9d78f442 100644 --- a/java/connector-node/risingwave-sink-mock-flink/pom.xml +++ b/java/connector-node/risingwave-sink-mock-flink/pom.xml @@ -21,6 +21,7 @@ risingwave-sink-dynamic + 1.18.0 true diff --git a/java/pom.xml b/java/pom.xml index 362874c6d882e..70512cff27345 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -72,7 +72,6 @@ 2.6.2.Final 2.18.1 3.4.1 - 1.18.0 1.20.3 2.29.2 12.0.14 @@ -358,6 +357,7 @@ hive-metastore 4.0.1 + org.eclipse.jetty jetty-client @@ -373,6 +373,7 @@ jetty-http ${jetty.version} + org.xerial.snappy snappy-java @@ -411,7 +412,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 + 3.6.0 com.puppycrawl.tools From 14a00e1d12b23399af18319f1eb9321d9a6deb95 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Fri, 15 Nov 2024 18:39:13 +0800 Subject: [PATCH 14/15] minor fix --- java/pom.xml | 2 +- java/proto/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 70512cff27345..64761bbd75ea0 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -65,7 +65,7 @@ UTF-8 UTF-8 - 3.25.5 + 3.25.5 1.68.1 2.24.1 2.0.16 diff --git a/java/proto/pom.xml b/java/proto/pom.xml index f600d81bb01f9..642b4d378018e 100644 --- a/java/proto/pom.xml +++ b/java/proto/pom.xml @@ -61,7 +61,7 @@ grpc-java - io.grpc:protoc-gen-grpc-java:1.49.0:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} true From cc46cbdc796b8e283e2cd51a4c36adb80c0ce5d9 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Fri, 15 Nov 2024 18:43:53 +0800 Subject: [PATCH 15/15] downgrade mongodb client to fix Exception in thread "rw-dbz-engine-runner-7" java.lang.NoSuchMethodError: 'com.mongodb.connection.SocketSettings$Builder com.mongodb.connection.SocketSettings$Builder.connectTimeout(int, java.util.concurrent.TimeUnit)' at io.debezium.connector.mongodb.connection.client.DefaultMongoDbClientFactory.lambda$createMongoClientSettings$0(DefaultMongoDbClientFactory.java:43) at com.mongodb.MongoClientSettings$Builder.applyToSocketSettings(MongoClientSettings.java:362) at io.debezium.connector.mongodb.connection.client.DefaultMongoDbClientFactory.createMongoClientSettings(DefaultMongoDbClientFactory.java:42) at io.debezium.connector.mongodb.connection.client.DefaultMongoDbClientFactory.(DefaultMongoDbClientFactory.java:28) at io.debezium.connector.mongodb.connection.MongoDbConnectionContext.(MongoDbConnectionContext.java:42) at io.debezium.connector.mongodb.MongoDbConnector.validateConnection(MongoDbConnector.java:124) at io.debezium.connector.mongodb.MongoDbConnector.validate(MongoDbConnector.java:104) at io.debezium.embedded.EmbeddedEngine.getConnectorConfig(EmbeddedEngine.java:512) at io.debezium.embedded.EmbeddedEngine.run(EmbeddedEngine.java:422) at io.debezium.embedded.ConvertingEngineBuilder$1.run(ConvertingEngineBuilder.java:163) at com.risingwave.connector.source.core.DbzCdcEngine.run(DbzCdcEngine.java:67) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635) at java.base/java.lang.Thread.run(Thread.java:840) --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 64761bbd75ea0..4f88d5e35f1eb 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -175,7 +175,7 @@ org.mongodb mongodb-driver-sync - 5.2.0 + 4.11.5 org.elasticsearch.client