Merge branch 'main' into xxh/merge-sink-snowflake-to-main

Author: xxhZs

java/connector-node/risingwave-connector-service/pom.xml

@@ -26,6 +26,27 @@
             <groupId>com.risingwave</groupId>
             <artifactId>proto</artifactId>
         </dependency>
+        <!-- Ensure all grpc-* artifacts are aligned (avoid mixing versions pulled by other deps). -->
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf-lite</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.risingwave</groupId>
             <artifactId>java-binding</artifactId>

java/connector-node/risingwave-sink-iceberg/pom.xml

@@ -17,6 +17,9 @@
 
     <properties>
         <iceberg.version>1.10.1</iceberg.version>
+        <!-- Keep in sync with the versions bundled in org.apache.iceberg:iceberg-gcp-bundle -->
+        <google.cloud.storage.version>2.55.0</google.cloud.storage.version>
+        <google.cloud.kms.version>2.75.0</google.cloud.kms.version>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -94,6 +97,16 @@
             <artifactId>iceberg-gcp</artifactId>
             <version>${iceberg.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-storage</artifactId>
+            <version>${google.cloud.storage.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-kms</artifactId>
+            <version>${google.cloud.kms.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3</artifactId>
@@ -142,10 +155,5 @@
             <artifactId>iceberg-snowflake</artifactId>
             <version>${iceberg.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.iceberg</groupId>
-            <artifactId>iceberg-gcp-bundle</artifactId>
-            <version>${iceberg.version}</version>
-        </dependency>
     </dependencies>
 </project>

java/pom.xml

@@ -78,6 +78,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-bom</artifactId>
+                <version>${grpc.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-api</artifactId>