From 40fed814b95f13090278cd31f17d722244bb2b59 Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Sun, 20 Oct 2024 12:17:56 -0500
Subject: [PATCH] Exclude older protobuf lib from grpc lib

This commit excludes the older protobuf libs
`protobuf-java` and `proto-google-common-protos` from the
`grpc-protobuf` lib and then explicitly adds back in the
dependencies at the desired version in the root pom.xml
---
 pom.xml                                       |  8 +++++++-
 spring-grpc-core/pom.xml                      | 19 +++++++++++++++++++
 spring-grpc-spring-boot-autoconfigure/pom.xml |  5 -----
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3422ab5..32623ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,8 +76,9 @@
 		<!-- production dependencies -->
 		<spring-framework.version>6.1.14</spring-framework.version>
 		<netty.version>4.1.113.Final</netty.version>
-		<protobuf-java.version>3.25.5</protobuf-java.version>
 		<grpc.version>1.63.2</grpc.version>
+		<protobuf-java.version>3.25.5</protobuf-java.version>
+		<google-common-protos.version>2.46.0</google-common-protos.version>
 
 		<!-- internal dependencies -->
 		<spring-boot.version>3.3.4</spring-boot.version>
@@ -404,6 +405,11 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>com.google.api.grpc</groupId>
+				<artifactId>proto-google-common-protos</artifactId>
+				<version>${google-common-protos.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/spring-grpc-core/pom.xml b/spring-grpc-core/pom.xml
index 6b6f664..9cf5a9f 100644
--- a/spring-grpc-core/pom.xml
+++ b/spring-grpc-core/pom.xml
@@ -42,7 +42,26 @@
 		<dependency>
 			<groupId>io.grpc</groupId>
 			<artifactId>grpc-protobuf</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.protobuf</groupId>
+					<artifactId>protobuf-java</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.api.grpc</groupId>
+					<artifactId>proto-google-common-protos</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>com.google.protobuf</groupId>
+			<artifactId>protobuf-java</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.api.grpc</groupId>
+			<artifactId>proto-google-common-protos</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>io.grpc</groupId>
 			<artifactId>grpc-stub</artifactId>
diff --git a/spring-grpc-spring-boot-autoconfigure/pom.xml b/spring-grpc-spring-boot-autoconfigure/pom.xml
index 0f5ca76..4bf1c0f 100644
--- a/spring-grpc-spring-boot-autoconfigure/pom.xml
+++ b/spring-grpc-spring-boot-autoconfigure/pom.xml
@@ -54,11 +54,6 @@
 			<artifactId>grpc-netty-shaded</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.google.protobuf</groupId>
-			<artifactId>protobuf-java</artifactId>
-			<optional>true</optional>
-		</dependency>
 
 		<!-- test dependencies -->
 		<dependency>