From f0d31bb9fbff9c7e8700fcb5487753e574bd7abf Mon Sep 17 00:00:00 2001
From: Raj Patel <rajppatel@google.com>
Date: Mon, 11 Nov 2024 18:43:02 -0600
Subject: [PATCH] fix: Provide required protobuf-java dependency for spanner

---
 java/pom.xml | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index f35f648b..736079f6 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -59,7 +59,7 @@
     <guava.version>32.0.0-jre</guava.version>
     <netty.version>4.1.92.Final</netty.version>
     <paranamer.version>2.8</paranamer.version>
-    <protobuf.version>3.23.0</protobuf.version>
+    <protobuf.version>3.25.0</protobuf.version>
     <zstd.version>1.4.9-1</zstd.version>
     <openlineage.version>1.19.0</openlineage.version>
     <grpc.version>1.55.1</grpc.version>
@@ -369,6 +369,11 @@
       <artifactId>spark-bigtable_${scala.binary.version}</artifactId>
       <version>${spark.bigtable.connector.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
 
     <!-- Spark Cassandra Connector -->
     <dependency>
@@ -492,16 +497,16 @@
       <artifactId>commons-cli</artifactId>
       <version>${commons.cli.version}</version>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>org.json</groupId>-->
-<!--      <artifactId>json</artifactId>-->
-<!--      <version>${json.version}</version>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>com.github.ben-manes.caffeine</groupId>-->
-<!--      <artifactId>caffeine</artifactId>-->
-<!--      <version>${caffeine.version}</version>-->
-<!--    </dependency>-->
+    <!--    <dependency>-->
+    <!--      <groupId>org.json</groupId>-->
+    <!--      <artifactId>json</artifactId>-->
+    <!--      <version>${json.version}</version>-->
+    <!--    </dependency>-->
+    <!--    <dependency>-->
+    <!--      <groupId>com.github.ben-manes.caffeine</groupId>-->
+    <!--      <artifactId>caffeine</artifactId>-->
+    <!--      <version>${caffeine.version}</version>-->
+    <!--    </dependency>-->
 
     <!-- Java Test Libraries -->
     <dependency>