Skip to content

Commit

Permalink
Build error on mac M1
Browse files Browse the repository at this point in the history 
Fixes #53
  • Loading branch information
@machristie @DImuthuUpe
machristie authored and DImuthuUpe committed May 25, 2023
1 parent 3534959 commit 2e48f51
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 16 deletions.
6 changes: 3 additions & 3 deletions agent/stub/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -102,4 +102,4 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

</project>
</project>
6 changes: 3 additions & 3 deletions api/stub/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -79,4 +79,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
6 changes: 3 additions & 3 deletions common/mft-common-proto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -70,4 +70,4 @@
</plugins>
</build>

</project>
</project>
3 changes: 2 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions services/resource-service/stub/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -73,4 +73,4 @@
</plugins>
</build>

</project>
</project>
6 changes: 3 additions & 3 deletions services/secret-service/stub/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -71,4 +71,4 @@
</plugin>
</plugins>
</build>
</project>
</project>

0 comments on commit 2e48f51

Please sign in to comment.