diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 27a4f3c857d..05920524464 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -214,7 +214,7 @@ Apache Software License, Version 2. - lib/commons-cli-commons-cli-1.2.jar [5] - lib/commons-codec-commons-codec-1.6.jar [6] - lib/commons-configuration-commons-configuration-1.10.jar [7] -- lib/commons-io-commons-io-2.7.jar [8] +- lib/commons-io-commons-io-2.11.0.jar [8] - lib/commons-lang-commons-lang-2.6.jar [9] - lib/commons-logging-commons-logging-1.1.1.jar [10] - lib/io.netty-netty-buffer-4.1.74.Final.jar [11] @@ -229,7 +229,7 @@ Apache Software License, Version 2. - lib/io.netty-netty-resolver-4.1.74.Final.jar [11] - lib/io.netty-netty-resolver-dns-4.1.74.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.48.Final.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.48.Final.jar [11] +- lib/io.netty-netty-tcnative-2.0.48.Final.jar [11] - lib/io.netty-netty-transport-4.1.74.Final.jar [11] - lib/io.netty-netty-transport-classes-epoll-4.1.74.Final.jar [11] - lib/io.netty-netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar [11] @@ -250,9 +250,9 @@ Apache Software License, Version 2. - lib/net.java.dev.jna-jna-3.2.7.jar [18] - lib/org.apache.commons-commons-collections4-4.1.jar [19] - lib/org.apache.commons-commons-lang3-3.6.jar [20] -- lib/org.apache.zookeeper-zookeeper-3.6.2.jar [21] -- lib/org.apache.zookeeper-zookeeper-jute-3.6.2.jar [21] -- lib/org.apache.zookeeper-zookeeper-3.6.2-tests.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.8.0.jar [21] +- lib/org.apache.zookeeper-zookeeper-jute-3.8.0.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.8.0-tests.jar [21] - lib/org.eclipse.jetty-jetty-http-9.4.43.v20210629.jar [22] - lib/org.eclipse.jetty-jetty-io-9.4.43.v20210629.jar [22] - lib/org.eclipse.jetty-jetty-security-9.4.43.v20210629.jar [22] @@ -290,7 +290,7 @@ Apache Software License, Version 2. - lib/org.apache.curator-curator-recipes-5.1.0.jar [34] - lib/org.inferred-freebuilder-2.7.0.jar [35] - lib/com.google.errorprone-error_prone_annotations-2.9.0.jar [36] -- lib/org.apache.yetus-audience-annotations-0.5.0.jar [37] +- lib/org.apache.yetus-audience-annotations-0.12.0.jar [37] - lib/org.jctools-jctools-core-2.1.2.jar [38] - lib/org.apache.httpcomponents-httpclient-4.5.13.jar [39] - lib/org.apache.httpcomponents-httpcore-4.4.13.jar [40] @@ -342,7 +342,7 @@ Apache Software License, Version 2. [34] Source available at https://github.com/apache/curator/releases/tag/apache.curator-5.1.0 [35] Source available at https://github.com/inferred/FreeBuilder/tree/v2.7.0 [36] Source available at https://github.com/google/error-prone/tree/v2.9.0 -[37] Source available at https://github.com/apache/yetus/tree/rel/0.5.0 +[37] Source available at https://github.com/apache/yetus/tree/rel/0.12.0 [38] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2 [39] Source available at https://github.com/apache/httpcomponents-client/tree/rel/v4.4.1 [40] Source available at https://github.com/apache/httpcomponents-core/tree/rel/v4.4.1 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index 4ed5c49cc0b..959c4e8e345 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -214,7 +214,7 @@ Apache Software License, Version 2. - lib/commons-cli-commons-cli-1.2.jar [5] - lib/commons-codec-commons-codec-1.6.jar [6] - lib/commons-configuration-commons-configuration-1.10.jar [7] -- lib/commons-io-commons-io-2.7.jar [8] +- lib/commons-io-commons-io-2.11.0.jar [8] - lib/commons-lang-commons-lang-2.6.jar [9] - lib/commons-logging-commons-logging-1.1.1.jar [10] - lib/io.netty-netty-buffer-4.1.74.Final.jar [11] @@ -227,7 +227,7 @@ Apache Software License, Version 2. - lib/io.netty-netty-handler-proxy-4.1.74.Final.jar [11] - lib/io.netty-netty-resolver-4.1.74.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.48.Final.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.48.Final.jar [11] +- lib/io.netty-netty-tcnative-2.0.48.Final.jar [11] - lib/io.netty-netty-transport-4.1.74.Final.jar [11] - lib/io.netty-netty-transport-classes-epoll-4.1.74.Final.jar [11] - lib/io.netty-netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar [11] @@ -239,9 +239,9 @@ Apache Software License, Version 2. - lib/net.java.dev.jna-jna-3.2.7.jar [17] - lib/org.apache.commons-commons-collections4-4.1.jar [18] - lib/org.apache.commons-commons-lang3-3.6.jar [19] -- lib/org.apache.zookeeper-zookeeper-3.6.2.jar [20] -- lib/org.apache.zookeeper-zookeeper-jute-3.6.2.jar [20] -- lib/org.apache.zookeeper-zookeeper-3.6.2-tests.jar [20] +- lib/org.apache.zookeeper-zookeeper-3.8.0.jar [20] +- lib/org.apache.zookeeper-zookeeper-jute-3.8.0.jar [20] +- lib/org.apache.zookeeper-zookeeper-3.8.0-tests.jar [20] - lib/com.beust-jcommander-1.78.jar [23] - lib/net.jpountz.lz4-lz4-1.3.0.jar [25] - lib/com.google.api.grpc-proto-google-common-protos-2.0.1.jar [27] @@ -269,7 +269,7 @@ Apache Software License, Version 2. - lib/org.apache.curator-curator-recipes-5.1.0.jar [33] - lib/org.inferred-freebuilder-2.7.0.jar [34] - lib/com.google.errorprone-error_prone_annotations-2.9.0.jar [35] -- lib/org.apache.yetus-audience-annotations-0.5.0.jar [36] +- lib/org.apache.yetus-audience-annotations-0.12.0.jar [36] - lib/org.jctools-jctools-core-2.1.2.jar [37] - lib/org.apache.httpcomponents-httpclient-4.5.13.jar [38] - lib/org.apache.httpcomponents-httpcore-4.4.13.jar [39] @@ -311,7 +311,7 @@ Apache Software License, Version 2. [33] Source available at https://github.com/apache/curator/tree/apache-curator-5.1.0 [34] Source available at https://github.com/inferred/FreeBuilder/tree/v2.7.0 [35] Source available at https://github.com/google/error-prone/tree/v2.9.0 -[36] Source available at https://github.com/apache/yetus/tree/rel/0.5.0 +[36] Source available at https://github.com/apache/yetus/tree/rel/0.12.0 [37] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2 [38] Source available at https://github.com/apache/httpcomponents-client/tree/rel/v4.4.1 [39] Source available at https://github.com/apache/httpcomponents-core/tree/rel/v4.4.1 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index aeb9fe2eed7..5863564939f 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -214,7 +214,7 @@ Apache Software License, Version 2. - lib/commons-cli-commons-cli-1.2.jar [5] - lib/commons-codec-commons-codec-1.6.jar [6] - lib/commons-configuration-commons-configuration-1.10.jar [7] -- lib/commons-io-commons-io-2.7.jar [8] +- lib/commons-io-commons-io-2.11.0.jar [8] - lib/commons-lang-commons-lang-2.6.jar [9] - lib/commons-logging-commons-logging-1.1.1.jar [10] - lib/io.netty-netty-buffer-4.1.74.Final.jar [11] @@ -229,7 +229,7 @@ Apache Software License, Version 2. - lib/io.netty-netty-resolver-4.1.74.Final.jar [11] - lib/io.netty-netty-resolver-dns-4.1.74.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.48.Final.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.48.Final.jar [11] +- lib/io.netty-netty-tcnative-2.0.48.Final.jar [11] - lib/io.netty-netty-transport-4.1.74.Final.jar [11] - lib/io.netty-netty-transport-classes-epoll-4.1.74.Final.jar [11] - lib/io.netty-netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar [11] @@ -250,9 +250,9 @@ Apache Software License, Version 2. - lib/net.java.dev.jna-jna-3.2.7.jar [18] - lib/org.apache.commons-commons-collections4-4.1.jar [19] - lib/org.apache.commons-commons-lang3-3.6.jar [20] -- lib/org.apache.zookeeper-zookeeper-3.6.2.jar [21] -- lib/org.apache.zookeeper-zookeeper-jute-3.6.2.jar [21] -- lib/org.apache.zookeeper-zookeeper-3.6.2-tests.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.8.0.jar [21] +- lib/org.apache.zookeeper-zookeeper-jute-3.8.0.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.8.0-tests.jar [21] - lib/org.eclipse.jetty-jetty-http-9.4.43.v20210629.jar [22] - lib/org.eclipse.jetty-jetty-io-9.4.43.v20210629.jar [22] - lib/org.eclipse.jetty-jetty-security-9.4.43.v20210629.jar [22] @@ -290,7 +290,7 @@ Apache Software License, Version 2. - lib/org.apache.curator-curator-recipes-5.1.0.jar [34] - lib/org.inferred-freebuilder-2.7.0.jar [35] - lib/com.google.errorprone-error_prone_annotations-2.9.0.jar [36] -- lib/org.apache.yetus-audience-annotations-0.5.0.jar [37] +- lib/org.apache.yetus-audience-annotations-0.12.0.jar [37] - lib/org.jctools-jctools-core-2.1.2.jar [38] - lib/org.apache.httpcomponents-httpclient-4.5.13.jar [39] - lib/org.apache.httpcomponents-httpcore-4.4.13.jar [40] @@ -340,7 +340,7 @@ Apache Software License, Version 2. [34] Source available at https://github.com/apache/curator/releases/tag/apache.curator-5.1.0 [35] Source available at https://github.com/inferred/FreeBuilder/tree/v2.7.0 [36] Source available at https://github.com/google/error-prone/tree/v2.9.0 -[37] Source available at https://github.com/apache/yetus/tree/rel/0.5.0 +[37] Source available at https://github.com/apache/yetus/tree/rel/0.12.0 [38] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2 [39] Source available at https://github.com/apache/httpcomponents-client/tree/rel/v4.4.1 [40] Source available at https://github.com/apache/httpcomponents-core/tree/rel/v4.4.1 diff --git a/dependencies.gradle b/dependencies.gradle index c8aeb48cdb6..d9ddfd15c15 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -84,7 +84,7 @@ depVersions = [ testcontainers: "1.15.1", vertx: "3.9.8", yahooDatasketches: "0.8.3", - zookeeper: "3.6.2", + zookeeper: "3.8.0", ] depLibs = [ @@ -232,8 +232,14 @@ depLibs = [ yahooDatasketches: "com.yahoo.datasketches:sketches-core:${depVersions.yahooDatasketches}", zookeeper: dependencies.create("org.apache.zookeeper:zookeeper:${depVersions.zookeeper}") { exclude group: 'io.netty', module: 'netty-transport-native-epoll' - exclude group: 'log4j', module: 'log4j' - exclude group: 'org.slf4j', module: 'slf4j-log4j12' + exclude group: 'io.netty', module: 'netty-tcnative' + exclude group: 'ch.qos.logback', module: 'logback-classic' + exclude group: 'ch.qos.logback', module: 'logback-core' }, - zookeeperTest: "org.apache.zookeeper:zookeeper:${depVersions.zookeeper}:tests" + zookeeperTest: dependencies.create("org.apache.zookeeper:zookeeper:${depVersions.zookeeper}:tests") { + exclude group: 'io.netty', module: 'netty-transport-native-epoll' + exclude group: 'io.netty', module: 'netty-tcnative' + exclude group: 'ch.qos.logback', module: 'logback-classic' + exclude group: 'ch.qos.logback', module: 'logback-core' + } ]