From f54ac46ab428b3c55d6c0a4e9ea92f39587fccc8 Mon Sep 17 00:00:00 2001
From: Urs Keller <urs@formasuisse.ch>
Date: Tue, 9 May 2023 17:11:05 +0200
Subject: [PATCH] Bump GRPC to be able to compile on Mac Arm

---
 .../pom.xml                                        | 14 ++++++++++----
 .../spring-cloud-function-grpc/pom.xml             |  6 +++---
 .../function-sample-grpc-cloudevent/pom.xml        | 11 ++++++-----
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml
index 0b224158d..32258e95b 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml
+++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml
@@ -10,7 +10,9 @@
 	<artifactId>spring-cloud-function-grpc-cloudevent-ext</artifactId>
 	<name>spring-cloud-function-grpc-cloudevent-ext</name>
 	<description>CloudEvent extension for spring-cloud-function-grpc</description>
-	
+	<properties>
+		<grpc.version>1.55.1</grpc.version>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -21,7 +23,11 @@
 			<artifactId>spring-cloud-function-grpc</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
+		<dependency>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-stub</artifactId>
+			<version>${grpc.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -44,11 +50,11 @@
 		      <version>0.6.1</version>
 		      <configuration>
 		        <protocArtifact>     
-		          com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+		          com.google.protobuf:protoc:3.23.0:exe:${os.detected.classifier}
 		        </protocArtifact>
 		        <pluginId>grpc-java</pluginId>
 		        <pluginArtifact>
-		          io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}
+		          io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
 		        </pluginArtifact>
 		      </configuration>
 		      <executions>
diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml
index 81b58adf0..e33151fb4 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml
+++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml
@@ -13,7 +13,7 @@
 		<version>4.0.3-SNAPSHOT</version>
 	</parent>
 	<properties>
-		<grpc.version>1.16.1</grpc.version>
+		<grpc.version>1.55.1</grpc.version>
 		<disable.checks>true</disable.checks>
 	</properties>
 	<dependencies>
@@ -81,11 +81,11 @@
 				<version>0.6.1</version>
 				<configuration>
 					<protocArtifact>
-		          com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+		          com.google.protobuf:protoc:3.23.0:exe:${os.detected.classifier}
 		        </protocArtifact>
 					<pluginId>grpc-java</pluginId>
 					<pluginArtifact>
-		          io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}
+		          io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
 		        </pluginArtifact>
 				</configuration>
 				<executions>
diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml
index 7d21f844c..c52df58ae 100644
--- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml
+++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml
@@ -17,6 +17,7 @@
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<spring-cloud-function.version>4.0.3-SNAPSHOT</spring-cloud-function.version>
+		<grpc.version>1.55.1</grpc.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -31,17 +32,17 @@
 		<dependency>
 		    <groupId>io.grpc</groupId>
 		    <artifactId>grpc-netty</artifactId>
-		    <version>1.16.1</version>
+		    <version>${grpc.version}</version>
 		</dependency>
 		<dependency>
 		    <groupId>io.grpc</groupId>
 		    <artifactId>grpc-protobuf</artifactId>
-		    <version>1.16.1</version>
+		    <version>${grpc.version}</version>
 		</dependency>
 		<dependency>
 		    <groupId>io.grpc</groupId>
 		    <artifactId>grpc-stub</artifactId>
-		    <version>1.16.1</version>
+		    <version>${grpc.version}</version>
 		</dependency>
 
 		<dependency>
@@ -85,11 +86,11 @@
 		      <version>0.6.1</version>
 		      <configuration>
 		        <protocArtifact>
-		          com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+		          com.google.protobuf:protoc:3.23.0:exe:${os.detected.classifier}
 		        </protocArtifact>
 		        <pluginId>grpc-java</pluginId>
 		        <pluginArtifact>
-		          io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}
+		          io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
 		        </pluginArtifact>
 		      </configuration>
 		      <executions>