From 2efa91448730bbbb92ec702e119a1c38d28f2a36 Mon Sep 17 00:00:00 2001
From: onobc <chris.bono@gmail.com>
Date: Tue, 2 Dec 2025 22:51:59 -0600
Subject: [PATCH 1/2] Remove unnecessary dependency exclusions

This removes unnecessary exclusions of Google `protobuf-java` and
`proto-google-common-protos` dependencies from `spring-grpc-core` and
`spring-grpc-dependencies` modules as the desired versions are
properly overridden without the exclusions.

Signed-off-by: onobc <chris.bono@gmail.com>
---
 spring-grpc-core/pom.xml         | 14 --------------
 spring-grpc-dependencies/pom.xml | 15 ---------------
 2 files changed, 29 deletions(-)

diff --git a/spring-grpc-core/pom.xml b/spring-grpc-core/pom.xml
index 3a7811ac..ced674a4 100644
--- a/spring-grpc-core/pom.xml
+++ b/spring-grpc-core/pom.xml
@@ -74,20 +74,6 @@
 		<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>io.grpc</groupId>
diff --git a/spring-grpc-dependencies/pom.xml b/spring-grpc-dependencies/pom.xml
index 26e9724e..84a113c8 100644
--- a/spring-grpc-dependencies/pom.xml
+++ b/spring-grpc-dependencies/pom.xml
@@ -113,21 +113,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>io.grpc</groupId>
-				<artifactId>grpc-services</artifactId>
-				<version>${grpc.version}</version>
-				<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>io.grpc</groupId>
 				<artifactId>grpc-kotlin-stub</artifactId>

From e6dc2c1ae8559fd599c53f2a4cb611c368321d64 Mon Sep 17 00:00:00 2001
From: onobc <chris.bono@gmail.com>
Date: Tue, 2 Dec 2025 23:10:07 -0600
Subject: [PATCH 2/2] Update Google protobuf libs

This updates the following Google protobuf libs:

- `protobuf-java` to `4.33.1`
- `proto-google-common-protos` to `2.63.1`

Signed-off-by: onobc <chris.bono@gmail.com>
---
 samples/grpc-client/pom.xml              | 2 +-
 samples/grpc-oauth2/pom.xml              | 2 +-
 samples/grpc-reactive/pom.xml            | 2 +-
 samples/grpc-secure/pom.xml              | 2 +-
 samples/grpc-server-kotlin/pom.xml       | 2 +-
 samples/grpc-server-netty-shaded/pom.xml | 2 +-
 samples/grpc-server/pom.xml              | 2 +-
 samples/grpc-tomcat-secure/pom.xml       | 2 +-
 samples/grpc-tomcat/pom.xml              | 2 +-
 samples/grpc-webflux-secure/pom.xml      | 2 +-
 samples/grpc-webflux/pom.xml             | 2 +-
 spring-grpc-dependencies/pom.xml         | 4 ++--
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/samples/grpc-client/pom.xml b/samples/grpc-client/pom.xml
index 200e0953..150687a0 100644
--- a/samples/grpc-client/pom.xml
+++ b/samples/grpc-client/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
 		<grpc.version>1.77.0</grpc.version>
 		<maven.version>3.9.4</maven.version>
 		<maven.resolver.version>1.9.18</maven.resolver.version>
diff --git a/samples/grpc-oauth2/pom.xml b/samples/grpc-oauth2/pom.xml
index 20181775..a1f8906a 100644
--- a/samples/grpc-oauth2/pom.xml
+++ b/samples/grpc-oauth2/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
 		<grpc.version>1.77.0</grpc.version>
 	</properties>
 	<dependencyManagement>
diff --git a/samples/grpc-reactive/pom.xml b/samples/grpc-reactive/pom.xml
index 0c2e5f3a..d3c81009 100644
--- a/samples/grpc-reactive/pom.xml
+++ b/samples/grpc-reactive/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
 		<grpc.version>1.77.0</grpc.version>
 	</properties>
 	<dependencyManagement>
diff --git a/samples/grpc-secure/pom.xml b/samples/grpc-secure/pom.xml
index e05f5945..268bd32e 100644
--- a/samples/grpc-secure/pom.xml
+++ b/samples/grpc-secure/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
 		<grpc.version>1.77.0</grpc.version>
 	</properties>
 	<dependencyManagement>
diff --git a/samples/grpc-server-kotlin/pom.xml b/samples/grpc-server-kotlin/pom.xml
index 58a78d47..45c5167d 100644
--- a/samples/grpc-server-kotlin/pom.xml
+++ b/samples/grpc-server-kotlin/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
 		<grpc.version>1.77.0</grpc.version>
 		<grpc.kotlin.version>1.5.0</grpc.kotlin.version>
 		<kotlin.version>2.2.21</kotlin.version>
diff --git a/samples/grpc-server-netty-shaded/pom.xml b/samples/grpc-server-netty-shaded/pom.xml
index 0a9f7fbb..78faa0dc 100644
--- a/samples/grpc-server-netty-shaded/pom.xml
+++ b/samples/grpc-server-netty-shaded/pom.xml
@@ -17,7 +17,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
 		<grpc.version>1.77.0</grpc.version>
 	</properties>
 	<dependencyManagement>
diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml
index 2d56255d..659e80b3 100644
--- a/samples/grpc-server/pom.xml
+++ b/samples/grpc-server/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
 		<grpc.version>1.77.0</grpc.version>
 	</properties>
 	<dependencyManagement>
diff --git a/samples/grpc-tomcat-secure/pom.xml b/samples/grpc-tomcat-secure/pom.xml
index 6a5b9aa8..99842508 100644
--- a/samples/grpc-tomcat-secure/pom.xml
+++ b/samples/grpc-tomcat-secure/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
 		<grpc.version>1.77.0</grpc.version>
 	</properties>
 	<dependencyManagement>
diff --git a/samples/grpc-tomcat/pom.xml b/samples/grpc-tomcat/pom.xml
index 463e80a4..a6c2e09e 100644
--- a/samples/grpc-tomcat/pom.xml
+++ b/samples/grpc-tomcat/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
 		<grpc.version>1.77.0</grpc.version>
 	</properties>
 	<dependencyManagement>
diff --git a/samples/grpc-webflux-secure/pom.xml b/samples/grpc-webflux-secure/pom.xml
index b2406644..2cdfaa27 100644
--- a/samples/grpc-webflux-secure/pom.xml
+++ b/samples/grpc-webflux-secure/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
 		<grpc.version>1.77.0</grpc.version>
 	</properties>
 	<dependencyManagement>
diff --git a/samples/grpc-webflux/pom.xml b/samples/grpc-webflux/pom.xml
index c24a4127..a5395271 100644
--- a/samples/grpc-webflux/pom.xml
+++ b/samples/grpc-webflux/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
 		<grpc.version>1.77.0</grpc.version>
 	</properties>
 	<dependencyManagement>
diff --git a/spring-grpc-dependencies/pom.xml b/spring-grpc-dependencies/pom.xml
index 84a113c8..cd3cb065 100644
--- a/spring-grpc-dependencies/pom.xml
+++ b/spring-grpc-dependencies/pom.xml
@@ -52,8 +52,8 @@
 	<properties>
 		<grpc.version>1.77.0</grpc.version>
 		<grpc-kotlin.version>1.5.0</grpc-kotlin.version>
-		<protobuf-java.version>4.32.1</protobuf-java.version>
-		<google-common-protos.version>2.61.2</google-common-protos.version>
+		<protobuf-java.version>4.33.1</protobuf-java.version>
+		<google-common-protos.version>2.63.1</google-common-protos.version>
 		<reactor-grpc.version>1.2.4</reactor-grpc.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
 		<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>