From bca2eff2b09264c2f315b7f2b782abc8a185f9a2 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Mon, 6 Jan 2025 16:30:51 +0000
Subject: [PATCH] Upgrade grpc-java to 1.69.0

---
 samples/grpc-server-netty-shaded/pom.xml                       | 2 +-
 samples/grpc-server/pom.xml                                    | 2 +-
 samples/grpc-tomcat/pom.xml                                    | 2 +-
 samples/grpc-webflux/pom.xml                                   | 2 +-
 spring-grpc-dependencies/pom.xml                               | 2 +-
 .../server/GrpcServerReflectionAutoConfiguration.java          | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/samples/grpc-server-netty-shaded/pom.xml b/samples/grpc-server-netty-shaded/pom.xml
index acbcf7f..6a0ff9b 100644
--- a/samples/grpc-server-netty-shaded/pom.xml
+++ b/samples/grpc-server-netty-shaded/pom.xml
@@ -18,7 +18,7 @@
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
 		<protobuf-java.version>3.25.5</protobuf-java.version>
-		<grpc.version>1.63.2</grpc.version>
+		<grpc.version>1.69.0</grpc.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml
index 06592f1..9b1b83c 100644
--- a/samples/grpc-server/pom.xml
+++ b/samples/grpc-server/pom.xml
@@ -31,7 +31,7 @@
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
 		<protobuf-java.version>3.25.5</protobuf-java.version>
-		<grpc.version>1.63.2</grpc.version>
+		<grpc.version>1.69.0</grpc.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/samples/grpc-tomcat/pom.xml b/samples/grpc-tomcat/pom.xml
index 8237919..b4802be 100644
--- a/samples/grpc-tomcat/pom.xml
+++ b/samples/grpc-tomcat/pom.xml
@@ -31,7 +31,7 @@
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
 		<protobuf-java.version>3.25.5</protobuf-java.version>
-		<grpc.version>1.63.2</grpc.version>
+		<grpc.version>1.69.0</grpc.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/samples/grpc-webflux/pom.xml b/samples/grpc-webflux/pom.xml
index d22a5ac..66049a9 100644
--- a/samples/grpc-webflux/pom.xml
+++ b/samples/grpc-webflux/pom.xml
@@ -31,7 +31,7 @@
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
 		<protobuf-java.version>3.25.5</protobuf-java.version>
-		<grpc.version>1.63.2</grpc.version>
+		<grpc.version>1.69.0</grpc.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-grpc-dependencies/pom.xml b/spring-grpc-dependencies/pom.xml
index b53059e..21c783c 100644
--- a/spring-grpc-dependencies/pom.xml
+++ b/spring-grpc-dependencies/pom.xml
@@ -51,7 +51,7 @@
 	<properties>
 		<spring-framework.version>6.2.1</spring-framework.version>
 		<netty.version>4.1.115.Final</netty.version>
-		<grpc.version>1.63.2</grpc.version>
+		<grpc.version>1.69.0</grpc.version>
 		<protobuf-java.version>3.25.5</protobuf-java.version>
 		<google-common-protos.version>2.46.0</google-common-protos.version>
 		<micrometer.version>1.13.6</micrometer.version>
diff --git a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerReflectionAutoConfiguration.java b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerReflectionAutoConfiguration.java
index f8f58c5..dae7acf 100644
--- a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerReflectionAutoConfiguration.java
+++ b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerReflectionAutoConfiguration.java
@@ -8,6 +8,7 @@ import org.springframework.context.annotation.Bean;
 
 import io.grpc.BindableService;
 import io.grpc.protobuf.services.ProtoReflectionService;
+import io.grpc.protobuf.services.ProtoReflectionServiceV1;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for gRPC Reflection service
@@ -24,7 +25,7 @@ public class GrpcServerReflectionAutoConfiguration {
 
 	@Bean
 	public BindableService serverReflection() {
-		return ProtoReflectionService.newInstance();
+		return ProtoReflectionServiceV1.newInstance();
 	}
 
 }