Skip to content

Commit

Permalink
Upgrade BK to 4.14.4 and Grpc to 1.42.1 (apache#13714)
Browse files Browse the repository at this point in the history
* Upgrade BK to 4.14.4

* Upgrade Grpc to 1.42.1

* Fixed license file

(cherry picked from commit 104adbe)
(cherry picked from commit b85d06e)
  • Loading branch information
merlimat authored and nicoloboschi committed Mar 1, 2022
1 parent 7953fed commit 635f569
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 22 deletions.
43 changes: 22 additions & 21 deletions distribution/server/src/assemble/LICENSE.bin.txt
Expand Up @@ -322,7 +322,7 @@ The Apache Software License, Version 2.0
- com.fasterxml.jackson.module-jackson-module-jsonSchema-2.12.6.jar
* Caffeine -- com.github.ben-manes.caffeine-caffeine-2.9.1.jar
* Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar
* Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-1.17.0.jar
* Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-2.0.1.jar
* Bitbucket -- org.bitbucket.b_c-jose4j-0.7.6.jar
* Gson
- com.google.code.gson-gson-2.8.9.jar
Expand Down Expand Up @@ -435,20 +435,21 @@ 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.33.0.jar
- io.grpc-grpc-auth-1.33.0.jar
- io.grpc-grpc-context-1.33.0.jar
- io.grpc-grpc-core-1.33.0.jar
- io.grpc-grpc-netty-1.33.0.jar
- io.grpc-grpc-protobuf-1.33.0.jar
- io.grpc-grpc-protobuf-lite-1.33.0.jar
- io.grpc-grpc-stub-1.33.0.jar
- io.grpc-grpc-alts-1.33.0.jar
- io.grpc-grpc-api-1.33.0.jar
- io.grpc-grpc-grpclb-1.33.0.jar
- io.grpc-grpc-netty-shaded-1.33.0.jar
- io.grpc-grpc-services-1.33.0.jar
- io.grpc-grpc-xds-1.33.0.jar
- 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
* Perfmark
- io.perfmark-perfmark-api-0.19.0.jar
* OpenCensus
Expand Down Expand Up @@ -495,17 +496,17 @@ 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.34.0.jar
- com.google.http-client-google-http-client-1.34.0.jar
- com.google.auto.value-auto-value-annotations-1.7.jar
- com.google.re2j-re2j-1.2.jar
- 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.re2j-re2j-1.5.jar
* IPAddress
- com.github.seancfoley-ipaddress-5.3.3.jar

BSD 3-clause "New" or "Revised" License
* Google auth library
- com.google.auth-google-auth-library-credentials-0.20.0.jar -- licenses/LICENSE-google-auth-library.txt
- com.google.auth-google-auth-library-oauth2-http-0.20.0.jar -- licenses/LICENSE-google-auth-library.txt
- 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
* LevelDB -- (included in org.rocksdb.*.jar) -- licenses/LICENSE-LevelDB.txt
* JSR305 -- com.google.code.findbugs-jsr305-3.0.2.jar -- licenses/LICENSE-JSR305.txt

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -132,7 +132,7 @@ flexible messaging model and an intuitive client API.</description>
<typetools.version>0.5.0</typetools.version>
<protobuf3.version>3.16.1</protobuf3.version>
<protoc3.version>${protobuf3.version}</protoc3.version>
<grpc.version>1.33.0</grpc.version>
<grpc.version>1.42.1</grpc.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

0 comments on commit 635f569

Please sign in to comment.