Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump java dependencies #19208

Merged
merged 17 commits into from
Nov 17, 2024
Merged

chore: bump java dependencies #19208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fc028c1
bump
fuyufjh Oct 30, 2024
96f8ec7
bump
fuyufjh Oct 30, 2024
2a6dc5c
bump
fuyufjh Oct 30, 2024
9e56295
improve
fuyufjh Oct 30, 2024
68f5d91
Merge remote-tracking branch 'origin/main' into eric/bump_java_depend…
fuyufjh Oct 30, 2024
ca7dfbf
bump the rest
fuyufjh Oct 30, 2024
ee23995
bump
fuyufjh Oct 30, 2024
263ef80
downgrade mysql
fuyufjh Oct 30, 2024
31f338f
bump mysql-connector-j and protobuf
fuyufjh Oct 30, 2024
e7be2a1
fix runtime error: slf4j
fuyufjh Nov 1, 2024
06ae035
downgrade protobuf to 3.25.5 because of grpc
fuyufjh Nov 1, 2024
b8f60ed
Merge remote-tracking branch 'origin/main' into eric/bump_java_depend…
fuyufjh Nov 15, 2024
27f8385
add assertj-core into dependencyManagement
fuyufjh Nov 15, 2024
a01d22a
fix UT finally
fuyufjh Nov 15, 2024
0852f63
minor
fuyufjh Nov 15, 2024
14a00e1
minor fix
fuyufjh Nov 15, 2024
cc46cbd
downgrade mongodb client to fix
fuyufjh Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions java/connector-node/risingwave-connector-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,21 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>

<!-- Specific connectors dependencies managed by the assembly plugin, refer to
assembly/pom.xml for more details -->
Expand Down
4 changes: 2 additions & 2 deletions java/connector-node/risingwave-sink-cassandra/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@

<!-- cassandra drivers -->
<dependency>
<groupId>com.datastax.oss</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-core</artifactId>
<version>${datastax.version}</version>
<version>4.18.1</version>
</dependency>
</dependencies>

Expand Down
40 changes: 18 additions & 22 deletions java/connector-node/risingwave-sink-deltalake-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
</description>

<properties>
<iceberg.version>1.0.0</iceberg.version>
<!-- The versions of Spark and Delta must be compatible. See https://docs.delta.io/latest/releases.html -->
<spark.version>3.5.3</spark.version>
<delta.version>3.2.1</delta.version>
</properties>

<dependencies>
Expand All @@ -41,14 +43,14 @@
</dependency>
<dependency>
<groupId>io.delta</groupId>
<artifactId>delta-core_2.12</artifactId>
<version>2.2.0</version>
<artifactId>delta-spark_2.12</artifactId>
<version>${delta.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.delta</groupId>
<artifactId>delta-standalone_2.12</artifactId>
<version>0.6.0</version>
<version>${delta.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -71,32 +73,27 @@
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<scope>test</scope>
<version>3.3.4</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_2.12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-spark-3.2_2.12</artifactId>
<version>${iceberg.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-arrow</artifactId>
<version>${iceberg.version}</version>
<version>${spark.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -107,21 +104,20 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<scope>test</scope>
</dependency>

<!-- Force using jackson-databind 2.13.5, as required by spark-3.2_2.12 -->
<!-- Force using jackson 2.15.x to escape from dependencyManagement as required by Spark -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.5</version>
<version>2.15.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.13.5</version>
<version>2.15.4</version>
<scope>test</scope>
</dependency>

Expand Down
5 changes: 3 additions & 2 deletions java/connector-node/risingwave-sink-deltalake/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<parquet.version>1.14.0</parquet.version>
<parquet.version>1.14.4</parquet.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>

Expand All @@ -44,7 +44,7 @@
<dependency>
<groupId>io.delta</groupId>
<artifactId>delta-standalone_2.12</artifactId>
<version>0.6.0</version>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
Expand Down Expand Up @@ -74,6 +74,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
</dependency>
</dependencies>
</project>
10 changes: 0 additions & 10 deletions java/connector-node/risingwave-sink-es-7/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>

<!-- ElasticSearch drivers -->
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
</dependency>
<dependency>
<groupId>org.opensearch</groupId>
<artifactId>opensearch</artifactId>
</dependency>
<dependency>
<groupId>org.opensearch.client</groupId>
<artifactId>opensearch-rest-high-level-client</artifactId>
Expand Down
7 changes: 5 additions & 2 deletions java/connector-node/risingwave-sink-iceberg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,27 @@
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-avro</artifactId>
<version>1.12.3</version>
<version>1.14.3</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-common</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
Expand Down Expand Up @@ -136,7 +140,6 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
1 change: 1 addition & 0 deletions java/connector-node/risingwave-sink-mock-flink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<name>risingwave-sink-dynamic</name>

<properties>
<flink.version>1.18.0</flink.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion java/connector-node/risingwave-sink-mock-flink/risingwave-sink-mock-flink-http-sink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<dependency>
<groupId>com.getindata</groupId>
<artifactId>flink-http-connector</artifactId>
<version>0.10.0</version>
<version>0.16.0</version>
</dependency>
<dependency>
<groupId>com.risingwave</groupId>
Expand Down
7 changes: 2 additions & 5 deletions java/connector-node/risingwave-source-cdc-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,12 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.0.1</version>
<version>6.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -81,18 +80,16 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>4.11.1</version>
<version>5.2.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 1 addition & 3 deletions java/connector-node/risingwave-source-cdc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>io.debezium</groupId>
Expand Down Expand Up @@ -61,7 +59,7 @@
<groupId>com.zendesk</groupId>
<artifactId>mysql-binlog-connector-java</artifactId>
<!-- https://central.sonatype.com/artifact/com.zendesk/mysql-binlog-connector-java/versions -->
<version>0.29.0</version>
<version>0.30.1</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand Down
2 changes: 2 additions & 0 deletions java/connector-node/s3-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>com.risingwave</groupId>
Expand Down
6 changes: 3 additions & 3 deletions java/java-binding-benchmark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>1.33</version>
<version>1.37</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>1.33</version>
<version>1.37</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion java/java-binding/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading
Loading