Skip to content

Commit

Permalink
Upgrade grpc to 1.45.1 and protobuf to 3.19.2
Browse files Browse the repository at this point in the history
- grpc < 1.45.1 is not compatible with Netty > 4.1.74.Final
  - grpc/grpc-java#9004
  • Loading branch information
lhotari committed Apr 19, 2022
1 parent de79918 commit c282f1f
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 37 deletions.
49 changes: 25 additions & 24 deletions distribution/server/src/assemble/LICENSE.bin.txt
Expand Up @@ -466,27 +466,27 @@ The Apache Software License, Version 2.0
- org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.4.32.jar
- org.jetbrains-annotations-13.0.jar
* gRPC
- io.grpc-grpc-all-1.42.1.jar
- io.grpc-grpc-auth-1.42.1.jar
- io.grpc-grpc-context-1.42.1.jar
- io.grpc-grpc-core-1.42.1.jar
- io.grpc-grpc-netty-1.42.1.jar
- io.grpc-grpc-protobuf-1.42.1.jar
- io.grpc-grpc-protobuf-lite-1.42.1.jar
- io.grpc-grpc-stub-1.42.1.jar
- io.grpc-grpc-alts-1.42.1.jar
- io.grpc-grpc-api-1.42.1.jar
- io.grpc-grpc-grpclb-1.42.1.jar
- io.grpc-grpc-netty-shaded-1.42.1.jar
- io.grpc-grpc-services-1.42.1.jar
- io.grpc-grpc-xds-1.42.1.jar
- io.grpc-grpc-rls-1.42.1.jar
- io.grpc-grpc-all-1.45.1.jar
- io.grpc-grpc-auth-1.45.1.jar
- io.grpc-grpc-context-1.45.1.jar
- io.grpc-grpc-core-1.45.1.jar
- io.grpc-grpc-netty-1.45.1.jar
- io.grpc-grpc-protobuf-1.45.1.jar
- io.grpc-grpc-protobuf-lite-1.45.1.jar
- io.grpc-grpc-stub-1.45.1.jar
- io.grpc-grpc-alts-1.45.1.jar
- io.grpc-grpc-api-1.45.1.jar
- io.grpc-grpc-grpclb-1.45.1.jar
- io.grpc-grpc-netty-shaded-1.45.1.jar
- io.grpc-grpc-services-1.45.1.jar
- io.grpc-grpc-xds-1.45.1.jar
- io.grpc-grpc-rls-1.45.1.jar
- com.google.auto.service-auto-service-annotations-1.0.jar
* Perfmark
- io.perfmark-perfmark-api-0.19.0.jar
* OpenCensus
- io.opencensus-opencensus-api-0.18.0.jar
- io.opencensus-opencensus-contrib-http-util-0.24.0.jar
- io.opencensus-opencensus-api-0.28.0.jar
- io.opencensus-opencensus-contrib-http-util-0.28.0.jar
- io.opencensus-opencensus-proto-0.2.0.jar
* Jodah
- net.jodah-typetools-0.5.0.jar
Expand Down Expand Up @@ -529,9 +529,10 @@ The Apache Software License, Version 2.0
* Snappy Java
- org.xerial.snappy-snappy-java-1.1.7.jar
* Google HTTP Client
- com.google.http-client-google-http-client-jackson2-1.38.0.jar
- com.google.http-client-google-http-client-1.38.0.jar
- com.google.auto.value-auto-value-annotations-1.7.4.jar
- com.google.http-client-google-http-client-jackson2-1.41.0.jar
- com.google.http-client-google-http-client-gson-1.41.0.jar
- com.google.http-client-google-http-client-1.41.0.jar
- com.google.auto.value-auto-value-annotations-1.9.jar
- com.google.re2j-re2j-1.5.jar
* Jetcd
- io.etcd-jetcd-common-0.5.11.jar
Expand All @@ -541,8 +542,8 @@ The Apache Software License, Version 2.0

BSD 3-clause "New" or "Revised" License
* Google auth library
- com.google.auth-google-auth-library-credentials-0.22.2.jar -- licenses/LICENSE-google-auth-library.txt
- com.google.auth-google-auth-library-oauth2-http-0.22.2.jar -- licenses/LICENSE-google-auth-library.txt
- com.google.auth-google-auth-library-credentials-1.4.0.jar -- licenses/LICENSE-google-auth-library.txt
- com.google.auth-google-auth-library-oauth2-http-1.4.0.jar -- licenses/LICENSE-google-auth-library.txt
* LevelDB -- (included in org.rocksdb.*.jar) -- licenses/LICENSE-LevelDB.txt
* JSR305 -- com.google.code.findbugs-jsr305-3.0.2.jar -- licenses/LICENSE-JSR305.txt
* JLine -- jline-jline-2.14.6.jar -- licenses/LICENSE-JLine.txt
Expand All @@ -561,8 +562,8 @@ MIT License

Protocol Buffers License
* Protocol Buffers
- com.google.protobuf-protobuf-java-3.16.1.jar -- licenses/LICENSE-protobuf.txt
- com.google.protobuf-protobuf-java-util-3.16.1.jar -- licenses/LICENSE-protobuf.txt
- com.google.protobuf-protobuf-java-3.19.2.jar -- licenses/LICENSE-protobuf.txt
- com.google.protobuf-protobuf-java-util-3.19.2.jar -- licenses/LICENSE-protobuf.txt

CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
* Java Annotations API
Expand Down
31 changes: 28 additions & 3 deletions pom.xml
Expand Up @@ -131,9 +131,10 @@ flexible messaging model and an intuitive client API.</description>
<puppycrawl.checkstyle.version>8.37</puppycrawl.checkstyle.version>
<dockerfile-maven.version>1.4.13</dockerfile-maven.version>
<typetools.version>0.5.0</typetools.version>
<protobuf3.version>3.16.1</protobuf3.version>
<protobuf3.version>3.19.2</protobuf3.version>
<protoc3.version>${protobuf3.version}</protoc3.version>
<grpc.version>1.42.1</grpc.version>
<grpc.version>1.45.1</grpc.version>
<google-http-client.version>1.41.0</google-http-client.version>
<perfmark.version>0.19.0</perfmark.version>
<protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
<gson.version>2.8.9</gson.version>
Expand Down Expand Up @@ -165,7 +166,7 @@ flexible messaging model and an intuitive client API.</description>
<debezium.postgresql.version>42.3.3</debezium.postgresql.version>
<debezium.mysql.version>8.0.28</debezium.mysql.version>
<jsonwebtoken.version>0.11.1</jsonwebtoken.version>
<opencensus.version>0.18.0</opencensus.version>
<opencensus.version>0.28.0</opencensus.version>
<hbase.version>2.4.9</hbase.version>
<guava.version>31.0.1-jre</guava.version>
<jcip.version>1.0</jcip.version>
Expand Down Expand Up @@ -1004,6 +1005,24 @@ flexible messaging model and an intuitive client API.</description>
<version>${grpc.version}</version>
</dependency>

<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<version>${google-http-client.version}</version>
</dependency>

<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson2</artifactId>
<version>${google-http-client.version}</version>
</dependency>

<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-gson</artifactId>
<version>${google-http-client.version}</version>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
Expand Down Expand Up @@ -1160,6 +1179,12 @@ flexible messaging model and an intuitive client API.</description>
<version>${opencensus.version}</version>
</dependency>

<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-http-util</artifactId>
<version>${opencensus.version}</version>
</dependency>

<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-metrics</artifactId>
Expand Down
20 changes: 10 additions & 10 deletions pulsar-sql/presto-distribution/LICENSE
Expand Up @@ -258,14 +258,14 @@ The Apache Software License, Version 2.0
- netty-transport-native-unix-common-4.1.76.Final-linux-x86_64.jar
- netty-codec-http2-4.1.76.Final.jar
* GRPC
- 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
- grpc-api-1.45.1.jar
- grpc-context-1.45.1.jar
- grpc-core-1.45.1.jar
- grpc-grpclb-1.45.1.jar
- grpc-netty-1.45.1.jar
- grpc-protobuf-1.45.1.jar
- grpc-protobuf-lite-1.45.1.jar
- grpc-stub-1.45.1.jar
* JEtcd
- jetcd-common-0.5.11.jar
- jetcd-core-0.5.11.jar
Expand Down Expand Up @@ -483,8 +483,8 @@ The Apache Software License, Version 2.0

Protocol Buffers License
* Protocol Buffers
- protobuf-java-3.16.1.jar
- protobuf-java-util-3.16.1.jar
- protobuf-java-3.19.2.jar
- protobuf-java-util-3.19.2.jar
- proto-google-common-protos-2.0.1.jar

BSD 3-clause "New" or "Revised" License
Expand Down

0 comments on commit c282f1f

Please sign in to comment.