From 0519b3fdd5ab0b94d39ee6989050272e6f3e5c78 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Sun, 17 Nov 2024 16:40:45 +0800 Subject: [PATCH] chore: bump java dependencies (#19208) --- .../risingwave-connector-service/pom.xml | 15 ++ .../risingwave-sink-cassandra/pom.xml | 4 +- .../risingwave-sink-deltalake-test/pom.xml | 40 +++--- .../risingwave-sink-deltalake/pom.xml | 5 +- .../risingwave-sink-es-7/pom.xml | 10 -- .../risingwave-sink-iceberg/pom.xml | 7 +- .../risingwave-sink-mock-flink/pom.xml | 1 + .../pom.xml | 2 +- .../risingwave-source-cdc-test/pom.xml | 7 +- .../risingwave-source-cdc/pom.xml | 4 +- java/connector-node/s3-common/pom.xml | 2 + java/java-binding-benchmark/pom.xml | 6 +- java/java-binding/pom.xml | 2 +- java/pom.xml | 128 +++++------------- java/proto/pom.xml | 7 +- 15 files changed, 97 insertions(+), 143 deletions(-) diff --git a/java/connector-node/risingwave-connector-service/pom.xml b/java/connector-node/risingwave-connector-service/pom.xml index 0a5e9f0b9d60..c2ce04c82691 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-cassandra/pom.xml b/java/connector-node/risingwave-sink-cassandra/pom.xml index 9a36cb49284d..43ee5365791e 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-deltalake-test/pom.xml b/java/connector-node/risingwave-sink-deltalake-test/pom.xml index c677dd864c11..6ef03b14992b 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.2.0 + delta-spark_2.12 + ${delta.version} test io.delta delta-standalone_2.12 - 0.6.0 + ${delta.version} test @@ -71,32 +73,27 @@ log4j-slf4j2-impl test + + org.slf4j + slf4j-api + test + org.apache.hadoop hadoop-client test + 3.3.4 - org.slf4j - slf4j-reload4j + ch.qos.reload4j + reload4j 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 @@ -107,21 +104,20 @@ org.assertj assertj-core - 3.24.2 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 9a89853ff9f3..386ab0ad70fe 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 @@ -44,7 +44,7 @@ io.delta delta-standalone_2.12 - 0.6.0 + 3.2.1 org.apache.parquet @@ -74,6 +74,7 @@ org.apache.hadoop hadoop-client + ${hadoop.version} diff --git a/java/connector-node/risingwave-sink-es-7/pom.xml b/java/connector-node/risingwave-sink-es-7/pom.xml index e46ce06068f1..73209951ad77 100644 --- a/java/connector-node/risingwave-sink-es-7/pom.xml +++ b/java/connector-node/risingwave-sink-es-7/pom.xml @@ -34,27 +34,17 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.fasterxml.jackson.core jackson-core - ${jackson.version} - - 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/connector-node/risingwave-sink-iceberg/pom.xml b/java/connector-node/risingwave-sink-iceberg/pom.xml index d8ef3d6db384..ac099739abad 100644 --- a/java/connector-node/risingwave-sink-iceberg/pom.xml +++ b/java/connector-node/risingwave-sink-iceberg/pom.xml @@ -77,23 +77,27 @@ org.apache.parquet parquet-avro - 1.12.3 + 1.14.3 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 @@ -136,7 +140,6 @@ org.assertj assertj-core - 3.24.2 test diff --git a/java/connector-node/risingwave-sink-mock-flink/pom.xml b/java/connector-node/risingwave-sink-mock-flink/pom.xml index 135abc7ec609..548fd9d78f44 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/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 65719be7a5dd..36741240134e 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-test/pom.xml b/java/connector-node/risingwave-source-cdc-test/pom.xml index e9e204a8e9b7..db7d207bb4a6 100644 --- a/java/connector-node/risingwave-source-cdc-test/pom.xml +++ b/java/connector-node/risingwave-source-cdc-test/pom.xml @@ -52,13 +52,12 @@ org.assertj assertj-core - 3.24.2 test com.zaxxer HikariCP - 5.0.1 + 6.0.0 test @@ -81,18 +80,16 @@ org.mongodb mongodb-driver-sync - 4.11.1 + 5.2.0 com.fasterxml.jackson.core jackson-databind - ${jackson.version} test com.fasterxml.jackson.core jackson-core - ${jackson.version} test diff --git a/java/connector-node/risingwave-source-cdc/pom.xml b/java/connector-node/risingwave-source-cdc/pom.xml index fb1519f6a183..26a2d5bf1edc 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 @@ -61,7 +59,7 @@ com.zendesk mysql-binlog-connector-java - 0.29.0 + 0.30.1 org.postgresql diff --git a/java/connector-node/s3-common/pom.xml b/java/connector-node/s3-common/pom.xml index b1c8033fc1f8..de5e7a997ba0 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/java-binding-benchmark/pom.xml b/java/java-binding-benchmark/pom.xml index 80303bc914e6..f6d848fdecb6 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 d53eaa26b2d5..8b7705ee46db 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 9157c7bce6a7..4f88d5e35f1e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -60,37 +60,21 @@ 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.20.0 - 2.0.9 - 1.5.0 - 2.14.0 - 1.10.0 - 3.12.0 + + 3.25.5 + 1.68.1 + 2.24.1 + 2.0.16 2.6.2.Final - 2.15.0 - 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 + 2.18.1 + 3.4.1 + 1.20.3 + 2.29.2 + 12.0.14 @@ -118,22 +102,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 @@ -181,37 +165,27 @@ org.postgresql postgresql - ${postgresql.version} + 42.7.4 com.mysql mysql-connector-j - ${mysql.connector.java.version} + 9.1.0 org.mongodb mongodb-driver-sync - ${mongodb.driver.sync.version} - - - org.elasticsearch - elasticsearch - ${elasticsearch.version} + 4.11.5 org.elasticsearch.client elasticsearch-rest-high-level-client - ${elasticsearch.version} - - - org.opensearch - opensearch - ${opensearch.version} + 7.17.25 org.opensearch.client opensearch-rest-high-level-client - ${opensearch.version} + 2.17.1 org.apache.httpcomponents @@ -241,27 +215,18 @@ 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 4.13.2 test + + org.assertj + assertj-core + 3.26.3 + test + com.risingwave proto @@ -345,27 +310,27 @@ com.google.code.gson gson - ${gson.version} + 2.11.0 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 sqlite-jdbc - ${sqlite.version} + 3.47.0.0 software.amazon.awssdk @@ -390,23 +355,9 @@ org.apache.hive hive-metastore - ${hive.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} + 4.0.1 + org.eclipse.jetty jetty-client @@ -422,16 +373,11 @@ jetty-http ${jetty.version} + org.xerial.snappy snappy-java - ${snappy.version} - - - org.apache.spark - spark-sql_2.12 - ${spark_sql.version} - test + 1.1.10.7 org.testcontainers @@ -466,7 +412,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 + 3.6.0 com.puppycrawl.tools @@ -497,7 +443,7 @@ com.diffplug.spotless spotless-maven-plugin - ${spotless.version} + 2.43.0 diff --git a/java/proto/pom.xml b/java/proto/pom.xml index f1b5dff96d0f..642b4d378018 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} + @@ -56,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