#2922 Fix protobuf tests for M1 Macs

This commit is contained in:
Iaroslav Bogdanchikov 2022-07-06 14:39:21 +02:00 committed by Filip Hrisafov
parent a2b4454a66
commit 4b43f9079d
2 changed files with 5 additions and 4 deletions

View File

@ -23,7 +23,7 @@
<properties>
<os.mavenplugin.version>1.6.0</os.mavenplugin.version>
<protobuf.mavenplugin.version>0.5.1</protobuf.mavenplugin.version>
<protobuf.mavenplugin.version>0.6.1</protobuf.mavenplugin.version>
</properties>
<dependencies>
@ -55,10 +55,10 @@
<goal>compile-custom</goal>
</goals>
<configuration>
<protocArtifact>com.google.protobuf:protoc:3.2.0:exe:${os.detected.classifier}
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.2.0:exe:${os.detected.classifier}
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.47.0:exe:${os.detected.classifier}
</pluginArtifact>
</configuration>
</execution>

View File

@ -41,6 +41,7 @@
The processor module needs at least Java 11.
-->
<minimum.java.version>1.8</minimum.java.version>
<protobuf.version>3.21.2</protobuf.version>
</properties>
<licenses>
@ -234,7 +235,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.16.1</version>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>org.inferred</groupId>