This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch machristie/issue53 in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
commit b9516f737febc25812be7e9f9e215ec7ee33b450 Author: Marcus Christie <[email protected]> AuthorDate: Wed May 17 10:34:39 2023 -0400 Build error on mac M1 Fixes #53 --- agent/stub/pom.xml | 6 +++--- api/stub/pom.xml | 6 +++--- common/mft-common-proto/pom.xml | 6 +++--- pom.xml | 3 ++- services/resource-service/stub/pom.xml | 6 +++--- services/secret-service/stub/pom.xml | 6 +++--- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/agent/stub/pom.xml b/agent/stub/pom.xml index 5af4ef1..609e689 100644 --- a/agent/stub/pom.xml +++ b/agent/stub/pom.xml @@ -58,9 +58,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> <additionalProtoPathElements> <additionalProtoPathElement>../../common/mft-common-proto/src/main/proto</additionalProtoPathElement> <additionalProtoPathElement>../../services/resource-service/stub/src/main/proto/azure</additionalProtoPathElement> @@ -102,4 +102,4 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> -</project> \ No newline at end of file +</project> diff --git a/api/stub/pom.xml b/api/stub/pom.xml index 4d7652d..7f7baed 100644 --- a/api/stub/pom.xml +++ b/api/stub/pom.xml @@ -58,9 +58,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> <additionalProtoPathElements> <additionalProtoPathElement>../../common/mft-common-proto/src/main/proto</additionalProtoPathElement> <additionalProtoPathElement>../../services/resource-service/stub/src/main/proto</additionalProtoPathElement> @@ -79,4 +79,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/common/mft-common-proto/pom.xml b/common/mft-common-proto/pom.xml index fb4b53c..35be7d8 100644 --- a/common/mft-common-proto/pom.xml +++ b/common/mft-common-proto/pom.xml @@ -54,9 +54,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> @@ -70,4 +70,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/pom.xml b/pom.xml index 8467ac5..04fd179 100755 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,8 @@ <javax.annotation>1.3.2</javax.annotation> <consul.client>1.5.3</consul.client> <h2>1.4.191</h2> - <protobuf.java>3.10.0</protobuf.java> + <protobuf.java>3.21.11</protobuf.java> + <grpc.version>1.47.0</grpc.version> <!-- This version matches that used by grpc.spring.boot --> <grpc.spring.boot>4.7.1</grpc.spring.boot> <spring.boot.data.jpa>2.2.1.RELEASE</spring.boot.data.jpa> <spring.context>5.2.1.RELEASE</spring.context> diff --git a/services/resource-service/stub/pom.xml b/services/resource-service/stub/pom.xml index b11afd5..f167525 100644 --- a/services/resource-service/stub/pom.xml +++ b/services/resource-service/stub/pom.xml @@ -54,9 +54,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> <additionalProtoPathElements> <additionalProtoPathElement>../../../common/mft-common-proto/src/main/proto</additionalProtoPathElement> </additionalProtoPathElements> @@ -73,4 +73,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/services/secret-service/stub/pom.xml b/services/secret-service/stub/pom.xml index 6089ed8..6f5265f 100644 --- a/services/secret-service/stub/pom.xml +++ b/services/secret-service/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> <additionalProtoPathElements> <additionalProtoPathElement>../../../common/mft-common-proto/src/main/proto</additionalProtoPathElement> </additionalProtoPathElements> @@ -71,4 +71,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project>
