Skip to content

Commit

Permalink
[Enhancement] Bump grpc and protobuff version to allow building on Ma…
Browse files Browse the repository at this point in the history
…c M1

Upgrade to the latest grpc-java 1.42.1 which is only compatible and [tested against](grpc/grpc-java#8551 (comment)) 3.17.2, but we can assume that 3.17.3 (which has osx-aarch_64 compatible maven artifacts) is save to use.

We could have also upgrade to the latest grpc-java 1.42.1 and latest protoc 3.19.1, but it can not be directly done, it needs to tweak the grpcs-java internal dependencies. So we choose the safest option and discarded this option because of the following reasons:
 - Protoc 3.19.1 generates code that relies on methods not available in protobuf-java 3.17.2 ([“issue”](protocolbuffers/protobuf#9236 (comment))) (which java-grpc relies on). So we need to tell grpc-java via dependency management to use 3.19.1 instead of 3.17.2.

Signed-off-by: Marc Navarro Sonnenfeld <marcnavarro@tetrate.io>
  • Loading branch information
toffentoffen committed Nov 26, 2021
1 parent a3bdbeb commit de35061
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
10 changes: 5 additions & 5 deletions dist-material/release-docs/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,11 @@ The following components are provided under the Apache License. See project link
The text of each license is the standard Apache 2.0 license.

raphw (byte-buddy) 1.10.19: http://bytebuddy.net/ , Apache 2.0
Google: grpc-java 1.32.1: https://github.com/grpc/grpc-java, Apache 2.0
Google: grpc-java 1.42.1: https://github.com/grpc/grpc-java, Apache 2.0
Google: guava 28.1: https://github.com/google/guava , Apache 2.0
Google: guice 4.1.0: https://github.com/google/guice , Apache 2.0
Google: gson 2.8.6: https://github.com/google/gson , Apache 2.0
Google: proto-google-common-protos 1.17.0: https://github.com/googleapis/googleapis , Apache 2.0
Google: proto-google-common-protos 2.0.1: https://github.com/googleapis/googleapis , Apache 2.0
Google: jsr305 3.0.2: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0
Google: flatbuffers-java 1.12.0: https://github.com/google/flatbuffers/ , Apache 2.0
Eclipse (Jetty) 9.4.40.v20210413: https://www.eclipse.org/jetty/ , Apache 2.0 and Eclipse Public License 1.0
Expand Down Expand Up @@ -306,7 +306,7 @@ The text of each license is the standard Apache 2.0 license.
Ctripcorp: apollo 1.8.0: https://github.com/ctripcorp/apollo Apache 2.0
javaassist 3.25.0-GA: https://github.com/jboss-javassist/javassist Apache 2.0
jackson-module-afterburner 2.12.2: https://github.com/FasterXML/jackson-modules-base, Apache 2.0
perfmark-api 0.19.0: https://github.com/perfmark/perfmark, Apache 2.0
perfmark-api 0.23.0: https://github.com/perfmark/perfmark, Apache 2.0
moshi 1.5.0: https://github.com/square/moshi, Apache 2.0
logging-interceptor 3.13.1: https://github.com/square/okhttp/tree/master/okhttp-logging-interceptor, Apache 2.0
msgpack-core 0.8.16: https://github.com/msgpack/msgpack-java, Apache 2.0
Expand Down Expand Up @@ -362,8 +362,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt.

asm 9.0:https://gitlab.ow2.org , BSD-3-Clause
antlr4-runtime 4.5.1: http://www.antlr.org/license.html, BSD-3-Clause
Google: protobuf-java 3.13.0: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
Google: protobuf-java-util 3.12.4: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
Google: protobuf-java 3.17.3: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
Google: protobuf-java-util 3.17.3: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
reflectasm 1.11.7: https://github.com/EsotericSoftware/reflectasm , BSD-3-Clause

zstd-jni 1.4.3-1: https://github.com/luben/zstd-jni, BSD-3-Clause
Expand Down
4 changes: 2 additions & 2 deletions oap-server-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<zookeeper.version>3.5.7</zookeeper.version>
<guava.version>28.1-jre</guava.version>
<snakeyaml.version>1.28</snakeyaml.version>
<protobuf-java.version>3.13.0</protobuf-java.version>
<protobuf-java-util.version>3.12.4</protobuf-java-util.version>
<protobuf-java.version>3.17.3</protobuf-java.version>
<protobuf-java-util.version>3.17.3</protobuf-java-util.version>
<commons-codec.version>1.11</commons-codec.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,12 @@
<lombok.version>1.18.20</lombok.version>

<!-- core lib dependency -->
<grpc.version>1.32.1</grpc.version>
<grpc.version>1.42.1</grpc.version>
<gson.version>2.8.6</gson.version>
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
<com.google.protobuf.protoc.version>3.12.0</com.google.protobuf.protoc.version>
<protoc-gen-grpc-java.plugin.version>1.32.1</protoc-gen-grpc-java.plugin.version>
<com.google.protobuf.protoc.version>3.17.3</com.google.protobuf.protoc.version>
<protoc-gen-grpc-java.plugin.version>1.42.1</protoc-gen-grpc-java.plugin.version>
<netty-tcnative-boringssl-static.version>2.0.43.Final</netty-tcnative-boringssl-static.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<objenesis.version>3.1</objenesis.version>
Expand Down
24 changes: 12 additions & 12 deletions tools/dependencies/known-oap-backend-dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ freemarker-2.3.28.jar
graphql-java-8.0.jar
graphql-java-tools-5.2.3.jar
groovy-3.0.8.jar
grpc-api-1.32.1.jar
grpc-context-1.32.1.jar
grpc-core-1.32.1.jar
grpc-grpclb-1.32.1.jar
grpc-netty-1.32.1.jar
grpc-protobuf-1.32.1.jar
grpc-protobuf-lite-1.32.1.jar
grpc-stub-1.32.1.jar
grpc-api-1.42.1.jar
grpc-context-1.42.1.jar
grpc-core-1.42.1.jar
grpc-grpclb-1.42.1.jar
grpc-netty-1.42.1.jar
grpc-protobuf-1.42.1.jar
grpc-protobuf-lite-1.42.1.jar
grpc-stub-1.42.1.jar
gson-2.8.6.jar
gson-fire-1.8.5.jar
guava-28.1-jre.jar
Expand Down Expand Up @@ -124,11 +124,11 @@ netty-transport-native-unix-common-4.1.68.Final.jar
netty-transport-native-unix-common-4.1.68.Final-linux-x86_64.jar
okhttp-3.14.9.jar
okio-1.17.2.jar
perfmark-api-0.19.0.jar
perfmark-api-0.23.0.jar
postgresql-42.2.18.jar
proto-google-common-protos-1.17.0.jar
protobuf-java-3.13.0.jar
protobuf-java-util-3.12.4.jar
proto-google-common-protos-2.0.1.jar
protobuf-java-3.17.3.jar
protobuf-java-util-3.17.3.jar
reactive-streams-1.0.2.jar
reflectasm-1.11.7.jar
retrofit-2.5.0.jar
Expand Down

0 comments on commit de35061

Please sign in to comment.