SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump GRPC to be able to compile on Mac Arm

Browse Source
This commit is contained in:
Urs Keller
2023-05-09 17:11:05 +02:00
committed by Oleg Zhurakousky
parent 9c292b629a
commit f54ac46ab4
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml
View File

@@ -10,7 +10,9 @@
<artifactId>spring-cloud-function-grpc-cloudevent-ext</artifactId> <artifactId>spring-cloud-function-grpc-cloudevent-ext</artifactId>
<name>spring-cloud-function-grpc-cloudevent-ext</name> <name>spring-cloud-function-grpc-cloudevent-ext</name>
<description>CloudEvent extension for spring-cloud-function-grpc</description> <description>CloudEvent extension for spring-cloud-function-grpc</description>
<properties>
<grpc.version>1.55.1</grpc.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -21,7 +23,11 @@
<artifactId>spring-cloud-function-grpc</artifactId> <artifactId>spring-cloud-function-grpc</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
@@ -44,11 +50,11 @@
<version>0.6.1</version> <version>0.6.1</version>
<configuration> <configuration>
<protocArtifact> <protocArtifact>
com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier} com.google.protobuf:protoc:3.23.0:exe:${os.detected.classifier}
</protocArtifact> </protocArtifact>
<pluginId>grpc-java</pluginId> <pluginId>grpc-java</pluginId>
<pluginArtifact> <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> </pluginArtifact>
</configuration> </configuration>
<executions> <executions>

6
spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml
View File

@@ -13,7 +13,7 @@
<version>4.0.3-SNAPSHOT</version> <version>4.0.3-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<grpc.version>1.16.1</grpc.version> <grpc.version>1.55.1</grpc.version>
<disable.checks>true</disable.checks> <disable.checks>true</disable.checks>
</properties> </properties>
<dependencies> <dependencies>
@@ -81,11 +81,11 @@
<version>0.6.1</version> <version>0.6.1</version>
<configuration> <configuration>
<protocArtifact> <protocArtifact>
com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier} com.google.protobuf:protoc:3.23.0:exe:${os.detected.classifier}
</protocArtifact> </protocArtifact>
<pluginId>grpc-java</pluginId> <pluginId>grpc-java</pluginId>
<pluginArtifact> <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> </pluginArtifact>
</configuration> </configuration>
<executions> <executions>

11
spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml
View File

@@ -17,6 +17,7 @@
<description>Demo project for Spring Boot</description> <description>Demo project for Spring Boot</description>
<properties> <properties>
<spring-cloud-function.version>4.0.3-SNAPSHOT</spring-cloud-function.version> <spring-cloud-function.version>4.0.3-SNAPSHOT</spring-cloud-function.version>
<grpc.version>1.55.1</grpc.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@@ -31,17 +32,17 @@
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId> <artifactId>grpc-netty</artifactId>
<version>1.16.1</version> <version>${grpc.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId> <artifactId>grpc-protobuf</artifactId>
<version>1.16.1</version> <version>${grpc.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId> <artifactId>grpc-stub</artifactId>
<version>1.16.1</version> <version>${grpc.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -85,11 +86,11 @@
<version>0.6.1</version> <version>0.6.1</version>
<configuration> <configuration>
<protocArtifact> <protocArtifact>
com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier} com.google.protobuf:protoc:3.23.0:exe:${os.detected.classifier}
</protocArtifact> </protocArtifact>
<pluginId>grpc-java</pluginId> <pluginId>grpc-java</pluginId>
<pluginArtifact> <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> </pluginArtifact>
</configuration> </configuration>
<executions> <executions>