From 2f6ca144b758501ca5f77fc10137e83defbcc4a3 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 11 Jun 2024 20:20:33 +0300 Subject: [PATCH 01/14] Upgrade to Netty 4.1.111.Final --- .../src/main/resources/LICENSE-all.bin.txt | 90 +++++++++---------- .../src/main/resources/LICENSE-bkctl.bin.txt | 86 +++++++++--------- .../src/main/resources/LICENSE-server.bin.txt | 90 +++++++++---------- .../src/main/resources/NOTICE-all.bin.txt | 32 +++---- .../src/main/resources/NOTICE-bkctl.bin.txt | 28 +++--- .../src/main/resources/NOTICE-server.bin.txt | 32 +++---- pom.xml | 2 +- 7 files changed, 180 insertions(+), 180 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 8d0433f0028..da34cdf2a07 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -217,17 +217,17 @@ Apache Software License, Version 2. - lib/commons-io-commons-io-2.7.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.108.Final.jar [11] -- lib/io.netty-netty-codec-4.1.108.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.108.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.108.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.108.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.108.Final.jar [11] -- lib/io.netty-netty-common-4.1.108.Final.jar [11] -- lib/io.netty-netty-handler-4.1.108.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.108.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.108.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.111.Final.jar [11] +- lib/io.netty-netty-common-4.1.111.Final.jar [11] +- lib/io.netty-netty-handler-4.1.111.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.111.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.111.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.111.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11] @@ -235,14 +235,14 @@ Apache Software License, Version 2. - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar [11] -- lib/io.netty-netty-transport-4.1.108.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-transport-4.1.111.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.111.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.25.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.111.Final.jar [11] - lib/io.prometheus-simpleclient-0.15.0.jar [12] - lib/io.prometheus-simpleclient_common-0.15.0.jar [12] - lib/io.prometheus-simpleclient_hotspot-0.15.0.jar [12] @@ -364,7 +364,7 @@ Apache Software License, Version 2. [8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.7 [9] Source available at https://github.com/apache/commons-lang/tree/LANG_2_6 [10] Source available at https://github.com/apache/commons-logging/tree/commons-logging-1.1.1 -[11] Source available at https://github.com/netty/netty/tree/netty-4.1.108.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.111.Final [12] Source available at https://github.com/prometheus/client_java/tree/parent-0.15.0 [13] Source available at https://github.com/vert-x3/vertx-auth/tree/4.3.2 [14] Source available at https://github.com/vert-x3/vertx-bridge-common/tree/4.3.2 @@ -408,9 +408,9 @@ Apache Software License, Version 2. [57] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.108.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.111.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.108.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.111.Final.jar contains the extensions to Java Collections Framework which has been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene: * LICENSE: @@ -419,7 +419,7 @@ been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene: * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/ * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -427,7 +427,7 @@ Base64 Encoder and Decoder, which can be obtained at: * HOMEPAGE: * http://iharder.sourceforge.net/current/java/base64/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -435,7 +435,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -443,7 +443,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -453,7 +453,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression and decompression library written by Matthew J. Francis. It can be obtained at: * LICENSE: @@ -461,7 +461,7 @@ and decompression library written by Matthew J. Francis. It can be obtained at: * HOMEPAGE: * https://code.google.com/p/jbzip2/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct the suffix array and the Burrows-Wheeler transformed string for any input string of a constant-size alphabet written by Yuta Mori. It can be obtained at: @@ -470,7 +470,7 @@ a constant-size alphabet written by Yuta Mori. It can be obtained at: * HOMEPAGE: * https://github.com/y-256/libdivsufsort -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -478,7 +478,7 @@ Java Concurrency Tools for the JVM, which can be obtained at: * HOMEPAGE: * https://github.com/JCTools/JCTools -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -486,7 +486,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and decoding data in LZF format, written by Tatu Saloranta. It can be obtained at: * LICENSE: @@ -494,7 +494,7 @@ decoding data in LZF format, written by Tatu Saloranta. It can be obtained at: * HOMEPAGE: * https://github.com/ning/compress -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -502,7 +502,7 @@ and decompression library written by Adrien Grand. It can be obtained at: * HOMEPAGE: * https://github.com/jpountz/lz4-java -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -510,7 +510,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression and decompression library written by William Kinney. It can be obtained at: * LICENSE: @@ -518,7 +518,7 @@ and decompression library written by William Kinney. It can be obtained at: * HOMEPAGE: * https://code.google.com/p/jfastlz/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -526,7 +526,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate a temporary self-signed X.509 certificate when the JVM does not provide the equivalent functionality. It can be obtained at: @@ -535,7 +535,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -543,7 +543,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -551,7 +551,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -559,7 +559,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -567,7 +567,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -575,7 +575,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -583,7 +583,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at: * LICENSE: @@ -591,7 +591,7 @@ the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at: * HOMEPAGE: * https://github.com/twitter/hpack -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at: * LICENSE: @@ -599,7 +599,7 @@ the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at: * HOMEPAGE: * https://github.com/python-hyper/hpack/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at: * LICENSE: @@ -607,7 +607,7 @@ the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at * HOMEPAGE: * https://github.com/nghttp2/nghttp2/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library provides utilities for the java.lang API, which can be obtained at: * LICENSE: @@ -616,7 +616,7 @@ provides utilities for the java.lang API, which can be obtained at: * https://commons.apache.org/proper/commons-lang/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.111.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build. * LICENSE: @@ -624,7 +624,7 @@ that provides an easy way to ensure a user has everything necessary to run the M * HOMEPAGE: * https://github.com/takari/maven-wrapper -lib/io.netty-netty-codec-4.1.108.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.111.Final.jar contains the dnsinfo.h header file, that provides a way to retrieve the system DNS configuration on MacOS. This private header is also used by Apple's open source mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/). diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index 4c7d2ca013b..c315ae81a74 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -217,15 +217,15 @@ Apache Software License, Version 2. - lib/commons-io-commons-io-2.7.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.108.Final.jar [11] -- lib/io.netty-netty-codec-4.1.108.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.108.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.108.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.108.Final.jar [11] -- lib/io.netty-netty-common-4.1.108.Final.jar [11] -- lib/io.netty-netty-handler-4.1.108.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.108.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.111.Final.jar [11] +- lib/io.netty-netty-common-4.1.111.Final.jar [11] +- lib/io.netty-netty-handler-4.1.111.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.111.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.111.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11] @@ -233,14 +233,14 @@ Apache Software License, Version 2. - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar [11] -- lib/io.netty-netty-transport-4.1.108.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-transport-4.1.111.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.111.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.25.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.111.Final.jar [11] - lib/org.apache.logging.log4j-log4j-api-2.23.1.jar [16] - lib/org.apache.logging.log4j-log4j-core-2.23.1.jar [16] - lib/org.apache.logging.log4j-log4j-slf4j2-impl-2.23.1.jar [16] @@ -309,7 +309,7 @@ Apache Software License, Version 2. [8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.7 [9] Source available at https://github.com/apache/commons-lang/tree/LANG_2_6 [10] Source available at https://github.com/apache/commons-logging/tree/commons-logging-1.1.1 -[11] Source available at https://github.com/netty/netty/tree/netty-4.1.108.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.111.Final [16] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.23.1 [18] Source available at https://github.com/apache/commons-collections/tree/collections-4.1 [19] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6 @@ -342,9 +342,9 @@ Apache Software License, Version 2. [54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.26.0 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.108.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.111.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.108.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.111.Final.jar contains the extensions to Java Collections Framework which has been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene: * LICENSE: @@ -353,7 +353,7 @@ been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene: * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/ * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -361,7 +361,7 @@ Base64 Encoder and Decoder, which can be obtained at: * HOMEPAGE: * http://iharder.sourceforge.net/current/java/base64/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -369,7 +369,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -377,7 +377,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -387,7 +387,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression and decompression library written by Matthew J. Francis. It can be obtained at: * LICENSE: @@ -395,7 +395,7 @@ and decompression library written by Matthew J. Francis. It can be obtained at: * HOMEPAGE: * https://code.google.com/p/jbzip2/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct the suffix array and the Burrows-Wheeler transformed string for any input string of a constant-size alphabet written by Yuta Mori. It can be obtained at: @@ -404,7 +404,7 @@ a constant-size alphabet written by Yuta Mori. It can be obtained at: * HOMEPAGE: * https://github.com/y-256/libdivsufsort -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -412,7 +412,7 @@ Java Concurrency Tools for the JVM, which can be obtained at: * HOMEPAGE: * https://github.com/JCTools/JCTools -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -420,7 +420,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and decoding data in LZF format, written by Tatu Saloranta. It can be obtained at: * LICENSE: @@ -428,7 +428,7 @@ decoding data in LZF format, written by Tatu Saloranta. It can be obtained at: * HOMEPAGE: * https://github.com/ning/compress -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -436,7 +436,7 @@ and decompression library written by Adrien Grand. It can be obtained at: * HOMEPAGE: * https://github.com/jpountz/lz4-java -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -444,7 +444,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression and decompression library written by William Kinney. It can be obtained at: * LICENSE: @@ -452,7 +452,7 @@ and decompression library written by William Kinney. It can be obtained at: * HOMEPAGE: * https://code.google.com/p/jfastlz/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -460,7 +460,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate a temporary self-signed X.509 certificate when the JVM does not provide the equivalent functionality. It can be obtained at: @@ -469,7 +469,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -477,7 +477,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -485,7 +485,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -493,7 +493,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -501,7 +501,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -509,7 +509,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -517,7 +517,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at: * LICENSE: @@ -525,7 +525,7 @@ the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at: * HOMEPAGE: * https://github.com/twitter/hpack -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at: * LICENSE: @@ -533,7 +533,7 @@ the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at: * HOMEPAGE: * https://github.com/python-hyper/hpack/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at: * LICENSE: @@ -541,7 +541,7 @@ the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at * HOMEPAGE: * https://github.com/nghttp2/nghttp2/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library provides utilities for the java.lang API, which can be obtained at: * LICENSE: @@ -550,7 +550,7 @@ provides utilities for the java.lang API, which can be obtained at: * https://commons.apache.org/proper/commons-lang/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.111.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build. * LICENSE: @@ -558,7 +558,7 @@ that provides an easy way to ensure a user has everything necessary to run the M * HOMEPAGE: * https://github.com/takari/maven-wrapper -lib/io.netty-netty-codec-4.1.108.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.111.Final.jar contains the dnsinfo.h header file, that provides a way to retrieve the system DNS configuration on MacOS. This private header is also used by Apple's open source mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/). diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index 328cbacd2fe..a541921d4fb 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -217,17 +217,17 @@ Apache Software License, Version 2. - lib/commons-io-commons-io-2.7.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.108.Final.jar [11] -- lib/io.netty-netty-codec-4.1.108.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.108.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.108.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.108.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.108.Final.jar [11] -- lib/io.netty-netty-common-4.1.108.Final.jar [11] -- lib/io.netty-netty-handler-4.1.108.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.108.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.108.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.111.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.111.Final.jar [11] +- lib/io.netty-netty-common-4.1.111.Final.jar [11] +- lib/io.netty-netty-handler-4.1.111.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.111.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.111.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.111.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11] @@ -235,14 +235,14 @@ Apache Software License, Version 2. - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar [11] -- lib/io.netty-netty-transport-4.1.108.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-transport-4.1.111.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.111.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.25.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.111.Final.jar [11] - lib/io.prometheus-simpleclient-0.15.0.jar [12] - lib/io.prometheus-simpleclient_common-0.15.0.jar [12] - lib/io.prometheus-simpleclient_hotspot-0.15.0.jar [12] @@ -360,7 +360,7 @@ Apache Software License, Version 2. [8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.7 [9] Source available at https://github.com/apache/commons-lang/tree/LANG_2_6 [10] Source available at https://github.com/apache/commons-logging/tree/commons-logging-1.1.1 -[11] Source available at https://github.com/netty/netty/tree/netty-4.1.108.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.111.Final [12] Source available at https://github.com/prometheus/client_java/tree/parent-0.15.0 [13] Source available at https://github.com/vert-x3/vertx-auth/tree/4.3.2 [14] Source available at https://github.com/vert-x3/vertx-bridge-common/tree/4.3.2 @@ -403,9 +403,9 @@ Apache Software License, Version 2. [56] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.108.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.111.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.108.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.111.Final.jar contains the extensions to Java Collections Framework which has been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene: * LICENSE: @@ -414,7 +414,7 @@ been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene: * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/ * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -422,7 +422,7 @@ Base64 Encoder and Decoder, which can be obtained at: * HOMEPAGE: * http://iharder.sourceforge.net/current/java/base64/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -430,7 +430,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -438,7 +438,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -448,7 +448,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression and decompression library written by Matthew J. Francis. It can be obtained at: * LICENSE: @@ -456,7 +456,7 @@ and decompression library written by Matthew J. Francis. It can be obtained at: * HOMEPAGE: * https://code.google.com/p/jbzip2/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct the suffix array and the Burrows-Wheeler transformed string for any input string of a constant-size alphabet written by Yuta Mori. It can be obtained at: @@ -465,7 +465,7 @@ a constant-size alphabet written by Yuta Mori. It can be obtained at: * HOMEPAGE: * https://github.com/y-256/libdivsufsort -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -473,7 +473,7 @@ Java Concurrency Tools for the JVM, which can be obtained at: * HOMEPAGE: * https://github.com/JCTools/JCTools -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -481,7 +481,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and decoding data in LZF format, written by Tatu Saloranta. It can be obtained at: * LICENSE: @@ -489,7 +489,7 @@ decoding data in LZF format, written by Tatu Saloranta. It can be obtained at: * HOMEPAGE: * https://github.com/ning/compress -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -497,7 +497,7 @@ and decompression library written by Adrien Grand. It can be obtained at: * HOMEPAGE: * https://github.com/jpountz/lz4-java -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -505,7 +505,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression and decompression library written by William Kinney. It can be obtained at: * LICENSE: @@ -513,7 +513,7 @@ and decompression library written by William Kinney. It can be obtained at: * HOMEPAGE: * https://code.google.com/p/jfastlz/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -521,7 +521,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate a temporary self-signed X.509 certificate when the JVM does not provide the equivalent functionality. It can be obtained at: @@ -530,7 +530,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -538,7 +538,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -546,7 +546,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -554,7 +554,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -562,7 +562,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -570,7 +570,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -578,7 +578,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at: * LICENSE: @@ -586,7 +586,7 @@ the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at: * HOMEPAGE: * https://github.com/twitter/hpack -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at: * LICENSE: @@ -594,7 +594,7 @@ the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at: * HOMEPAGE: * https://github.com/python-hyper/hpack/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at: * LICENSE: @@ -602,7 +602,7 @@ the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at * HOMEPAGE: * https://github.com/nghttp2/nghttp2/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library provides utilities for the java.lang API, which can be obtained at: * LICENSE: @@ -611,7 +611,7 @@ provides utilities for the java.lang API, which can be obtained at: * https://commons.apache.org/proper/commons-lang/ -lib/io.netty-netty-codec-4.1.108.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.111.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build. * LICENSE: @@ -619,7 +619,7 @@ that provides an easy way to ensure a user has everything necessary to run the M * HOMEPAGE: * https://github.com/takari/maven-wrapper -lib/io.netty-netty-codec-4.1.108.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.111.Final.jar contains the dnsinfo.h header file, that provides a way to retrieve the system DNS configuration on MacOS. This private header is also used by Apple's open source mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/). diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index de595d78af2..b6e81f75bf4 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -23,17 +23,17 @@ LongAdder), which was released with the following comments: http://creativecommons.org/publicdomain/zero/1.0/ ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.108.Final.jar -- lib/io.netty-netty-codec-4.1.108.Final.jar -- lib/io.netty-netty-codec-dns-4.1.108.Final.jar -- lib/io.netty-netty-codec-http-4.1.108.Final.jar -- lib/io.netty-netty-codec-http2-4.1.108.Final.jar -- lib/io.netty-netty-codec-socks-4.1.108.Final.jar -- lib/io.netty-netty-common-4.1.108.Final.jar -- lib/io.netty-netty-handler-4.1.108.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar -- lib/io.netty-netty-resolver-4.1.108.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.108.Final.jar +- lib/io.netty-netty-buffer-4.1.111.Final.jar +- lib/io.netty-netty-codec-4.1.111.Final.jar +- lib/io.netty-netty-codec-dns-4.1.111.Final.jar +- lib/io.netty-netty-codec-http-4.1.111.Final.jar +- lib/io.netty-netty-codec-http2-4.1.111.Final.jar +- lib/io.netty-netty-codec-socks-4.1.111.Final.jar +- lib/io.netty-netty-common-4.1.111.Final.jar +- lib/io.netty-netty-handler-4.1.111.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.111.Final.jar +- lib/io.netty-netty-resolver-4.1.111.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.111.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11] @@ -41,13 +41,13 @@ LongAdder), which was released with the following comments: - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar -- lib/io.netty-netty-transport-4.1.108.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar +- lib/io.netty-netty-transport-4.1.111.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.111.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.111.Final.jar The Netty Project diff --git a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt index 25046be4292..baa4f07caa7 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -5,15 +5,15 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.108.Final.jar -- lib/io.netty-netty-codec-4.1.108.Final.jar -- lib/io.netty-netty-codec-http-4.1.108.Final.jar -- lib/io.netty-netty-codec-http2-4.1.108.Final.jar -- lib/io.netty-netty-codec-socks-4.1.108.Final.jar -- lib/io.netty-netty-common-4.1.108.Final.jar -- lib/io.netty-netty-handler-4.1.108.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar -- lib/io.netty-netty-resolver-4.1.108.Final.jar +- lib/io.netty-netty-buffer-4.1.111.Final.jar +- lib/io.netty-netty-codec-4.1.111.Final.jar +- lib/io.netty-netty-codec-http-4.1.111.Final.jar +- lib/io.netty-netty-codec-http2-4.1.111.Final.jar +- lib/io.netty-netty-codec-socks-4.1.111.Final.jar +- lib/io.netty-netty-common-4.1.111.Final.jar +- lib/io.netty-netty-handler-4.1.111.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.111.Final.jar +- lib/io.netty-netty-resolver-4.1.111.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11] @@ -21,13 +21,13 @@ The Apache Software Foundation (http://www.apache.org/). - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar -- lib/io.netty-netty-transport-4.1.108.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar +- lib/io.netty-netty-transport-4.1.111.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.111.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.111.Final.jar The Netty Project diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt index b66c51a58cd..f4819672bfb 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -5,17 +5,17 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.108.Final.jar -- lib/io.netty-netty-codec-4.1.108.Final.jar -- lib/io.netty-netty-codec-dns-4.1.108.Final.jar -- lib/io.netty-netty-codec-http-4.1.108.Final.jar -- lib/io.netty-netty-codec-http2-4.1.108.Final.jar -- lib/io.netty-netty-codec-socks-4.1.108.Final.jar -- lib/io.netty-netty-common-4.1.108.Final.jar -- lib/io.netty-netty-handler-4.1.108.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar -- lib/io.netty-netty-resolver-4.1.108.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.108.Final.jar +- lib/io.netty-netty-buffer-4.1.111.Final.jar +- lib/io.netty-netty-codec-4.1.111.Final.jar +- lib/io.netty-netty-codec-dns-4.1.111.Final.jar +- lib/io.netty-netty-codec-http-4.1.111.Final.jar +- lib/io.netty-netty-codec-http2-4.1.111.Final.jar +- lib/io.netty-netty-codec-socks-4.1.111.Final.jar +- lib/io.netty-netty-common-4.1.111.Final.jar +- lib/io.netty-netty-handler-4.1.111.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.111.Final.jar +- lib/io.netty-netty-resolver-4.1.111.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.111.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11] @@ -23,13 +23,13 @@ The Apache Software Foundation (http://www.apache.org/). - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar -- lib/io.netty-netty-transport-4.1.108.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar +- lib/io.netty-netty-transport-4.1.111.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.111.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.111.Final.jar The Netty Project diff --git a/pom.xml b/pom.xml index 0a65d23d0dc..c1db39c627d 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 2.23.1 1.3.0 4.11.0 - 4.1.108.Final + 4.1.111.Final 0.0.25.Final 0.15.0 0.8.3 From 16f48bf983c4171490db2007138d9ba0964cad97 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 16:16:10 +0300 Subject: [PATCH 02/14] Add jetcd-core-shaded module which uses grpc-netty-shaded --- metadata-drivers/etcd/pom.xml | 15 ++- metadata-drivers/jetcd-core-shaded/pom.xml | 127 +++++++++++++++++++++ metadata-drivers/pom.xml | 1 + pom.xml | 2 +- 4 files changed, 139 insertions(+), 6 deletions(-) create mode 100644 metadata-drivers/jetcd-core-shaded/pom.xml diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 7eaaf277c4c..9198f63848c 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -34,13 +34,14 @@ - io.etcd - jetcd-core - ${etcd.version} + org.apache.bookkeeper.metadata.drivers + jetcd-core-shaded + ${project.version} + shaded - io.grpc - * + io.etcd + jetcd-core @@ -66,6 +67,10 @@ io.grpc grpc-servlet-jakarta + + io.grpc + grpc-netty + diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml new file mode 100644 index 00000000000..2bb7988e2aa --- /dev/null +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -0,0 +1,127 @@ + + + + 4.0.0 + + org.apache.bookkeeper.metadata.drivers + metadata-drivers-parent + 4.18.0-SNAPSHOT + .. + + org.apache.bookkeeper.metadata.drivers + jetcd-core-shaded + Apache BookKeeper :: Metadata Drivers:: jetcd-core shaded + + + + io.etcd + jetcd-core + ${jetcd.version} + + + io.grpc + grpc-netty + + + + + io.grpc + grpc-netty-shaded + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + true + true + false + + + io.etcd:* + io.vertx:* + + + + + + io.vertx + org.apache.pulsar.jetcd.shaded.io.vertx + + + + io.grpc.netty + io.grpc.netty.shaded.io.grpc.netty + + + + io.netty + io.grpc.netty.shaded.io.netty + + + + + + + + true + shaded + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-shaded-jar + package + + attach-artifact + + + + + ${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar + jar + shaded + + + + + + + + + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 8230379d760..b54b2cfc064 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -27,6 +27,7 @@ pom Apache BookKeeper :: Metadata Drivers :: Parent + jetcd-core-shaded etcd diff --git a/pom.xml b/pom.xml index c1db39c627d..671cf254c4c 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ 5.1.0 4.0.0 4.1.12.1 - 0.7.7 + 0.7.7 2.8.0 3.0.2 2.9.0 From 0f7238e94ae4f5601ed4a1778bce774b418d6ae8 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 16:56:52 +0300 Subject: [PATCH 03/14] Add workaround for IntelliJ issue --- metadata-drivers/jetcd-core-shaded/pom.xml | 6 ++++++ pom.xml | 1 + 2 files changed, 7 insertions(+) diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 2bb7988e2aa..ae5bea0ab50 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -49,6 +49,12 @@ io.grpc grpc-netty-shaded + + + dev.failsafe + failsafe + ${failsafe.version} + diff --git a/pom.xml b/pom.xml index 671cf254c4c..320469de5d1 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,7 @@ 4.0.0 4.1.12.1 0.7.7 + 3.3.2 2.8.0 3.0.2 2.9.0 From 527dc8db5bdb05d2e75b1be91ba648f4f68edf63 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 17:02:17 +0300 Subject: [PATCH 04/14] Use grpc-netty-shaded instead of grpc-netty --- .../apache/bookkeeper/grpc/resolver/GrpcChannelsTest.java | 2 +- .../apache/bookkeeper/clients/utils/GrpcChannelsTest.java | 2 +- stream/common/pom.xml | 6 +++++- stream/tests-common/pom.xml | 6 +++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/stream/bk-grpc-name-resolver/src/test/java/org/apache/bookkeeper/grpc/resolver/GrpcChannelsTest.java b/stream/bk-grpc-name-resolver/src/test/java/org/apache/bookkeeper/grpc/resolver/GrpcChannelsTest.java index 9df1bf1deb8..220f85c54a6 100644 --- a/stream/bk-grpc-name-resolver/src/test/java/org/apache/bookkeeper/grpc/resolver/GrpcChannelsTest.java +++ b/stream/bk-grpc-name-resolver/src/test/java/org/apache/bookkeeper/grpc/resolver/GrpcChannelsTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue; import io.grpc.ManagedChannelBuilder; -import io.grpc.netty.NettyChannelBuilder; +import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder; import org.apache.bookkeeper.clients.config.StorageClientSettings; import org.apache.bookkeeper.clients.utils.GrpcChannels; import org.junit.Test; diff --git a/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/utils/GrpcChannelsTest.java b/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/utils/GrpcChannelsTest.java index 3e3e81e98e8..f5b5fab1bed 100644 --- a/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/utils/GrpcChannelsTest.java +++ b/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/utils/GrpcChannelsTest.java @@ -24,7 +24,7 @@ import io.grpc.ManagedChannelBuilder; import io.grpc.inprocess.InProcessChannelBuilder; -import io.grpc.netty.NettyChannelBuilder; +import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder; import org.apache.bookkeeper.clients.config.StorageClientSettings; import org.junit.Test; diff --git a/stream/common/pom.xml b/stream/common/pom.xml index b12f41d3a50..dbc98d23ce9 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -42,7 +42,7 @@ io.grpc - grpc-netty-shaded + grpc-netty org.bouncycastle @@ -62,6 +62,10 @@ + + io.grpc + grpc-netty-shaded + javax.annotation javax.annotation-api diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index f1ca667c871..a57b44d28cc 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -34,7 +34,7 @@ io.grpc - grpc-netty-shaded + grpc-netty org.bouncycastle @@ -54,6 +54,10 @@ + + io.grpc + grpc-netty-shaded + com.google.protobuf protobuf-java From e3ad362358df5383fc904d43416be71cee1fb3ab Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 17:34:26 +0300 Subject: [PATCH 05/14] Update licenses --- bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 2 +- bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 2 +- bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 2 +- bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt | 2 +- bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt | 2 +- bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index da34cdf2a07..64ebd7c5bdc 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -290,7 +290,7 @@ Apache Software License, Version 2. - lib/io.grpc-grpc-grpclb-1.64.0.jar [33] - lib/io.grpc-grpc-inprocess-1.64.0.jar [33] - lib/io.grpc-grpc-opentelemetry-1.64.0.jar [33] -- lib/io.grpc-grpc-netty-1.64.0.jar [33] +- lib/io.grpc-grpc-netty-shaded-1.64.0.jar [33] - lib/io.grpc-grpc-protobuf-1.64.0.jar [33] - lib/io.grpc-grpc-protobuf-lite-1.64.0.jar [33] - lib/io.grpc-grpc-services-1.64.0.jar [33] diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index c315ae81a74..77191b122e6 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -265,7 +265,7 @@ Apache Software License, Version 2. - lib/io.grpc-grpc-grpclb-1.64.0.jar [32] - lib/io.grpc-grpc-inprocess-1.64.0.jar [32] - lib/io.grpc-grpc-opentelemetry-1.64.0.jar [32] -- lib/io.grpc-grpc-netty-1.64.0.jar [32] +- lib/io.grpc-grpc-netty-shaded-1.64.0.jar [32] - lib/io.grpc-grpc-protobuf-1.64.0.jar [32] - lib/io.grpc-grpc-protobuf-lite-1.64.0.jar [32] - lib/io.grpc-grpc-services-1.64.0.jar [32] diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index a541921d4fb..0e3f88702a2 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -290,7 +290,7 @@ Apache Software License, Version 2. - lib/io.grpc-grpc-grpclb-1.64.0.jar [33] - lib/io.grpc-grpc-inprocess-1.64.0.jar [33] - lib/io.grpc-grpc-opentelemetry-1.64.0.jar [33] -- lib/io.grpc-grpc-netty-1.64.0.jar [33] +- lib/io.grpc-grpc-netty-shaded-1.64.0.jar [33] - lib/io.grpc-grpc-protobuf-1.64.0.jar [33] - lib/io.grpc-grpc-protobuf-lite-1.64.0.jar [33] - lib/io.grpc-grpc-services-1.64.0.jar [33] diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index b6e81f75bf4..53b7942b544 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -139,7 +139,7 @@ Copyright 2010 Cedric Beust cedric@beust.com - lib/io.grpc-grpc-auth-1.64.0.jar - lib/io.grpc-grpc-context-1.64.0.jar - lib/io.grpc-grpc-core-1.64.0.jar -- lib/io.grpc-grpc-netty-1.64.0.jar +- lib/io.grpc-grpc-netty-shaded-1.64.0.jar - lib/io.grpc-grpc-protobuf-1.64.0.jar - lib/io.grpc-grpc-protobuf-lite-1.64.0.jar - lib/io.grpc-grpc-stub-1.64.0.jar diff --git a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt index baa4f07caa7..94379be7aa2 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -61,7 +61,7 @@ Copyright 2010 Cedric Beust cedric@beust.com - lib/io.grpc-grpc-auth-1.64.0.jar - lib/io.grpc-grpc-context-1.64.0.jar - lib/io.grpc-grpc-core-1.64.0.jar -- lib/io.grpc-grpc-netty-1.64.0.jar +- lib/io.grpc-grpc-netty-shaded-1.64.0.jar - lib/io.grpc-grpc-protobuf-1.64.0.jar - lib/io.grpc-grpc-protobuf-lite-1.64.0.jar - lib/io.grpc-grpc-stub-1.64.0.jar diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt index f4819672bfb..b9d15c993fd 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -121,7 +121,7 @@ Copyright 2010 Cedric Beust cedric@beust.com - lib/io.grpc-grpc-auth-1.64.0.jar - lib/io.grpc-grpc-context-1.64.0.jar - lib/io.grpc-grpc-core-1.64.0.jar -- lib/io.grpc-grpc-netty-1.64.0.jar +- lib/io.grpc-grpc-netty-shaded-1.64.0.jar - lib/io.grpc-grpc-protobuf-1.64.0.jar - lib/io.grpc-grpc-protobuf-lite-1.64.0.jar - lib/io.grpc-grpc-stub-1.64.0.jar From 1388dc1352fe798eef2025b2888b6a328ab37eca Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 18:12:30 +0300 Subject: [PATCH 06/14] Fix jetcd-core-shaded metadata so that IntelliJ is properly supported - fixes the issue with transient dependencies --- metadata-drivers/etcd/pom.xml | 6 ------ metadata-drivers/jetcd-core-shaded/pom.xml | 25 ++++++++++++++++------ pom.xml | 1 - 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 9198f63848c..55012037e4c 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -38,12 +38,6 @@ jetcd-core-shaded ${project.version} shaded - - - io.etcd - jetcd-core - - diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index ae5bea0ab50..e0c346e01b6 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -43,18 +43,16 @@ io.grpc grpc-netty + + io.netty + * + io.grpc grpc-netty-shaded - - - dev.failsafe - failsafe - ${failsafe.version} - @@ -94,9 +92,24 @@ io.grpc.netty.shaded.io.netty + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml + + + + + META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml + ${project.basedir}/dependency-reduced-pom.xml + true diff --git a/pom.xml b/pom.xml index 320469de5d1..671cf254c4c 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,6 @@ 4.0.0 4.1.12.1 0.7.7 - 3.3.2 2.8.0 3.0.2 2.9.0 From 38d14bcf076ff2d0f8439d4b65ad8e8d45f4c79f Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 18:30:05 +0300 Subject: [PATCH 07/14] Fix licenses --- bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 4 ---- bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt | 4 ---- 2 files changed, 8 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index 77191b122e6..0e2cf9f5ef8 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -219,12 +219,8 @@ Apache Software License, Version 2. - lib/commons-logging-commons-logging-1.1.1.jar [10] - lib/io.netty-netty-buffer-4.1.111.Final.jar [11] - lib/io.netty-netty-codec-4.1.111.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.111.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.111.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.111.Final.jar [11] - lib/io.netty-netty-common-4.1.111.Final.jar [11] - lib/io.netty-netty-handler-4.1.111.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.111.Final.jar [11] - lib/io.netty-netty-resolver-4.1.111.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11] diff --git a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt index 94379be7aa2..2a410c2a087 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -7,12 +7,8 @@ The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------------------ - lib/io.netty-netty-buffer-4.1.111.Final.jar - lib/io.netty-netty-codec-4.1.111.Final.jar -- lib/io.netty-netty-codec-http-4.1.111.Final.jar -- lib/io.netty-netty-codec-http2-4.1.111.Final.jar -- lib/io.netty-netty-codec-socks-4.1.111.Final.jar - lib/io.netty-netty-common-4.1.111.Final.jar - lib/io.netty-netty-handler-4.1.111.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.111.Final.jar - lib/io.netty-netty-resolver-4.1.111.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11] From b9f2e6f5f39245604b46c9186000447b45be3278 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 19:29:05 +0300 Subject: [PATCH 08/14] Add common exclusions for grpc-all --- metadata-drivers/etcd/pom.xml | 28 ++++-------------------- pom.xml | 40 +++++++++++++++++++++++++++++++++++ stream/common/pom.xml | 23 +------------------- stream/tests-common/pom.xml | 26 ++++------------------- 4 files changed, 49 insertions(+), 68 deletions(-) diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 55012037e4c..c9e7fc93c13 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -43,31 +43,11 @@ io.grpc grpc-all - ${grpc.version} - - - org.bouncycastle - bcpkix-jdk15on - - - io.grpc - grpc-okhttp - - - io.grpc - grpc-servlet - - - io.grpc - grpc-servlet-jakarta - - - io.grpc - grpc-netty - - - + + io.grpc + grpc-netty-shaded + org.arquillian.cube arquillian-cube-docker diff --git a/pom.xml b/pom.xml index 671cf254c4c..f70b6fe07dc 100644 --- a/pom.xml +++ b/pom.xml @@ -412,6 +412,46 @@ pom import + + + io.grpc + grpc-all + ${grpc.version} + + + io.grpc + grpc-testing + + + io.grpc + grpc-netty + + + org.bouncycastle + bcpkix-jdk15on + + + io.grpc + grpc-okhttp + + + com.squareup.okhttp + okhttp + + + com.squareup.okio + okio + + + io.grpc + grpc-servlet + + + io.grpc + grpc-servlet-jakarta + + + diff --git a/stream/common/pom.xml b/stream/common/pom.xml index dbc98d23ce9..e3a1b2ed06d 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -39,33 +39,12 @@ io.grpc grpc-all - - - io.grpc - grpc-netty - - - org.bouncycastle - bcpkix-jdk15on - - - io.grpc - grpc-okhttp - - - io.grpc - grpc-servlet - - - io.grpc - grpc-servlet-jakarta - - io.grpc grpc-netty-shaded + javax.annotation javax.annotation-api diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index a57b44d28cc..8fe9c6b13f9 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -31,33 +31,15 @@ io.grpc grpc-all - - - io.grpc - grpc-netty - - - org.bouncycastle - bcpkix-jdk15on - - - io.grpc - grpc-okhttp - - - io.grpc - grpc-servlet - - - io.grpc - grpc-servlet-jakarta - - io.grpc grpc-netty-shaded + + io.grpc + grpc-testing + com.google.protobuf protobuf-java From 1cc7ed64a4524c53814446afcd360f516be7c2f2 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 20:21:37 +0300 Subject: [PATCH 09/14] Add exclusions for jetcd-core-shaded --- metadata-drivers/etcd/pom.xml | 10 ++++++++++ metadata-drivers/jetcd-core-shaded/pom.xml | 17 +++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index c9e7fc93c13..3dfbdcde1ed 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -38,6 +38,16 @@ jetcd-core-shaded ${project.version} shaded + + + io.etcd + * + + + io.vertx + * + + diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index e0c346e01b6..cd02ff4c3f4 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -53,6 +53,23 @@ io.grpc grpc-netty-shaded + + + io.grpc + grpc-protobuf + + + io.grpc + grpc-stub + + + io.grpc + grpc-grpclb + + + io.grpc + grpc-util + From 3e07dbcc1e72c4563ca6869adc464d7cff94849c Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 20:45:24 +0300 Subject: [PATCH 10/14] Add failsafe dependency to fix running tests using jetcd --- metadata-drivers/jetcd-core-shaded/pom.xml | 6 +++++- pom.xml | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index cd02ff4c3f4..222819c1302 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -53,7 +53,11 @@ io.grpc grpc-netty-shaded - + + + dev.failsafe + failsafe + io.grpc grpc-protobuf diff --git a/pom.xml b/pom.xml index f70b6fe07dc..e8609062a25 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,7 @@ 4.0.0 4.1.12.1 0.7.7 + 3.2.2 2.8.0 3.0.2 2.9.0 @@ -453,6 +454,13 @@ + + + dev.failsafe + failsafe + ${failsafe.version} + + com.squareup.okhttp3 From af61f52030a4b459008a6435d549397b6f802d7d Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 22:06:43 +0300 Subject: [PATCH 11/14] Add missing build-helper-maven-plugin.version to pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index e8609062a25..51f5ff30b32 100644 --- a/pom.xml +++ b/pom.xml @@ -197,6 +197,7 @@ 0.6.1 9.3 4.7.3.2 + 3.6.0 1 4.0.0 3.0.1 From b06e622ae26b907a51822b80a484127b15499501 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 22:12:29 +0300 Subject: [PATCH 12/14] Add workaround for "mvn -f metadata-drivers/pom.xml test -DintegrationTests" --- metadata-drivers/jetcd-core-shaded/pom.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 222819c1302..316670a08b1 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -162,6 +162,28 @@ + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + unpack-shaded-jar + package + + run + + + + + + + + + From 16f2681bc3825b4176571ea7de39db721c0210e5 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 22:30:07 +0300 Subject: [PATCH 13/14] Skip spotbugs plugin for jetcd-core-shaded --- metadata-drivers/jetcd-core-shaded/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 316670a08b1..2b8e855aa22 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -184,6 +184,13 @@ + + com.github.spotbugs + spotbugs-maven-plugin + + true + + From 4dfa2a7a2404560a0eab0d16b534bcba0a6986c5 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 13 Jun 2024 08:09:15 +0300 Subject: [PATCH 14/14] Remove obsolete exclusion --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 51f5ff30b32..1651bfcac71 100644 --- a/pom.xml +++ b/pom.xml @@ -428,10 +428,6 @@ io.grpc grpc-netty - - org.bouncycastle - bcpkix-jdk15on - io.grpc grpc-okhttp