This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch airavata-v2-refactoring
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/airavata-v2-refactoring by
this push:
new 19837e8c99 Fixes mac M1 build issues by updating protobuf version
19837e8c99 is described below
commit 19837e8c9966c32bf055da347b243adf81ef34fd
Author: Marcus Christie <[email protected]>
AuthorDate: Wed May 17 10:43:24 2023 -0400
Fixes mac M1 build issues by updating protobuf version
Updated protobuf version to 3.21.11 which has a native osx-aarch_64 build
of the protoc compiler.
---
modules/airavata-apis/airavata-apis-stub/pom.xml | 6 +++---
pom.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/airavata-apis/airavata-apis-stub/pom.xml
b/modules/airavata-apis/airavata-apis-stub/pom.xml
index 652a112c3b..2e7629a276 100644
--- a/modules/airavata-apis/airavata-apis-stub/pom.xml
+++ b/modules/airavata-apis/airavata-apis-stub/pom.xml
@@ -53,9 +53,9 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${protobuf.maven.plugin}</version>
<configuration>
-
<protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${protobuf.java}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact>
+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
<executions>
<execution>
@@ -68,4 +68,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index d590a82e86..6f8d81cdd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<properties>
<protobuf.maven.plugin>0.5.1</protobuf.maven.plugin>
<os.maven.plugin>1.5.0.Final</os.maven.plugin>
- <protobuf.java>3.10.0</protobuf.java>
+ <protobuf.java>3.21.11</protobuf.java>
<grpc.version>1.54.0</grpc.version>
<h2>1.4.191</h2>
<spring.boot.data.jpa>2.2.1.RELEASE</spring.boot.data.jpa>
