Skip to content

Commit

Permalink
Upgrade protobuf to support osx-aarch_64 architecture (#4630) (#4662)
Browse files Browse the repository at this point in the history
* Version manage protoc to align with Google protobuf version (and support osx-aarch_64)
* Upgrade protobuf version

Signed-off-by: Tomas Langer <[email protected]>
  • Loading branch information
tomas-langer authored Aug 3, 2022
1 parent aaf0e0c commit 7e2e8ee
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion applications/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${version.plugin.protobuf}</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${version.lib.google-protobuf}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${version.lib.grpc}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<version.lib.google-api-client>1.34.1</version.lib.google-api-client>
<version.lib.google-oauth-client>1.33.3</version.lib.google-oauth-client>
<version.lib.google-error-prone>2.3.3</version.lib.google-error-prone>
<version.lib.google-protobuf>3.19.2</version.lib.google-protobuf>
<version.lib.google-protobuf>3.21.4</version.lib.google-protobuf>
<version.lib.graalvm>21.3.0</version.lib.graalvm>
<version.lib.graphql-java>15.0</version.lib.graphql-java>
<version.lib.graphql-java.extended.scalars>15.0.0</version.lib.graphql-java.extended.scalars>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@
<version>${version.plugin.protobuf}</version>
<configuration>
<!--suppress UnresolvedMavenProperty -->
<protocArtifact>com.google.protobuf:protoc:3.17.3:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${version.lib.google-protobuf}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<!--suppress UnresolvedMavenProperty -->
<pluginArtifact>
Expand Down

0 comments on commit 7e2e8ee

Please sign in to comment.