Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bookkeeper-dist/all/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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.75.Final/*",
"netty-4.1.77.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
Original file line number Diff line number Diff line change
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.75.Final/*",
"netty-4.1.77.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
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,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.75.Final/*",
"netty-4.1.77.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
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,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.75.Final/*</include>
<include>netty-4.1.77.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
Original file line number Diff line number Diff line change
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.75.Final/*</include>
<include>netty-4.1.77.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
Original file line number Diff line number Diff line change
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.75.Final/*</include>
<include>netty-4.1.77.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
158 changes: 79 additions & 79 deletions bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt

Large diffs are not rendered by default.

154 changes: 77 additions & 77 deletions bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt

Large diffs are not rendered by default.

158 changes: 79 additions & 79 deletions bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt

Large diffs are not rendered by default.

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

------------------------------------------------------------------------------------
- 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
- lib/io.netty-netty-buffer-4.1.77.Final.jar
- lib/io.netty-netty-codec-4.1.77.Final.jar
- lib/io.netty-netty-codec-dns-4.1.77.Final.jar
- lib/io.netty-netty-codec-http-4.1.77.Final.jar
- lib/io.netty-netty-codec-http2-4.1.77.Final.jar
- lib/io.netty-netty-codec-socks-4.1.77.Final.jar
- lib/io.netty-netty-common-4.1.77.Final.jar
- lib/io.netty-netty-handler-4.1.77.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.77.Final.jar
- lib/io.netty-netty-resolver-4.1.77.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.77.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.52.Final.jar
- lib/io.netty-netty-transport-4.1.77.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.77.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.77.Final.jar


The Netty Project
Expand Down
40 changes: 20 additions & 20 deletions bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

------------------------------------------------------------------------------------
- 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
- lib/io.netty-netty-buffer-4.1.77.Final.jar
- lib/io.netty-netty-codec-4.1.77.Final.jar
- lib/io.netty-netty-codec-http-4.1.77.Final.jar
- lib/io.netty-netty-codec-http2-4.1.77.Final.jar
- lib/io.netty-netty-codec-socks-4.1.77.Final.jar
- lib/io.netty-netty-common-4.1.77.Final.jar
- lib/io.netty-netty-handler-4.1.77.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.77.Final.jar
- lib/io.netty-netty-resolver-4.1.77.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.52.Final.jar
- lib/io.netty-netty-transport-4.1.77.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.77.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.77.Final.jar


The Netty Project
Expand Down
44 changes: 22 additions & 22 deletions bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

------------------------------------------------------------------------------------
- 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
- lib/io.netty-netty-buffer-4.1.77.Final.jar
- lib/io.netty-netty-codec-4.1.77.Final.jar
- lib/io.netty-netty-codec-dns-4.1.77.Final.jar
- lib/io.netty-netty-codec-http-4.1.77.Final.jar
- lib/io.netty-netty-codec-http2-4.1.77.Final.jar
- lib/io.netty-netty-codec-socks-4.1.77.Final.jar
- lib/io.netty-netty-common-4.1.77.Final.jar
- lib/io.netty-netty-handler-4.1.77.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.77.Final.jar
- lib/io.netty-netty-resolver-4.1.77.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.77.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.52.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.52.Final.jar
- lib/io.netty-netty-transport-4.1.77.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.77.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.77.Final.jar


The Netty Project
Expand Down
4 changes: 2 additions & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ depVersions = [
lombok: "1.18.22",
lz4: "1.3.0",
mockito: "3.12.4",
netty: "4.1.75.Final",
nettyTcnativeBoringSsl: "2.0.50.Final",
netty: "4.1.77.Final",
nettyTcnativeBoringSsl: "2.0.52.Final",
powermock: "2.0.2",
prometheus: "0.15.0",
protobuf: "3.16.1",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@
<log4j.version>2.17.2</log4j.version>
<lz4.version>1.3.0</lz4.version>
<mockito.version>3.12.4</mockito.version>
<netty.version>4.1.75.Final</netty.version>
<netty-boringssl.version>2.0.50.Final</netty-boringssl.version>
<netty.version>4.1.77.Final</netty.version>
<netty-boringssl.version>2.0.52.Final</netty-boringssl.version>
<ostrich.version>9.1.3</ostrich.version>
<powermock.version>2.0.9</powermock.version>
<prometheus.version>0.15.0</prometheus.version>
Expand Down
141 changes: 0 additions & 141 deletions src/owasp-dependency-check-suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -194,146 +194,5 @@
<sha1>9b78a289a3aa34eb47fac8c432f664fc140387df</sha1>
<cve>CVE-2021-28165</cve>
</suppress>
<!-- Netty false positive https://github.com/netty/netty-tcnative/issues/710 -->
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-linux-x86_64.jar
]]></notes>
<sha1>5bb97a0278391b55db468cab30b883dc85a07770</sha1>
<cve>CVE-2015-1346</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-linux-x86_64.jar
]]></notes>
<sha1>5bb97a0278391b55db468cab30b883dc85a07770</sha1>
<cve>CVE-2011-1797</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-linux-x86_64.jar
]]></notes>
<sha1>5bb97a0278391b55db468cab30b883dc85a07770</sha1>
<cve>CVE-2017-7000</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-linux-x86_64.jar
]]></notes>
<sha1>5bb97a0278391b55db468cab30b883dc85a07770</sha1>
<cve>CVE-2015-1205</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-linux-aarch_64.jar
]]></notes>
<sha1>028abc2b9c67d195a906997fec08dd0262bd859a</sha1>
<cve>CVE-2015-1346</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-linux-aarch_64.jar
]]></notes>
<sha1>028abc2b9c67d195a906997fec08dd0262bd859a</sha1>
<cve>CVE-2011-1797</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-linux-aarch_64.jar
]]></notes>
<sha1>028abc2b9c67d195a906997fec08dd0262bd859a</sha1>
<cve>CVE-2017-7000</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-linux-aarch_64.jar
]]></notes>
<sha1>028abc2b9c67d195a906997fec08dd0262bd859a</sha1>
<cve>CVE-2015-1205</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-osx-x86_64.jar
]]></notes>
<sha1>ffc6648b33707f51dc64f2466d6f98a4f6a9ffd7</sha1>
<cve>CVE-2015-1346</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-osx-x86_64.jar
]]></notes>
<sha1>ffc6648b33707f51dc64f2466d6f98a4f6a9ffd7</sha1>
<cve>CVE-2011-1797</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-osx-x86_64.jar
]]></notes>
<sha1>ffc6648b33707f51dc64f2466d6f98a4f6a9ffd7</sha1>
<cve>CVE-2017-7000</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-osx-x86_64.jar
]]></notes>
<sha1>ffc6648b33707f51dc64f2466d6f98a4f6a9ffd7</sha1>
<cve>CVE-2015-1205</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-osx-aarch_64.jar
]]></notes>
<sha1>6ee88ad317bd9e492e7bf48eda9120a83085e464</sha1>
<cve>CVE-2015-1346</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-osx-aarch_64.jar
]]></notes>
<sha1>6ee88ad317bd9e492e7bf48eda9120a83085e464</sha1>
<cve>CVE-2011-1797</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-osx-aarch_64.jar
]]></notes>
<sha1>6ee88ad317bd9e492e7bf48eda9120a83085e464</sha1>
<cve>CVE-2017-7000</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-osx-aarch_64.jar
]]></notes>
<sha1>6ee88ad317bd9e492e7bf48eda9120a83085e464</sha1>
<cve>CVE-2015-1205</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-windows-x86_64.jar
]]></notes>
<sha1>b6211fb3224bfd2dadf10273a15211f592174652</sha1>
<cve>CVE-2015-1346</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-windows-x86_64.jar
]]></notes>
<sha1>b6211fb3224bfd2dadf10273a15211f592174652</sha1>
<cve>CVE-2011-1797</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-windows-x86_64.jar
]]></notes>
<sha1>b6211fb3224bfd2dadf10273a15211f592174652</sha1>
<cve>CVE-2017-7000</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: netty-tcnative-boringssl-static-2.0.50.Final-windows-x86_64.jar
]]></notes>
<sha1>b6211fb3224bfd2dadf10273a15211f592174652</sha1>
<cve>CVE-2015-1205</cve>
</suppress>
</suppressions>