Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump netty version to 4.1.75.Final, grpc to 1.45.1 #3163

Merged
merged 1 commit into from Apr 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bookkeeper-dist/all/build.gradle
Expand Up @@ -60,7 +60,7 @@ def depLicences = [
"javax.servlet-api-4.0.0/CDDL+GPL-1.1",
"bouncycastle-1.0.2.3/LICENSE.html",
"jsr-305/LICENSE",
"netty-4.1.74.Final/*",
"netty-4.1.75.Final/*",
"paranamer-2.8/LICENSE.txt",
"protobuf-3.14.0/LICENSE",
"protobuf-3.12.0/LICENSE",
Expand Down
2 changes: 1 addition & 1 deletion bookkeeper-dist/bkctl/build.gradle
Expand Up @@ -49,7 +49,7 @@ releaseArtifacts {
def depLicences = [
"checker-qual-3.5.0/LICENSE",
"google-auth-library-credentials-0.20.0/LICENSE",
"netty-4.1.74.Final/*",
"netty-4.1.75.Final/*",
"bouncycastle-1.0.2.3/LICENSE.html",
"protobuf-3.14.0/LICENSE",
"protobuf-3.12.0/LICENSE",
Expand Down
2 changes: 1 addition & 1 deletion bookkeeper-dist/server/build.gradle
Expand Up @@ -53,7 +53,7 @@ def depLicences = [
"checker-qual-3.5.0/LICENSE",
"google-auth-library-credentials-0.20.0/LICENSE",
"javax.servlet-api-4.0.0/CDDL+GPL-1.1",
"netty-4.1.74.Final/*",
"netty-4.1.75.Final/*",
"bouncycastle-1.0.2.3/LICENSE.html",
"protobuf-3.14.0/LICENSE",
"protobuf-3.12.0/LICENSE",
Expand Down
2 changes: 1 addition & 1 deletion bookkeeper-dist/src/assemble/bin-all.xml
Expand Up @@ -59,7 +59,7 @@
<include>javax.servlet-api-4.0.0/CDDL+GPL-1.1</include>
<include>bouncycastle-1.0.2.3/LICENSE.html</include>
<include>jsr-305/LICENSE</include>
<include>netty-4.1.74.Final/*</include>
<include>netty-4.1.75.Final/*</include>
<include>paranamer-2.8/LICENSE.txt</include>
<include>protobuf-3.14.0/LICENSE</include>
<include>protobuf-3.12.0/LICENSE</include>
Expand Down
2 changes: 1 addition & 1 deletion bookkeeper-dist/src/assemble/bin-server.xml
Expand Up @@ -52,7 +52,7 @@
<include>checker-qual-3.5.0/LICENSE</include>
<include>google-auth-library-credentials-0.20.0/LICENSE</include>
<include>javax.servlet-api-4.0.0/CDDL+GPL-1.1</include>
<include>netty-4.1.74.Final/*</include>
<include>netty-4.1.75.Final/*</include>
<include>bouncycastle-1.0.2.3/LICENSE.html</include>
<include>protobuf-3.14.0/LICENSE</include>
<include>protobuf-3.12.0/LICENSE</include>
Expand Down
2 changes: 1 addition & 1 deletion bookkeeper-dist/src/assemble/bkctl.xml
Expand Up @@ -69,7 +69,7 @@
<includes>
<include>checker-qual-3.5.0/LICENSE</include>
<include>google-auth-library-credentials-0.20.0/LICENSE</include>
<include>netty-4.1.74.Final/*</include>
<include>netty-4.1.75.Final/*</include>
<include>bouncycastle-1.0.2.3/LICENSE.html</include>
<include>protobuf-3.14.0/LICENSE</include>
<include>protobuf-3.12.0/LICENSE</include>
Expand Down
211 changes: 108 additions & 103 deletions bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt

Large diffs are not rendered by default.

207 changes: 106 additions & 101 deletions bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt

Large diffs are not rendered by default.

211 changes: 108 additions & 103 deletions bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt

Large diffs are not rendered by default.

57 changes: 31 additions & 26 deletions bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
Expand Up @@ -22,23 +22,28 @@ LongAdder), which was released with the following comments:
http://creativecommons.org/publicdomain/zero/1.0/

------------------------------------------------------------------------------------
- lib/io.netty-netty-buffer-4.1.74.Final.jar
- lib/io.netty-netty-codec-4.1.74.Final.jar
- lib/io.netty-netty-codec-dns-4.1.74.Final.jar
- lib/io.netty-netty-codec-http-4.1.74.Final.jar
- lib/io.netty-netty-codec-http2-4.1.74.Final.jar
- lib/io.netty-netty-codec-socks-4.1.74.Final.jar
- lib/io.netty-netty-common-4.1.74.Final.jar
- lib/io.netty-netty-handler-4.1.74.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.74.Final.jar
- lib/io.netty-netty-resolver-4.1.74.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.74.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.48.Final.jar
- lib/io.netty-netty-tcnative-classes-2.0.48.Final.jar
- lib/io.netty-netty-transport-4.1.74.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.74.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.74.Final.jar
- lib/io.netty-netty-buffer-4.1.75.Final.jar
- lib/io.netty-netty-codec-4.1.75.Final.jar
- lib/io.netty-netty-codec-dns-4.1.75.Final.jar
- lib/io.netty-netty-codec-http-4.1.75.Final.jar
- lib/io.netty-netty-codec-http2-4.1.75.Final.jar
- lib/io.netty-netty-codec-socks-4.1.75.Final.jar
- lib/io.netty-netty-common-4.1.75.Final.jar
- lib/io.netty-netty-handler-4.1.75.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.75.Final.jar
- lib/io.netty-netty-resolver-4.1.75.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.75.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.50.Final.jar
- lib/io.netty-netty-transport-4.1.75.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.75.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.75.Final-linux-x86_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.75.Final.jar


The Netty Project
Expand Down Expand Up @@ -122,15 +127,15 @@ granted provided that the copyright notice appears in all copies.
Copyright 2010 Cedric Beust cedric@beust.com

------------------------------------------------------------------------------------
- lib/io.grpc-grpc-all-1.42.1.jar
- lib/io.grpc-grpc-auth-1.42.1.jar
- lib/io.grpc-grpc-context-1.42.1.jar
- lib/io.grpc-grpc-core-1.42.1.jar
- lib/io.grpc-grpc-netty-1.42.1.jar
- lib/io.grpc-grpc-protobuf-1.42.1.jar
- lib/io.grpc-grpc-protobuf-lite-1.42.1.jar
- lib/io.grpc-grpc-stub-1.42.1.jar
- lib/io.grpc-grpc-testing-1.42.1.jar
- lib/io.grpc-grpc-all-1.45.1.jar
- lib/io.grpc-grpc-auth-1.45.1.jar
- lib/io.grpc-grpc-context-1.45.1.jar
- lib/io.grpc-grpc-core-1.45.1.jar
- lib/io.grpc-grpc-netty-1.45.1.jar
- lib/io.grpc-grpc-protobuf-1.45.1.jar
- lib/io.grpc-grpc-protobuf-lite-1.45.1.jar
- lib/io.grpc-grpc-stub-1.45.1.jar
- lib/io.grpc-grpc-testing-1.45.1.jar

Copyright 2014, gRPC Authors All rights reserved.

Expand Down
53 changes: 29 additions & 24 deletions bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt
Expand Up @@ -5,21 +5,26 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

------------------------------------------------------------------------------------
- lib/io.netty-netty-buffer-4.1.74.Final.jar
- lib/io.netty-netty-codec-4.1.74.Final.jar
- lib/io.netty-netty-codec-http-4.1.74.Final.jar
- lib/io.netty-netty-codec-http2-4.1.74.Final.jar
- lib/io.netty-netty-codec-socks-4.1.74.Final.jar
- lib/io.netty-netty-common-4.1.74.Final.jar
- lib/io.netty-netty-handler-4.1.74.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.74.Final.jar
- lib/io.netty-netty-resolver-4.1.74.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.48.Final.jar
- lib/io.netty-netty-tcnative-classes-2.0.48.Final.jar
- lib/io.netty-netty-transport-4.1.74.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.74.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.74.Final.jar
- lib/io.netty-netty-buffer-4.1.75.Final.jar
- lib/io.netty-netty-codec-4.1.75.Final.jar
- lib/io.netty-netty-codec-http-4.1.75.Final.jar
- lib/io.netty-netty-codec-http2-4.1.75.Final.jar
- lib/io.netty-netty-codec-socks-4.1.75.Final.jar
- lib/io.netty-netty-common-4.1.75.Final.jar
- lib/io.netty-netty-handler-4.1.75.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.75.Final.jar
- lib/io.netty-netty-resolver-4.1.75.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.50.Final.jar
- lib/io.netty-netty-transport-4.1.75.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.75.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.75.Final-linux-x86_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.75.Final.jar


The Netty Project
Expand Down Expand Up @@ -49,15 +54,15 @@ under the License.
Copyright 2010 Cedric Beust cedric@beust.com

------------------------------------------------------------------------------------
- lib/io.grpc-grpc-all-1.42.1.jar
- lib/io.grpc-grpc-auth-1.42.1.jar
- lib/io.grpc-grpc-context-1.42.1.jar
- lib/io.grpc-grpc-core-1.42.1.jar
- lib/io.grpc-grpc-netty-1.42.1.jar
- lib/io.grpc-grpc-protobuf-1.42.1.jar
- lib/io.grpc-grpc-protobuf-lite-1.42.1.jar
- lib/io.grpc-grpc-stub-1.42.1.jar
- lib/io.grpc-grpc-testing-1.42.1.jar
- lib/io.grpc-grpc-all-1.45.1.jar
- lib/io.grpc-grpc-auth-1.45.1.jar
- lib/io.grpc-grpc-context-1.45.1.jar
- lib/io.grpc-grpc-core-1.45.1.jar
- lib/io.grpc-grpc-netty-1.45.1.jar
- lib/io.grpc-grpc-protobuf-1.45.1.jar
- lib/io.grpc-grpc-protobuf-lite-1.45.1.jar
- lib/io.grpc-grpc-stub-1.45.1.jar
- lib/io.grpc-grpc-testing-1.45.1.jar

Copyright 2014, gRPC Authors All rights reserved.

Expand Down
57 changes: 31 additions & 26 deletions bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
Expand Up @@ -5,23 +5,28 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

------------------------------------------------------------------------------------
- lib/io.netty-netty-buffer-4.1.74.Final.jar
- lib/io.netty-netty-codec-4.1.74.Final.jar
- lib/io.netty-netty-codec-dns-4.1.74.Final.jar
- lib/io.netty-netty-codec-http-4.1.74.Final.jar
- lib/io.netty-netty-codec-http2-4.1.74.Final.jar
- lib/io.netty-netty-codec-socks-4.1.74.Final.jar
- lib/io.netty-netty-common-4.1.74.Final.jar
- lib/io.netty-netty-handler-4.1.74.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.74.Final.jar
- lib/io.netty-netty-resolver-4.1.74.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.74.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.48.Final.jar
- lib/io.netty-netty-tcnative-classes-2.0.48.Final.jar
- lib/io.netty-netty-transport-4.1.74.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.74.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.74.Final.jar
- lib/io.netty-netty-buffer-4.1.75.Final.jar
- lib/io.netty-netty-codec-4.1.75.Final.jar
- lib/io.netty-netty-codec-dns-4.1.75.Final.jar
- lib/io.netty-netty-codec-http-4.1.75.Final.jar
- lib/io.netty-netty-codec-http2-4.1.75.Final.jar
- lib/io.netty-netty-codec-socks-4.1.75.Final.jar
- lib/io.netty-netty-common-4.1.75.Final.jar
- lib/io.netty-netty-handler-4.1.75.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.75.Final.jar
- lib/io.netty-netty-resolver-4.1.75.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.75.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.50.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.50.Final.jar
- lib/io.netty-netty-transport-4.1.75.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.75.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.75.Final-linux-x86_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.75.Final.jar


The Netty Project
Expand Down Expand Up @@ -105,15 +110,15 @@ granted provided that the copyright notice appears in all copies.
Copyright 2010 Cedric Beust cedric@beust.com

------------------------------------------------------------------------------------
- lib/io.grpc-grpc-all-1.42.1.jar
- lib/io.grpc-grpc-auth-1.42.1.jar
- lib/io.grpc-grpc-context-1.42.1.jar
- lib/io.grpc-grpc-core-1.42.1.jar
- lib/io.grpc-grpc-netty-1.42.1.jar
- lib/io.grpc-grpc-protobuf-1.42.1.jar
- lib/io.grpc-grpc-protobuf-lite-1.42.1.jar
- lib/io.grpc-grpc-stub-1.42.1.jar
- lib/io.grpc-grpc-testing-1.42.1.jar
- lib/io.grpc-grpc-all-1.45.1.jar
- lib/io.grpc-grpc-auth-1.45.1.jar
- lib/io.grpc-grpc-context-1.45.1.jar
- lib/io.grpc-grpc-core-1.45.1.jar
- lib/io.grpc-grpc-netty-1.45.1.jar
- lib/io.grpc-grpc-protobuf-1.45.1.jar
- lib/io.grpc-grpc-protobuf-lite-1.45.1.jar
- lib/io.grpc-grpc-stub-1.45.1.jar
- lib/io.grpc-grpc-testing-1.45.1.jar

Copyright 2014, gRPC Authors All rights reserved.

Expand Down
6 changes: 3 additions & 3 deletions dependencies.gradle
Expand Up @@ -43,7 +43,7 @@ depVersions = [
freebuilder: "2.7.0",
googleHTTPClient: "1.34.0",
gradleTooling: "4.0.1",
grpc: "1.42.1",
grpc: "1.45.1",
groovy: "2.5.8",
guava: "31.0.1-jre",
hamcrest: "1.3",
Expand All @@ -68,8 +68,8 @@ depVersions = [
lombok: "1.18.22",
lz4: "1.3.0",
mockito: "3.12.4",
netty: "4.1.74.Final",
nettyTcnativeBoringSsl: "2.0.48.Final",
netty: "4.1.75.Final",
nettyTcnativeBoringSsl: "2.0.50.Final",
powermock: "2.0.2",
prometheus: "0.8.1",
protobuf: "3.16.1",
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Expand Up @@ -130,7 +130,7 @@
<freebuilder.version>2.7.0</freebuilder.version>
<google.code.version>3.0.2</google.code.version>
<google.errorprone.version>2.9.0</google.errorprone.version>
<grpc.version>1.42.1</grpc.version>
<grpc.version>1.45.1</grpc.version>
<guava.version>31.0.1-jre</guava.version>
<kerby.version>1.1.1</kerby.version>
<hadoop.version>2.10.0</hadoop.version>
Expand All @@ -152,15 +152,15 @@
<log4j.version>2.17.1</log4j.version>
<lz4.version>1.3.0</lz4.version>
<mockito.version>3.12.4</mockito.version>
<netty.version>4.1.74.Final</netty.version>
<netty-boringssl.version>2.0.48.Final</netty-boringssl.version>
<netty.version>4.1.75.Final</netty.version>
<netty-boringssl.version>2.0.50.Final</netty-boringssl.version>
<ostrich.version>9.1.3</ostrich.version>
<powermock.version>2.0.2</powermock.version>
<prometheus.version>0.8.1</prometheus.version>
<datasketches.version>0.8.3</datasketches.version>
<httpclient.version>4.5.13</httpclient.version>
<protobuf.version>3.17.2</protobuf.version>
<protoc3.version>3.17.2</protoc3.version>
<protobuf.version>3.19.2</protobuf.version>
<protoc3.version>3.19.2</protoc3.version>
<protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
<reflections.version>0.9.11</reflections.version>
<rocksdb.version>6.29.4.1</rocksdb.version>
Expand Down