From dccae86a9614a651d937bd7983accae341b71723 Mon Sep 17 00:00:00 2001 From: chenhang Date: Thu, 23 Mar 2023 04:36:54 +0000 Subject: [PATCH 001/233] [maven-release-plugin] prepare release v4.16.0-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +++++- bookkeeper-dist/bkctl/pom.xml | 6 +++++- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +++++- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +++++- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +++++- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +++++- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 6 +++--- shaded/bookkeeper-server-shaded/pom.xml | 6 +++++- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +++++- shaded/distributedlog-core-shaded/pom.xml | 6 +++++- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +++++- .../codahale-metrics-provider/pom.xml | 6 +++++- stats/bookkeeper-stats-providers/pom.xml | 6 +++++- .../prometheus-metrics-provider/pom.xml | 6 +++++- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +++++- stream/api/pom.xml | 6 +++++- stream/bk-grpc-name-resolver/pom.xml | 6 +++++- stream/clients/java/all/pom.xml | 6 +++++- stream/clients/java/base/pom.xml | 6 +++++- stream/clients/java/kv/pom.xml | 6 +++++- stream/clients/java/pom.xml | 6 +++++- stream/clients/pom.xml | 6 +++++- stream/common/pom.xml | 6 +++++- stream/distributedlog/common/pom.xml | 6 +++++- stream/distributedlog/core/pom.xml | 6 +++++- stream/distributedlog/io/dlfs/pom.xml | 6 +++++- stream/distributedlog/io/pom.xml | 6 +++++- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +++++- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +++++- stream/server/pom.xml | 6 +++++- stream/statelib/pom.xml | 6 +++++- stream/storage/api/pom.xml | 6 +++++- stream/storage/impl/pom.xml | 6 +++++- stream/storage/pom.xml | 6 +++++- stream/tests-common/pom.xml | 6 +++++- tests/backward-compat/bc-non-fips/pom.xml | 6 +++++- tests/backward-compat/current-server-old-clients/pom.xml | 6 +++++- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +++++- tests/backward-compat/hostname-bookieid/pom.xml | 6 +++++- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +++++- tests/backward-compat/pom.xml | 6 +++++- tests/backward-compat/recovery-no-password/pom.xml | 6 +++++- tests/backward-compat/upgrade-direct/pom.xml | 6 +++++- tests/backward-compat/upgrade/pom.xml | 6 +++++- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +++++- tests/docker-images/all-released-versions-image/pom.xml | 6 +++++- tests/docker-images/all-versions-image/pom.xml | 6 +++++- tests/docker-images/pom.xml | 6 +++++- tests/integration-tests-base-groovy/pom.xml | 6 +++++- tests/integration-tests-base/pom.xml | 6 +++++- tests/integration-tests-topologies/pom.xml | 6 +++++- tests/integration-tests-utils/pom.xml | 6 +++++- tests/integration/cluster/pom.xml | 6 +++++- tests/integration/pom.xml | 6 +++++- tests/integration/smoke/pom.xml | 6 +++++- tests/integration/standalone/pom.xml | 6 +++++- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +++++- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +++++- tests/shaded/pom.xml | 6 +++++- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +++++- tools/framework/pom.xml | 6 +++++- tools/ledger/pom.xml | 6 +++++- tools/perf/pom.xml | 6 +++++- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +++++- 90 files changed, 354 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 2161747b8db..848e60da93d 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 7c6b4654165..5760b29794f 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 7526bf02e3c..4bd48e41f4b 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 170d2e040c0..8f676e41e10 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -154,4 +154,8 @@ + + + v4.16.0-rc0 + diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index f26e8b0b694..ec0b62b63bb 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -79,4 +79,8 @@ + + + v4.16.0-rc0 + diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 405af3d86d3..fd7576d552d 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index b9fc5de8cf0..9c531167c40 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -129,4 +129,8 @@ + + + v4.16.0-rc0 + diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index b14ad46a91e..cdcc87cac8e 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 996708ca8ca..f2ce4e45295 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 6ea0a35fd8f..207192639d4 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 2aae0c2813b..a706473ecc3 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index c568eaf336d..d0cc9070e48 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index a46b20c23d7..133c0de6f80 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 9850f0d193a..b77c2dfc5fe 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,10 +18,14 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API + + + v4.16.0-rc0 + diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index cd59d929caa..61bbcc6441c 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 0f3c98ef3f1..1dbbbea69ba 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -31,4 +31,8 @@ ${project.parent.version} + + + v4.16.0-rc0 + diff --git a/buildtools/pom.xml b/buildtools/pom.xml index ae621a8ba6b..312e1e9dabd 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 buildtools Apache BookKeeper :: Build Tools - 4.16.0-SNAPSHOT + 4.16.0 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index f53fe9d92e8..2f5930c4d23 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index f218b8cf4c7..a1a20ae7941 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 1a769c1ed4e..ad5f8f05bf6 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.0-SNAPSHOT + 4.16.0 .. 4.0.0 @@ -150,4 +150,8 @@ + + + v4.16.0-rc0 + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 2cc467e7a15..7a47a51817c 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 43096e97217..deaa8a6618f 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index d61ae3dfcd9..d2beac71651 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. diff --git a/pom.xml b/pom.xml index f1926121fa1..8f95bc35c66 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.13 + v4.16.0-rc0 JIRA @@ -1240,7 +1240,7 @@ ${project.basedir}/src/main/java ${project.build.directory}/generated-sources/delombok - + diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 1134003932d..3b881c5325c 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-shaded @@ -126,4 +126,8 @@ + + + v4.16.0-rc0 + diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 137755ccfa6..5b231ddcab1 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-tests-shaded @@ -144,4 +144,8 @@ + + + v4.16.0-rc0 + diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 6ca0e6aeb71..8ac4dca053d 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.distributedlog @@ -238,4 +238,8 @@ + + + v4.16.0-rc0 + diff --git a/shaded/pom.xml b/shaded/pom.xml index eac5dd2536d..4407963edd3 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index ec9d9b84df3..6ecc1a46bae 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,4 +59,8 @@ + + + v4.16.0-rc0 + diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 60aefd95be2..c11560f698a 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,4 +53,8 @@ guava + + + v4.16.0-rc0 + diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index f193e18997f..ec62e2d800c 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 bookkeeper-stats-providers @@ -30,4 +30,8 @@ prometheus-metrics-provider + + + v4.16.0-rc0 + diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 70151a575c0..f60af8c5565 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,4 +72,8 @@ + + + v4.16.0-rc0 + diff --git a/stats/pom.xml b/stats/pom.xml index 302757e98e9..b278f629eb4 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 5d6067c4539..73754e99649 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,4 +50,8 @@ jackson-annotations + + + v4.16.0-rc0 + diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 64288ce6391..8175c1cb604 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -46,4 +46,8 @@ freebuilder + + + v4.16.0-rc0 + diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 7fce49b5e4b..c2de6d6baac 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -77,4 +77,8 @@ test + + + v4.16.0-rc0 + diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 0130d73bd01..1a1379959df 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,4 +112,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index e7b2eefed87..83485603683 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,4 +59,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 16aa9463ac0..a77d08743d1 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,4 +47,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 3dfa255abad..ae282b8c5ee 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-java-client-parent @@ -31,4 +31,8 @@ kv all + + + v4.16.0-rc0 + diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 88ab060bb4a..fa9b5f60221 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-clients-parent @@ -47,4 +47,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/common/pom.xml b/stream/common/pom.xml index c11adffef4e..73a23bdebd3 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -74,4 +74,8 @@ test + + + v4.16.0-rc0 + diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 8c6d4febfed..a1099fb8f91 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,4 +106,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 67caafa1430..916f1e4a86b 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,4 +138,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index e451bd80939..2e2e243a8c1 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.0-SNAPSHOT + 4.16.0 ../.. org.apache.distributedlog @@ -88,4 +88,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 8a59e6011a6..600c57f9c68 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 distributedlog-io @@ -28,4 +28,8 @@ dlfs + + + v4.16.0-rc0 + diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 88ed3749fcc..dd8cd43a612 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index cd29b40f628..39b35a6a5c5 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,4 +61,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/pom.xml b/stream/pom.xml index f311ed213ec..aa0717839eb 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bd60d3de1e8..ed5c59daa92 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -118,4 +118,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 3fc2255ee57..d2aabac11fa 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,4 +82,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 23996e66e70..4585ac1dd28 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -130,4 +130,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 08532aa4a1e..74423ff4a3a 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-service-api @@ -55,4 +55,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index c683eecf2ed..9fa04aec269 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-service-impl @@ -121,4 +121,8 @@ + + + v4.16.0-rc0 + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 22c48802e2f..d761dce9cc6 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-service-parent @@ -30,4 +30,8 @@ api impl + + + v4.16.0-rc0 + diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 15c06e74c6f..7747cf267d9 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper.tests @@ -115,4 +115,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 83abcc55ac3..c36115cd197 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -76,4 +76,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 2619bce13b7..d92e8a7b545 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -29,4 +29,8 @@ jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server + + + v4.16.0-rc0 + diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index c9429e689e1..2a2372953bf 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -29,4 +29,8 @@ jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager + + + v4.16.0-rc0 + diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 1ca7192a3be..c9bbd239b02 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -29,4 +29,8 @@ jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) + + + v4.16.0-rc0 + diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index ca9100e9f5a..8f5c09b84c0 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -29,4 +29,8 @@ jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies + + + v4.16.0-rc0 + diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 0de99973608..c2ea0eb333d 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.0-SNAPSHOT + 4.16.0 ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,4 +49,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 49ba4e6fb30..7354d5e7511 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -36,4 +36,8 @@ ${project.version} + + + v4.16.0-rc0 + diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 8c6f5fe3824..9887ee8d64c 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -29,4 +29,8 @@ jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version + + + v4.16.0-rc0 + diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 4a636335ab3..f5d8dd341a0 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -29,4 +29,8 @@ jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version + + + v4.16.0-rc0 + diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index ee03258b1ac..0c1485fd32b 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -29,4 +29,8 @@ jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current + + + v4.16.0-rc0 + diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index c6fd2231b6a..9ee1f51beb4 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.tests @@ -68,4 +68,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index e1f3b0bff8a..eb548734afa 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.tests @@ -108,4 +108,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 7e6d8b4d224..5e1f46f5873 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests docker-images @@ -30,4 +30,8 @@ all-released-versions-image all-versions-image + + + v4.16.0-rc0 + diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index e0ec99b280f..d3948dcfb19 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.0-SNAPSHOT + 4.16.0 ../integration-tests-base @@ -109,4 +109,8 @@ test + + + v4.16.0-rc0 + diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index bb41e64cc68..1c82bd2cd70 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 89e54e37adf..c68452ab818 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -46,4 +46,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 2fded2e1a9a..0d24aec128d 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -90,4 +90,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index af558658834..597e5ed0479 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -83,4 +83,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index f16e14da797..90bbaa798f1 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests integration @@ -70,4 +70,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index a9bedbd1a8a..4fd244e08ab 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -72,4 +72,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index fd859cae43f..942cae5c308 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -68,4 +68,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/pom.xml b/tests/pom.xml index e5125198470..296b5464346 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 6a3e614d504..e13dcbc4fe8 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -73,4 +73,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 9a4a9f7bb85..5eff5128673 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-shaded-test @@ -59,4 +59,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index b4451298527..d8fed5503e5 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-tests-shaded-test @@ -75,4 +75,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 7f56df50eff..9543b75511d 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. distributedlog-core-shaded-test @@ -84,4 +84,8 @@ + + + v4.16.0-rc0 + diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index c0cbd8ddb00..08fb1aa45e9 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper.tests.shaded @@ -32,4 +32,8 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test + + + v4.16.0-rc0 + diff --git a/testtools/pom.xml b/testtools/pom.xml index 600a4830e4e..3e5e6c94ba2 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 testtools Apache BookKeeper :: Test Tools - 4.16.0-SNAPSHOT + 4.16.0 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index ee5c964cefc..d61e38abc8c 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools Apache BookKeeper :: Tools @@ -79,4 +79,8 @@ + + + v4.16.0-rc0 + diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 2eac74ce22b..062bcc2de59 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,4 +41,8 @@ test + + + v4.16.0-rc0 + diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 748344109f8..3883821d6bf 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,4 +71,8 @@ test + + + v4.16.0-rc0 + diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index d34e59e7b15..4a7048edd46 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -49,4 +49,8 @@ + + + v4.16.0-rc0 + diff --git a/tools/pom.xml b/tools/pom.xml index ab36c8b8e4b..0c27733dc58 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 9b911adfece..92e69820e44 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -49,4 +49,8 @@ + + + v4.16.0-rc0 + From a58e14cb6e5b380cda25e529eacff24b7e1a500a Mon Sep 17 00:00:00 2001 From: chenhang Date: Thu, 23 Mar 2023 04:37:01 +0000 Subject: [PATCH 002/233] [maven-release-plugin] rollback changes from release preparation of v4.16.0-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +----- bookkeeper-dist/bkctl/pom.xml | 6 +----- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +----- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +----- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +----- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +----- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +----- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +----- shaded/distributedlog-core-shaded/pom.xml | 6 +----- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +----- .../codahale-metrics-provider/pom.xml | 6 +----- stats/bookkeeper-stats-providers/pom.xml | 7 +------ .../prometheus-metrics-provider/pom.xml | 6 +----- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +----- stream/api/pom.xml | 6 +----- stream/bk-grpc-name-resolver/pom.xml | 6 +----- stream/clients/java/all/pom.xml | 6 +----- stream/clients/java/base/pom.xml | 6 +----- stream/clients/java/kv/pom.xml | 6 +----- stream/clients/java/pom.xml | 6 +----- stream/clients/pom.xml | 6 +----- stream/common/pom.xml | 6 +----- stream/distributedlog/common/pom.xml | 6 +----- stream/distributedlog/core/pom.xml | 6 +----- stream/distributedlog/io/dlfs/pom.xml | 6 +----- stream/distributedlog/io/pom.xml | 6 +----- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +----- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +----- stream/server/pom.xml | 6 +----- stream/statelib/pom.xml | 6 +----- stream/storage/api/pom.xml | 6 +----- stream/storage/impl/pom.xml | 6 +----- stream/storage/pom.xml | 6 +----- stream/tests-common/pom.xml | 6 +----- tests/backward-compat/bc-non-fips/pom.xml | 6 +----- tests/backward-compat/current-server-old-clients/pom.xml | 7 +------ tests/backward-compat/hierarchical-ledger-manager/pom.xml | 7 +------ tests/backward-compat/hostname-bookieid/pom.xml | 7 +------ tests/backward-compat/old-cookie-new-cluster/pom.xml | 7 +------ tests/backward-compat/pom.xml | 6 +----- tests/backward-compat/recovery-no-password/pom.xml | 6 +----- tests/backward-compat/upgrade-direct/pom.xml | 7 +------ tests/backward-compat/upgrade/pom.xml | 7 +------ tests/backward-compat/yahoo-custom-version/pom.xml | 7 +------ tests/docker-images/all-released-versions-image/pom.xml | 6 +----- tests/docker-images/all-versions-image/pom.xml | 6 +----- tests/docker-images/pom.xml | 6 +----- tests/integration-tests-base-groovy/pom.xml | 6 +----- tests/integration-tests-base/pom.xml | 6 +----- tests/integration-tests-topologies/pom.xml | 7 +------ tests/integration-tests-utils/pom.xml | 7 +------ tests/integration/cluster/pom.xml | 6 +----- tests/integration/pom.xml | 6 +----- tests/integration/smoke/pom.xml | 6 +----- tests/integration/standalone/pom.xml | 6 +----- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +----- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +----- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +----- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +----- tests/shaded/pom.xml | 6 +----- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +----- tools/framework/pom.xml | 6 +----- tools/ledger/pom.xml | 6 +----- tools/perf/pom.xml | 7 +------ tools/pom.xml | 2 +- tools/stream/pom.xml | 7 +------ 90 files changed, 93 insertions(+), 365 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 848e60da93d..2161747b8db 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 5760b29794f..7c6b4654165 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 4bd48e41f4b..7526bf02e3c 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 8f676e41e10..170d2e040c0 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -154,8 +154,4 @@ - - - v4.16.0-rc0 - diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index ec0b62b63bb..f26e8b0b694 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -79,8 +79,4 @@ - - - v4.16.0-rc0 - diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index fd7576d552d..405af3d86d3 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 9c531167c40..b9fc5de8cf0 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -129,8 +129,4 @@ - - - v4.16.0-rc0 - diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index cdcc87cac8e..b14ad46a91e 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index f2ce4e45295..996708ca8ca 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 207192639d4..6ea0a35fd8f 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index a706473ecc3..2aae0c2813b 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index d0cc9070e48..c568eaf336d 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 133c0de6f80..a46b20c23d7 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index b77c2dfc5fe..9850f0d193a 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,14 +18,10 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API - - - v4.16.0-rc0 - diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 61bbcc6441c..cd59d929caa 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 1dbbbea69ba..0f3c98ef3f1 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -31,8 +31,4 @@ ${project.parent.version} - - - v4.16.0-rc0 - diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 312e1e9dabd..ae621a8ba6b 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.0 + 4.16.0-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 2f5930c4d23..f53fe9d92e8 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index a1a20ae7941..f218b8cf4c7 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index ad5f8f05bf6..1a769c1ed4e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.0 + 4.16.0-SNAPSHOT .. 4.0.0 @@ -150,8 +150,4 @@ - - - v4.16.0-rc0 - diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 7a47a51817c..2cc467e7a15 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index deaa8a6618f..43096e97217 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index d2beac71651..d61ae3dfcd9 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 8f95bc35c66..b154986600d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.0-rc0 + branch-4.13 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 3b881c5325c..1134003932d 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-shaded @@ -126,8 +126,4 @@ - - - v4.16.0-rc0 - diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 5b231ddcab1..137755ccfa6 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-tests-shaded @@ -144,8 +144,4 @@ - - - v4.16.0-rc0 - diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 8ac4dca053d..6ca0e6aeb71 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.distributedlog @@ -238,8 +238,4 @@ - - - v4.16.0-rc0 - diff --git a/shaded/pom.xml b/shaded/pom.xml index 4407963edd3..eac5dd2536d 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 6ecc1a46bae..ec9d9b84df3 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,8 +59,4 @@ - - - v4.16.0-rc0 - diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index c11560f698a..60aefd95be2 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,8 +53,4 @@ guava - - - v4.16.0-rc0 - diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index ec62e2d800c..b45fe458f9d 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 bookkeeper-stats-providers @@ -29,9 +29,4 @@ codahale-metrics-provider prometheus-metrics-provider - - - - v4.16.0-rc0 - diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index f60af8c5565..70151a575c0 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,8 +72,4 @@ - - - v4.16.0-rc0 - diff --git a/stats/pom.xml b/stats/pom.xml index b278f629eb4..302757e98e9 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 73754e99649..5d6067c4539 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,8 +50,4 @@ jackson-annotations - - - v4.16.0-rc0 - diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 8175c1cb604..64288ce6391 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -46,8 +46,4 @@ freebuilder - - - v4.16.0-rc0 - diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index c2de6d6baac..7fce49b5e4b 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -77,8 +77,4 @@ test - - - v4.16.0-rc0 - diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 1a1379959df..0130d73bd01 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,8 +112,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 83485603683..e7b2eefed87 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,8 +59,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index a77d08743d1..16aa9463ac0 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,8 +47,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index ae282b8c5ee..3dfa255abad 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-java-client-parent @@ -31,8 +31,4 @@ kv all - - - v4.16.0-rc0 - diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index fa9b5f60221..88ab060bb4a 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-clients-parent @@ -47,8 +47,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 73a23bdebd3..c11adffef4e 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -74,8 +74,4 @@ test - - - v4.16.0-rc0 - diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index a1099fb8f91..8c6d4febfed 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,8 +106,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 916f1e4a86b..67caafa1430 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,8 +138,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 2e2e243a8c1..e451bd80939 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.0 + 4.16.0-SNAPSHOT ../.. org.apache.distributedlog @@ -88,8 +88,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 600c57f9c68..8a59e6011a6 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 distributedlog-io @@ -28,8 +28,4 @@ dlfs - - - v4.16.0-rc0 - diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index dd8cd43a612..88ed3749fcc 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 39b35a6a5c5..cd29b40f628 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,8 +61,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/pom.xml b/stream/pom.xml index aa0717839eb..f311ed213ec 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index ed5c59daa92..bd60d3de1e8 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -118,8 +118,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/server/pom.xml b/stream/server/pom.xml index d2aabac11fa..3fc2255ee57 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,8 +82,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 4585ac1dd28..23996e66e70 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -130,8 +130,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 74423ff4a3a..08532aa4a1e 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-service-api @@ -55,8 +55,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 9fa04aec269..c683eecf2ed 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-service-impl @@ -121,8 +121,4 @@ - - - v4.16.0-rc0 - diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index d761dce9cc6..22c48802e2f 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-service-parent @@ -30,8 +30,4 @@ api impl - - - v4.16.0-rc0 - diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 7747cf267d9..15c06e74c6f 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper.tests @@ -115,8 +115,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index c36115cd197..83abcc55ac3 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -76,8 +76,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index d92e8a7b545..14125dcbce9 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,9 +28,4 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server - - - - v4.16.0-rc0 - diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 2a2372953bf..11b1f49f487 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,9 +28,4 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager - - - - v4.16.0-rc0 - diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index c9bbd239b02..b6a66a56867 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,9 +28,4 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) - - - - v4.16.0-rc0 - diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 8f5c09b84c0..38252f3e423 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,9 +28,4 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies - - - - v4.16.0-rc0 - diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index c2ea0eb333d..0de99973608 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.0 + 4.16.0-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,8 +49,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 7354d5e7511..49ba4e6fb30 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -36,8 +36,4 @@ ${project.version} - - - v4.16.0-rc0 - diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 9887ee8d64c..5251efbf632 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,9 +28,4 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version - - - - v4.16.0-rc0 - diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index f5d8dd341a0..24b933b76d2 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,9 +28,4 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version - - - - v4.16.0-rc0 - diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 0c1485fd32b..905ea4cc585 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,9 +28,4 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current - - - - v4.16.0-rc0 - diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 9ee1f51beb4..c6fd2231b6a 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -68,8 +68,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index eb548734afa..e1f3b0bff8a 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -108,8 +108,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 5e1f46f5873..7e6d8b4d224 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests docker-images @@ -30,8 +30,4 @@ all-released-versions-image all-versions-image - - - v4.16.0-rc0 - diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index d3948dcfb19..e0ec99b280f 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.0 + 4.16.0-SNAPSHOT ../integration-tests-base @@ -109,8 +109,4 @@ test - - - v4.16.0-rc0 - diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 1c82bd2cd70..bb41e64cc68 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index c68452ab818..1db5b38ee43 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -45,9 +45,4 @@ ${project.version} - - - - v4.16.0-rc0 - diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 0d24aec128d..5ebe80613bf 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -89,9 +89,4 @@ - - - - v4.16.0-rc0 - diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 597e5ed0479..af558658834 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -83,8 +83,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 90bbaa798f1..f16e14da797 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests integration @@ -70,8 +70,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 4fd244e08ab..a9bedbd1a8a 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -72,8 +72,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 942cae5c308..fd859cae43f 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -68,8 +68,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/pom.xml b/tests/pom.xml index 296b5464346..e5125198470 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index e13dcbc4fe8..6a3e614d504 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -73,8 +73,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 5eff5128673..9a4a9f7bb85 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-shaded-test @@ -59,8 +59,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index d8fed5503e5..b4451298527 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-tests-shaded-test @@ -75,8 +75,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 9543b75511d..7f56df50eff 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. distributedlog-core-shaded-test @@ -84,8 +84,4 @@ - - - v4.16.0-rc0 - diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 08fb1aa45e9..c0cbd8ddb00 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper.tests.shaded @@ -32,8 +32,4 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test - - - v4.16.0-rc0 - diff --git a/testtools/pom.xml b/testtools/pom.xml index 3e5e6c94ba2..600a4830e4e 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.0 + 4.16.0-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index d61e38abc8c..ee5c964cefc 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools @@ -79,8 +79,4 @@ - - - v4.16.0-rc0 - diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 062bcc2de59..2eac74ce22b 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,8 +41,4 @@ test - - - v4.16.0-rc0 - diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 3883821d6bf..748344109f8 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,8 +71,4 @@ test - - - v4.16.0-rc0 - diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 4a7048edd46..aa01fb322d5 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,9 +48,4 @@ HdrHistogram - - - - v4.16.0-rc0 - diff --git a/tools/pom.xml b/tools/pom.xml index 0c27733dc58..ab36c8b8e4b 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 92e69820e44..6add7836229 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,9 +48,4 @@ ${project.version} - - - - v4.16.0-rc0 - From 332647feaff26a1865285e56e437deb7045eed7b Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Sun, 26 Mar 2023 11:11:20 +0800 Subject: [PATCH 003/233] Fix write entry failed in without writing journal case (#3884) ### Motivation https://github.com/apache/bookkeeper/pull/3837 introduced group flush add responses triggered by journal sync. However, if we skip writing journals, the add responses won't be flushed to the netty channel and the client will receive write entries timeout. ### Changes - Flush the add responses when skipping writing journals - Add tests to cover V2 protocol and skip writing journal cases. (cherry picked from commit 5deadcc2411d225e5bdf5dfbf25469fef6adb3b0) --- .../apache/bookkeeper/bookie/BookieImpl.java | 4 ++++ .../client/BookieWriteLedgerTest.java | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java index 0db230d9d3d..0628ec28afa 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java @@ -69,6 +69,7 @@ import org.apache.bookkeeper.net.BookieId; import org.apache.bookkeeper.net.BookieSocketAddress; import org.apache.bookkeeper.net.DNS; +import org.apache.bookkeeper.proto.BookieRequestHandler; import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.WriteCallback; import org.apache.bookkeeper.stats.NullStatsLogger; import org.apache.bookkeeper.stats.StatsLogger; @@ -948,6 +949,9 @@ private void addEntryInternal(LedgerDescriptor handle, ByteBuf entry, if (!writeDataToJournal) { cb.writeComplete(0, ledgerId, entryId, null, ctx); + if (ctx instanceof BookieRequestHandler) { + ((BookieRequestHandler) ctx).flushPendingResponse(); + } return; } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java index 8ae0b720192..2a57f9952f2 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java @@ -39,6 +39,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Enumeration; import java.util.HashMap; import java.util.List; @@ -68,6 +69,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; import org.powermock.reflect.Whitebox; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,12 +78,26 @@ /** * Testing ledger write entry cases. */ +@RunWith(Parameterized.class) public class BookieWriteLedgerTest extends BookKeeperClusterTestCase implements AddCallback { private static final Logger LOG = LoggerFactory .getLogger(BookieWriteLedgerTest.class); + @Parameterized.Parameters + public static Collection data() { + return Arrays.asList(new Object[][] { + { true, true }, { true, false }, { false, true }, { false, false } + }); + } + + @Parameterized.Parameter(0) + public boolean useV2; + + @Parameterized.Parameter(1) + public boolean writeJournal; + byte[] ledgerPassword = "aaa".getBytes(); LedgerHandle lh, lh2; Enumeration ls; @@ -119,12 +136,14 @@ public BookieWriteLedgerTest() { String ledgerManagerFactory = "org.apache.bookkeeper.meta.HierarchicalLedgerManagerFactory"; // set ledger manager baseConf.setLedgerManagerFactoryClassName(ledgerManagerFactory); + baseConf.setJournalWriteData(writeJournal); /* * 'testLedgerCreateAdvWithLedgerIdInLoop2' testcase relies on skipListSizeLimit, * so setting it to some small value for making that testcase lite. */ baseConf.setSkipListSizeLimit(4 * 1024 * 1024); baseClientConf.setLedgerManagerFactoryClassName(ledgerManagerFactory); + baseClientConf.setUseV2WireProtocol(useV2); } /** From 5474a84549de8e02470014b2c7462eb97e71034e Mon Sep 17 00:00:00 2001 From: chenhang Date: Sun, 26 Mar 2023 03:50:57 +0000 Subject: [PATCH 004/233] [maven-release-plugin] prepare release v4.16.0-rc1 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +++++- bookkeeper-dist/bkctl/pom.xml | 6 +++++- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +++++- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +++++- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +++++- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +++++- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +++++- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +++++- shaded/distributedlog-core-shaded/pom.xml | 6 +++++- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +++++- .../codahale-metrics-provider/pom.xml | 6 +++++- stats/bookkeeper-stats-providers/pom.xml | 6 +++++- .../prometheus-metrics-provider/pom.xml | 6 +++++- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +++++- stream/api/pom.xml | 6 +++++- stream/bk-grpc-name-resolver/pom.xml | 6 +++++- stream/clients/java/all/pom.xml | 6 +++++- stream/clients/java/base/pom.xml | 6 +++++- stream/clients/java/kv/pom.xml | 6 +++++- stream/clients/java/pom.xml | 6 +++++- stream/clients/pom.xml | 6 +++++- stream/common/pom.xml | 6 +++++- stream/distributedlog/common/pom.xml | 6 +++++- stream/distributedlog/core/pom.xml | 6 +++++- stream/distributedlog/io/dlfs/pom.xml | 6 +++++- stream/distributedlog/io/pom.xml | 6 +++++- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +++++- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +++++- stream/server/pom.xml | 6 +++++- stream/statelib/pom.xml | 6 +++++- stream/storage/api/pom.xml | 6 +++++- stream/storage/impl/pom.xml | 6 +++++- stream/storage/pom.xml | 6 +++++- stream/tests-common/pom.xml | 6 +++++- tests/backward-compat/bc-non-fips/pom.xml | 6 +++++- tests/backward-compat/current-server-old-clients/pom.xml | 6 +++++- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +++++- tests/backward-compat/hostname-bookieid/pom.xml | 6 +++++- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +++++- tests/backward-compat/pom.xml | 6 +++++- tests/backward-compat/recovery-no-password/pom.xml | 6 +++++- tests/backward-compat/upgrade-direct/pom.xml | 6 +++++- tests/backward-compat/upgrade/pom.xml | 6 +++++- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +++++- tests/docker-images/all-released-versions-image/pom.xml | 6 +++++- tests/docker-images/all-versions-image/pom.xml | 6 +++++- tests/docker-images/pom.xml | 6 +++++- tests/integration-tests-base-groovy/pom.xml | 6 +++++- tests/integration-tests-base/pom.xml | 6 +++++- tests/integration-tests-topologies/pom.xml | 6 +++++- tests/integration-tests-utils/pom.xml | 6 +++++- tests/integration/cluster/pom.xml | 6 +++++- tests/integration/pom.xml | 6 +++++- tests/integration/smoke/pom.xml | 6 +++++- tests/integration/standalone/pom.xml | 6 +++++- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +++++- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +++++- tests/shaded/pom.xml | 6 +++++- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +++++- tools/framework/pom.xml | 6 +++++- tools/ledger/pom.xml | 6 +++++- tools/perf/pom.xml | 6 +++++- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +++++- 90 files changed, 353 insertions(+), 93 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 2161747b8db..848e60da93d 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 7c6b4654165..5760b29794f 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 7526bf02e3c..4bd48e41f4b 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 170d2e040c0..18ce5328f1e 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -154,4 +154,8 @@ + + + v4.16.0-rc1 + diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index f26e8b0b694..4ced31a61db 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -79,4 +79,8 @@ + + + v4.16.0-rc1 + diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 405af3d86d3..fd7576d552d 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index b9fc5de8cf0..c45616a515e 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -129,4 +129,8 @@ + + + v4.16.0-rc1 + diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index b14ad46a91e..cdcc87cac8e 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 996708ca8ca..f2ce4e45295 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 6ea0a35fd8f..207192639d4 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 2aae0c2813b..a706473ecc3 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index c568eaf336d..d0cc9070e48 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index a46b20c23d7..133c0de6f80 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 9850f0d193a..7840c108c5d 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,10 +18,14 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API + + + v4.16.0-rc1 + diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index cd59d929caa..61bbcc6441c 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 0f3c98ef3f1..005c1bec5c9 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -31,4 +31,8 @@ ${project.parent.version} + + + v4.16.0-rc1 + diff --git a/buildtools/pom.xml b/buildtools/pom.xml index ae621a8ba6b..312e1e9dabd 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 buildtools Apache BookKeeper :: Build Tools - 4.16.0-SNAPSHOT + 4.16.0 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index f53fe9d92e8..2f5930c4d23 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index f218b8cf4c7..a1a20ae7941 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 1a769c1ed4e..d4b50ffd264 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.0-SNAPSHOT + 4.16.0 .. 4.0.0 @@ -150,4 +150,8 @@ + + + v4.16.0-rc1 + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 2cc467e7a15..7a47a51817c 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 43096e97217..deaa8a6618f 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index d61ae3dfcd9..d2beac71651 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. diff --git a/pom.xml b/pom.xml index b154986600d..4f7f8f7b7c3 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.13 + v4.16.0-rc1 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 1134003932d..149460d9457 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-shaded @@ -126,4 +126,8 @@ + + + v4.16.0-rc1 + diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 137755ccfa6..a83d3806c55 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-tests-shaded @@ -144,4 +144,8 @@ + + + v4.16.0-rc1 + diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 6ca0e6aeb71..42835a609b1 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.distributedlog @@ -238,4 +238,8 @@ + + + v4.16.0-rc1 + diff --git a/shaded/pom.xml b/shaded/pom.xml index eac5dd2536d..4407963edd3 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index ec9d9b84df3..d77913d422d 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,4 +59,8 @@ + + + v4.16.0-rc1 + diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 60aefd95be2..1b0dce1e2e2 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,4 +53,8 @@ guava + + + v4.16.0-rc1 + diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index b45fe458f9d..71115b8ea87 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 bookkeeper-stats-providers @@ -29,4 +29,8 @@ codahale-metrics-provider prometheus-metrics-provider + + + v4.16.0-rc1 + diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 70151a575c0..0ff012de49b 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,4 +72,8 @@ + + + v4.16.0-rc1 + diff --git a/stats/pom.xml b/stats/pom.xml index 302757e98e9..b278f629eb4 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 5d6067c4539..c20c17556d2 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,4 +50,8 @@ jackson-annotations + + + v4.16.0-rc1 + diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 64288ce6391..e32137d3ed8 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -46,4 +46,8 @@ freebuilder + + + v4.16.0-rc1 + diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 7fce49b5e4b..d3268376652 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -77,4 +77,8 @@ test + + + v4.16.0-rc1 + diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 0130d73bd01..c670cca3e99 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,4 +112,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index e7b2eefed87..d448be88b9c 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,4 +59,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 16aa9463ac0..dc82a38d0f2 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,4 +47,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 3dfa255abad..74132521d66 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-java-client-parent @@ -31,4 +31,8 @@ kv all + + + v4.16.0-rc1 + diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 88ab060bb4a..1d5269a45fb 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-clients-parent @@ -47,4 +47,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/common/pom.xml b/stream/common/pom.xml index c11adffef4e..0538f7a02ad 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -74,4 +74,8 @@ test + + + v4.16.0-rc1 + diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 8c6d4febfed..fb921165059 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,4 +106,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 67caafa1430..949aac424c0 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,4 +138,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index e451bd80939..e12e8a1018a 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.0-SNAPSHOT + 4.16.0 ../.. org.apache.distributedlog @@ -88,4 +88,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 8a59e6011a6..1ce5513c766 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 distributedlog-io @@ -28,4 +28,8 @@ dlfs + + + v4.16.0-rc1 + diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 88ed3749fcc..dd8cd43a612 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index cd29b40f628..8d5a2897bf2 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,4 +61,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/pom.xml b/stream/pom.xml index f311ed213ec..aa0717839eb 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bd60d3de1e8..62e1b0cd3b8 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -118,4 +118,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 3fc2255ee57..7b06527d35e 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,4 +82,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 23996e66e70..3f7621036b5 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -130,4 +130,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 08532aa4a1e..c60d0651fd4 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-service-api @@ -55,4 +55,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index c683eecf2ed..3bfac7d59bd 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-service-impl @@ -121,4 +121,8 @@ + + + v4.16.0-rc1 + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 22c48802e2f..9262a80ec91 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-service-parent @@ -30,4 +30,8 @@ api impl + + + v4.16.0-rc1 + diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 15c06e74c6f..9c1c6ee2dcc 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper.tests @@ -115,4 +115,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 83abcc55ac3..d8bffb360b5 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -76,4 +76,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 14125dcbce9..c820180c927 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server + + + v4.16.0-rc1 + diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 11b1f49f487..152cb827498 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager + + + v4.16.0-rc1 + diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index b6a66a56867..c27304a55bf 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) + + + v4.16.0-rc1 + diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 38252f3e423..8e7b1ba44fa 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies + + + v4.16.0-rc1 + diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 0de99973608..4655ebfcbde 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.0-SNAPSHOT + 4.16.0 ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,4 +49,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 49ba4e6fb30..32a502ca6ee 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -36,4 +36,8 @@ ${project.version} + + + v4.16.0-rc1 + diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 5251efbf632..66425bf4523 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version + + + v4.16.0-rc1 + diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 24b933b76d2..f2a9ea890e2 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version + + + v4.16.0-rc1 + diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 905ea4cc585..76360398098 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current + + + v4.16.0-rc1 + diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index c6fd2231b6a..786f5a82bf1 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.tests @@ -68,4 +68,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index e1f3b0bff8a..6054bdfd112 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.tests @@ -108,4 +108,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 7e6d8b4d224..3608c70b766 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests docker-images @@ -30,4 +30,8 @@ all-released-versions-image all-versions-image + + + v4.16.0-rc1 + diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index e0ec99b280f..b2fc2357361 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.0-SNAPSHOT + 4.16.0 ../integration-tests-base @@ -109,4 +109,8 @@ test + + + v4.16.0-rc1 + diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index bb41e64cc68..e1e3627c5e8 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 1db5b38ee43..79e9834bf88 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -45,4 +45,8 @@ ${project.version} + + + v4.16.0-rc1 + diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 5ebe80613bf..cad790f0a99 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index af558658834..a10007fff49 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -83,4 +83,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index f16e14da797..d2943c30f71 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests integration @@ -70,4 +70,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index a9bedbd1a8a..25f4eea3b98 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -72,4 +72,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index fd859cae43f..c0eee6944b5 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -68,4 +68,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/pom.xml b/tests/pom.xml index e5125198470..296b5464346 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 6a3e614d504..c77e903aa10 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -73,4 +73,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 9a4a9f7bb85..1da9ced0040 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-shaded-test @@ -59,4 +59,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index b4451298527..40957c5bc15 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-tests-shaded-test @@ -75,4 +75,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 7f56df50eff..125abc27842 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. distributedlog-core-shaded-test @@ -84,4 +84,8 @@ + + + v4.16.0-rc1 + diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index c0cbd8ddb00..bec12bd0635 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper.tests.shaded @@ -32,4 +32,8 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test + + + v4.16.0-rc1 + diff --git a/testtools/pom.xml b/testtools/pom.xml index 600a4830e4e..3e5e6c94ba2 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 testtools Apache BookKeeper :: Test Tools - 4.16.0-SNAPSHOT + 4.16.0 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index ee5c964cefc..b17d41cf624 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools Apache BookKeeper :: Tools @@ -79,4 +79,8 @@ + + + v4.16.0-rc1 + diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 2eac74ce22b..fa0fd44b3bd 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,4 +41,8 @@ test + + + v4.16.0-rc1 + diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 748344109f8..a2581ba453b 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,4 +71,8 @@ test + + + v4.16.0-rc1 + diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index aa01fb322d5..0ba8ba5834f 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,4 +48,8 @@ HdrHistogram + + + v4.16.0-rc1 + diff --git a/tools/pom.xml b/tools/pom.xml index ab36c8b8e4b..0c27733dc58 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 6add7836229..e6b16d0533d 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,4 +48,8 @@ ${project.version} + + + v4.16.0-rc1 + From f12fb0f97e2e305c6fc62ce8baddad771645bf1d Mon Sep 17 00:00:00 2001 From: chenhang Date: Sun, 26 Mar 2023 03:51:09 +0000 Subject: [PATCH 005/233] [maven-release-plugin] rollback changes from release preparation of v4.16.0-rc1 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +----- bookkeeper-dist/bkctl/pom.xml | 6 +----- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +----- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +----- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +----- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +----- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +----- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +----- shaded/distributedlog-core-shaded/pom.xml | 6 +----- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +----- .../codahale-metrics-provider/pom.xml | 6 +----- stats/bookkeeper-stats-providers/pom.xml | 6 +----- .../prometheus-metrics-provider/pom.xml | 6 +----- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +----- stream/api/pom.xml | 6 +----- stream/bk-grpc-name-resolver/pom.xml | 6 +----- stream/clients/java/all/pom.xml | 6 +----- stream/clients/java/base/pom.xml | 6 +----- stream/clients/java/kv/pom.xml | 6 +----- stream/clients/java/pom.xml | 6 +----- stream/clients/pom.xml | 6 +----- stream/common/pom.xml | 6 +----- stream/distributedlog/common/pom.xml | 6 +----- stream/distributedlog/core/pom.xml | 6 +----- stream/distributedlog/io/dlfs/pom.xml | 6 +----- stream/distributedlog/io/pom.xml | 6 +----- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +----- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +----- stream/server/pom.xml | 6 +----- stream/statelib/pom.xml | 6 +----- stream/storage/api/pom.xml | 6 +----- stream/storage/impl/pom.xml | 6 +----- stream/storage/pom.xml | 6 +----- stream/tests-common/pom.xml | 6 +----- tests/backward-compat/bc-non-fips/pom.xml | 6 +----- tests/backward-compat/current-server-old-clients/pom.xml | 6 +----- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +----- tests/backward-compat/hostname-bookieid/pom.xml | 6 +----- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +----- tests/backward-compat/pom.xml | 6 +----- tests/backward-compat/recovery-no-password/pom.xml | 6 +----- tests/backward-compat/upgrade-direct/pom.xml | 6 +----- tests/backward-compat/upgrade/pom.xml | 6 +----- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +----- tests/docker-images/all-released-versions-image/pom.xml | 6 +----- tests/docker-images/all-versions-image/pom.xml | 6 +----- tests/docker-images/pom.xml | 6 +----- tests/integration-tests-base-groovy/pom.xml | 6 +----- tests/integration-tests-base/pom.xml | 6 +----- tests/integration-tests-topologies/pom.xml | 6 +----- tests/integration-tests-utils/pom.xml | 6 +----- tests/integration/cluster/pom.xml | 6 +----- tests/integration/pom.xml | 6 +----- tests/integration/smoke/pom.xml | 6 +----- tests/integration/standalone/pom.xml | 6 +----- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +----- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +----- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +----- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +----- tests/shaded/pom.xml | 6 +----- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +----- tools/framework/pom.xml | 6 +----- tools/ledger/pom.xml | 6 +----- tools/perf/pom.xml | 6 +----- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +----- 90 files changed, 93 insertions(+), 353 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 848e60da93d..2161747b8db 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 5760b29794f..7c6b4654165 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 4bd48e41f4b..7526bf02e3c 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 18ce5328f1e..170d2e040c0 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -154,8 +154,4 @@ - - - v4.16.0-rc1 - diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 4ced31a61db..f26e8b0b694 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -79,8 +79,4 @@ - - - v4.16.0-rc1 - diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index fd7576d552d..405af3d86d3 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index c45616a515e..b9fc5de8cf0 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -129,8 +129,4 @@ - - - v4.16.0-rc1 - diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index cdcc87cac8e..b14ad46a91e 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index f2ce4e45295..996708ca8ca 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 207192639d4..6ea0a35fd8f 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index a706473ecc3..2aae0c2813b 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index d0cc9070e48..c568eaf336d 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 133c0de6f80..a46b20c23d7 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 7840c108c5d..9850f0d193a 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,14 +18,10 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API - - - v4.16.0-rc1 - diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 61bbcc6441c..cd59d929caa 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 005c1bec5c9..0f3c98ef3f1 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -31,8 +31,4 @@ ${project.parent.version} - - - v4.16.0-rc1 - diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 312e1e9dabd..ae621a8ba6b 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.0 + 4.16.0-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 2f5930c4d23..f53fe9d92e8 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index a1a20ae7941..f218b8cf4c7 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index d4b50ffd264..1a769c1ed4e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.0 + 4.16.0-SNAPSHOT .. 4.0.0 @@ -150,8 +150,4 @@ - - - v4.16.0-rc1 - diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 7a47a51817c..2cc467e7a15 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index deaa8a6618f..43096e97217 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index d2beac71651..d61ae3dfcd9 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 4f7f8f7b7c3..b154986600d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.0-rc1 + branch-4.13 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 149460d9457..1134003932d 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-shaded @@ -126,8 +126,4 @@ - - - v4.16.0-rc1 - diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index a83d3806c55..137755ccfa6 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-tests-shaded @@ -144,8 +144,4 @@ - - - v4.16.0-rc1 - diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 42835a609b1..6ca0e6aeb71 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.distributedlog @@ -238,8 +238,4 @@ - - - v4.16.0-rc1 - diff --git a/shaded/pom.xml b/shaded/pom.xml index 4407963edd3..eac5dd2536d 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index d77913d422d..ec9d9b84df3 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,8 +59,4 @@ - - - v4.16.0-rc1 - diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 1b0dce1e2e2..60aefd95be2 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,8 +53,4 @@ guava - - - v4.16.0-rc1 - diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 71115b8ea87..b45fe458f9d 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 bookkeeper-stats-providers @@ -29,8 +29,4 @@ codahale-metrics-provider prometheus-metrics-provider - - - v4.16.0-rc1 - diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 0ff012de49b..70151a575c0 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,8 +72,4 @@ - - - v4.16.0-rc1 - diff --git a/stats/pom.xml b/stats/pom.xml index b278f629eb4..302757e98e9 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index c20c17556d2..5d6067c4539 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,8 +50,4 @@ jackson-annotations - - - v4.16.0-rc1 - diff --git a/stream/api/pom.xml b/stream/api/pom.xml index e32137d3ed8..64288ce6391 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -46,8 +46,4 @@ freebuilder - - - v4.16.0-rc1 - diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index d3268376652..7fce49b5e4b 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -77,8 +77,4 @@ test - - - v4.16.0-rc1 - diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index c670cca3e99..0130d73bd01 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,8 +112,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index d448be88b9c..e7b2eefed87 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,8 +59,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index dc82a38d0f2..16aa9463ac0 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,8 +47,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 74132521d66..3dfa255abad 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-java-client-parent @@ -31,8 +31,4 @@ kv all - - - v4.16.0-rc1 - diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 1d5269a45fb..88ab060bb4a 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-clients-parent @@ -47,8 +47,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 0538f7a02ad..c11adffef4e 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -74,8 +74,4 @@ test - - - v4.16.0-rc1 - diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index fb921165059..8c6d4febfed 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,8 +106,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 949aac424c0..67caafa1430 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,8 +138,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index e12e8a1018a..e451bd80939 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.0 + 4.16.0-SNAPSHOT ../.. org.apache.distributedlog @@ -88,8 +88,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 1ce5513c766..8a59e6011a6 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 distributedlog-io @@ -28,8 +28,4 @@ dlfs - - - v4.16.0-rc1 - diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index dd8cd43a612..88ed3749fcc 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 8d5a2897bf2..cd29b40f628 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,8 +61,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/pom.xml b/stream/pom.xml index aa0717839eb..f311ed213ec 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 62e1b0cd3b8..bd60d3de1e8 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -118,8 +118,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 7b06527d35e..3fc2255ee57 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,8 +82,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 3f7621036b5..23996e66e70 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -130,8 +130,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index c60d0651fd4..08532aa4a1e 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-service-api @@ -55,8 +55,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 3bfac7d59bd..c683eecf2ed 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-service-impl @@ -121,8 +121,4 @@ - - - v4.16.0-rc1 - diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 9262a80ec91..22c48802e2f 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-service-parent @@ -30,8 +30,4 @@ api impl - - - v4.16.0-rc1 - diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 9c1c6ee2dcc..15c06e74c6f 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper.tests @@ -115,8 +115,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index d8bffb360b5..83abcc55ac3 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -76,8 +76,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index c820180c927..14125dcbce9 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server - - - v4.16.0-rc1 - diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 152cb827498..11b1f49f487 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager - - - v4.16.0-rc1 - diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index c27304a55bf..b6a66a56867 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) - - - v4.16.0-rc1 - diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 8e7b1ba44fa..38252f3e423 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies - - - v4.16.0-rc1 - diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 4655ebfcbde..0de99973608 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.0 + 4.16.0-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,8 +49,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 32a502ca6ee..49ba4e6fb30 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -36,8 +36,4 @@ ${project.version} - - - v4.16.0-rc1 - diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 66425bf4523..5251efbf632 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version - - - v4.16.0-rc1 - diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index f2a9ea890e2..24b933b76d2 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version - - - v4.16.0-rc1 - diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 76360398098..905ea4cc585 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current - - - v4.16.0-rc1 - diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 786f5a82bf1..c6fd2231b6a 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -68,8 +68,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 6054bdfd112..e1f3b0bff8a 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -108,8 +108,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 3608c70b766..7e6d8b4d224 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests docker-images @@ -30,8 +30,4 @@ all-released-versions-image all-versions-image - - - v4.16.0-rc1 - diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index b2fc2357361..e0ec99b280f 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.0 + 4.16.0-SNAPSHOT ../integration-tests-base @@ -109,8 +109,4 @@ test - - - v4.16.0-rc1 - diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index e1e3627c5e8..bb41e64cc68 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 79e9834bf88..1db5b38ee43 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -45,8 +45,4 @@ ${project.version} - - - v4.16.0-rc1 - diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index cad790f0a99..5ebe80613bf 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index a10007fff49..af558658834 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -83,8 +83,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index d2943c30f71..f16e14da797 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests integration @@ -70,8 +70,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 25f4eea3b98..a9bedbd1a8a 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -72,8 +72,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index c0eee6944b5..fd859cae43f 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -68,8 +68,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/pom.xml b/tests/pom.xml index 296b5464346..e5125198470 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index c77e903aa10..6a3e614d504 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -73,8 +73,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 1da9ced0040..9a4a9f7bb85 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-shaded-test @@ -59,8 +59,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 40957c5bc15..b4451298527 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-tests-shaded-test @@ -75,8 +75,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 125abc27842..7f56df50eff 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. distributedlog-core-shaded-test @@ -84,8 +84,4 @@ - - - v4.16.0-rc1 - diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index bec12bd0635..c0cbd8ddb00 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper.tests.shaded @@ -32,8 +32,4 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test - - - v4.16.0-rc1 - diff --git a/testtools/pom.xml b/testtools/pom.xml index 3e5e6c94ba2..600a4830e4e 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.0 + 4.16.0-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index b17d41cf624..ee5c964cefc 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools @@ -79,8 +79,4 @@ - - - v4.16.0-rc1 - diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index fa0fd44b3bd..2eac74ce22b 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,8 +41,4 @@ test - - - v4.16.0-rc1 - diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index a2581ba453b..748344109f8 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,8 +71,4 @@ test - - - v4.16.0-rc1 - diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 0ba8ba5834f..aa01fb322d5 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,8 +48,4 @@ HdrHistogram - - - v4.16.0-rc1 - diff --git a/tools/pom.xml b/tools/pom.xml index 0c27733dc58..ab36c8b8e4b 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index e6b16d0533d..6add7836229 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,8 +48,4 @@ ${project.version} - - - v4.16.0-rc1 - From 378eb07b5c85eb499307f107aafa065154e0137f Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Tue, 28 Mar 2023 17:02:33 +0800 Subject: [PATCH 006/233] Optimize log4j dependency in Bookkeeper (#3892) (cherry picked from commit e440132802ad883216453642820e407db00baed3) --- bookkeeper-server/pom.xml | 8 ++++++++ pom.xml | 8 -------- testtools/pom.xml | 11 +++++++++++ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index a46b20c23d7..ca7834ad410 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -153,6 +153,14 @@ com.carrotsearch hppc + + org.apache.logging.log4j + log4j-core + + + org.apache.logging.log4j + log4j-slf4j-impl + org.apache.bookkeeper diff --git a/pom.xml b/pom.xml index b154986600d..89918cce5cb 100644 --- a/pom.xml +++ b/pom.xml @@ -830,14 +830,6 @@ org.slf4j slf4j-api - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-slf4j-impl - commons-configuration commons-configuration diff --git a/testtools/pom.xml b/testtools/pom.xml index 600a4830e4e..5ad6441ebb1 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -25,4 +25,15 @@ testtools Apache BookKeeper :: Test Tools 4.16.0-SNAPSHOT + + + + org.apache.logging.log4j + log4j-core + + + org.apache.logging.log4j + log4j-slf4j-impl + + From 9b5a8106b5129aab1f47be70a8ed344f871c8466 Mon Sep 17 00:00:00 2001 From: lixinyang <84127069+Nicklee007@users.noreply.github.com> Date: Wed, 29 Mar 2023 09:44:45 +0800 Subject: [PATCH 007/233] release ledgerHandler when no missing fragments in checkAllLedgers (#3888) ### Motivation In checkAllLedgers when the ledger no missing fragments, will miss invoke` lh.closeAsync()` to close ledgerHandler, which cause autorecovery not invoke `unregisterLedgerMetadataListener` to release ledger metadata listeners. Heap memory be used too much and maybe will cause OOM; image ### Changes 1. Invoke` lh.closeAsync()` when no missing fragments; (cherry picked from commit 164417afc2474cbf4ba51e7cb57206b0eeb7d424) --- .../AuditorCheckAllLedgersTask.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java index 73ca36cd752..f6b7a6f36ed 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java @@ -267,19 +267,19 @@ public void operationComplete(int rc, Set fragments) { if (bookies.isEmpty()) { // no missing fragments callback.processResult(BKException.Code.OK, null, null); - return; + } else { + publishSuspectedLedgersAsync(bookies.stream().map(BookieId::toString).collect(Collectors.toList()), + Sets.newHashSet(lh.getId()) + ).whenComplete((result, cause) -> { + if (null != cause) { + LOG.error("Auditor exception publishing suspected ledger {} with lost bookies {}", + lh.getId(), bookies, cause); + callback.processResult(BKException.Code.ReplicationException, null, null); + } else { + callback.processResult(BKException.Code.OK, null, null); + } + }); } - publishSuspectedLedgersAsync(bookies.stream().map(BookieId::toString).collect(Collectors.toList()), - Sets.newHashSet(lh.getId()) - ).whenComplete((result, cause) -> { - if (null != cause) { - LOG.error("Auditor exception publishing suspected ledger {} with lost bookies {}", - lh.getId(), bookies, cause); - callback.processResult(BKException.Code.ReplicationException, null, null); - } else { - callback.processResult(BKException.Code.OK, null, null); - } - }); } else { callback.processResult(rc, null, null); } From c14d5523a33743e788a310f78df5f3ff22d8875f Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Wed, 29 Mar 2023 17:42:05 +0800 Subject: [PATCH 008/233] upgrade hadoop version to 3.3.5 to resolve CVE-2019-10202 (#3896) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Motivation There is a critical CVE-2019-10202 in `org.codehaus.jackson:jackson-mapper-asl` Detailed paths Introduced through: org.apache.distributedlog:dlfs@4.16.0-SNAPSHOT › org.apache.hadoop:hadoop-common@3.3.4 › org.apache.avro:avro@1.7.7 › org.codehaus.jackson:jackson-mapper-asl@1.9.2 Fix: No remediation path available. Introduced through: org.apache.distributedlog:dlfs@4.16.0-SNAPSHOT › org.apache.hadoop:hadoop-common@3.3.4 › com.sun.jersey:jersey-json@1.19 › org.codehaus.jackson:jackson-mapper-asl@1.9.2 Fix: No remediation path available. Introduced through: org.apache.distributedlog:dlfs@4.16.0-SNAPSHOT › org.apache.hadoop:hadoop-common@3.3.4 › com.sun.jersey:jersey-json@1.19 › org.codehaus.jackson:jackson-jaxrs@1.9.2 › org.codehaus.jackson:jackson-mapper-asl@1.9.2 Fix: No remediation path available. Introduced through: org.apache.distributedlog:dlfs@4.16.0-SNAPSHOT › org.apache.hadoop:hadoop-common@3.3.4 › com.sun.jersey:jersey-json@1.19 › org.codehaus.jackson:jackson-xc@1.9.2 › org.codehaus.jackson:jackson-mapper-asl@1.9.2 Fix: No remediation path available. ### Changes Upgrade hadoop-common version from 3.3.4 to 3.3.5 to resolve this CVE (cherry picked from commit 0171a408e21a51eb74e18a07df1b0ea71b7638ff) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 89918cce5cb..b43f99371d8 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ 1.47.0 31.0.1-jre 1.1.1 - 3.3.4 + 3.3.5 1.3 2.1.10 2.13.4.20221013 From 8890a61418e3961e0000108b3c2e8ea176691e5f Mon Sep 17 00:00:00 2001 From: chenhang Date: Wed, 29 Mar 2023 11:44:17 +0000 Subject: [PATCH 009/233] [maven-release-plugin] prepare release v4.16.0-rc2 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +++++- bookkeeper-dist/bkctl/pom.xml | 6 +++++- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +++++- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +++++- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +++++- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +++++- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +++++- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +++++- shaded/distributedlog-core-shaded/pom.xml | 6 +++++- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +++++- .../codahale-metrics-provider/pom.xml | 6 +++++- stats/bookkeeper-stats-providers/pom.xml | 6 +++++- .../prometheus-metrics-provider/pom.xml | 6 +++++- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +++++- stream/api/pom.xml | 6 +++++- stream/bk-grpc-name-resolver/pom.xml | 6 +++++- stream/clients/java/all/pom.xml | 6 +++++- stream/clients/java/base/pom.xml | 6 +++++- stream/clients/java/kv/pom.xml | 6 +++++- stream/clients/java/pom.xml | 6 +++++- stream/clients/pom.xml | 6 +++++- stream/common/pom.xml | 6 +++++- stream/distributedlog/common/pom.xml | 6 +++++- stream/distributedlog/core/pom.xml | 6 +++++- stream/distributedlog/io/dlfs/pom.xml | 6 +++++- stream/distributedlog/io/pom.xml | 6 +++++- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +++++- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +++++- stream/server/pom.xml | 6 +++++- stream/statelib/pom.xml | 6 +++++- stream/storage/api/pom.xml | 6 +++++- stream/storage/impl/pom.xml | 6 +++++- stream/storage/pom.xml | 6 +++++- stream/tests-common/pom.xml | 6 +++++- tests/backward-compat/bc-non-fips/pom.xml | 6 +++++- tests/backward-compat/current-server-old-clients/pom.xml | 6 +++++- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +++++- tests/backward-compat/hostname-bookieid/pom.xml | 6 +++++- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +++++- tests/backward-compat/pom.xml | 6 +++++- tests/backward-compat/recovery-no-password/pom.xml | 6 +++++- tests/backward-compat/upgrade-direct/pom.xml | 6 +++++- tests/backward-compat/upgrade/pom.xml | 6 +++++- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +++++- tests/docker-images/all-released-versions-image/pom.xml | 6 +++++- tests/docker-images/all-versions-image/pom.xml | 6 +++++- tests/docker-images/pom.xml | 6 +++++- tests/integration-tests-base-groovy/pom.xml | 6 +++++- tests/integration-tests-base/pom.xml | 6 +++++- tests/integration-tests-topologies/pom.xml | 6 +++++- tests/integration-tests-utils/pom.xml | 6 +++++- tests/integration/cluster/pom.xml | 6 +++++- tests/integration/pom.xml | 6 +++++- tests/integration/smoke/pom.xml | 6 +++++- tests/integration/standalone/pom.xml | 6 +++++- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +++++- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +++++- tests/shaded/pom.xml | 6 +++++- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +++++- tools/framework/pom.xml | 6 +++++- tools/ledger/pom.xml | 6 +++++- tools/perf/pom.xml | 6 +++++- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +++++- 90 files changed, 353 insertions(+), 93 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 2161747b8db..848e60da93d 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 7c6b4654165..5760b29794f 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 7526bf02e3c..4bd48e41f4b 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 170d2e040c0..f2b922d0fa7 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -154,4 +154,8 @@ + + + v4.16.0-rc2 + diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index f26e8b0b694..157eca70405 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -79,4 +79,8 @@ + + + v4.16.0-rc2 + diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 405af3d86d3..fd7576d552d 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index b9fc5de8cf0..12e80064896 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -129,4 +129,8 @@ + + + v4.16.0-rc2 + diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index b14ad46a91e..cdcc87cac8e 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 996708ca8ca..f2ce4e45295 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 6ea0a35fd8f..207192639d4 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 2aae0c2813b..a706473ecc3 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index c568eaf336d..d0cc9070e48 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index ca7834ad410..68ed78bc6ee 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 9850f0d193a..49a59699544 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,10 +18,14 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API + + + v4.16.0-rc2 + diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index cd59d929caa..61bbcc6441c 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 0f3c98ef3f1..fde8ad59257 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -31,4 +31,8 @@ ${project.parent.version} + + + v4.16.0-rc2 + diff --git a/buildtools/pom.xml b/buildtools/pom.xml index ae621a8ba6b..312e1e9dabd 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 buildtools Apache BookKeeper :: Build Tools - 4.16.0-SNAPSHOT + 4.16.0 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index f53fe9d92e8..2f5930c4d23 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index f218b8cf4c7..a1a20ae7941 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 1a769c1ed4e..2dbe803bcb7 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.0-SNAPSHOT + 4.16.0 .. 4.0.0 @@ -150,4 +150,8 @@ + + + v4.16.0-rc2 + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 2cc467e7a15..7a47a51817c 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 43096e97217..deaa8a6618f 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index d61ae3dfcd9..d2beac71651 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. diff --git a/pom.xml b/pom.xml index b43f99371d8..a9ae561a9d8 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.13 + v4.16.0-rc2 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 1134003932d..aced8969980 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-shaded @@ -126,4 +126,8 @@ + + + v4.16.0-rc2 + diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 137755ccfa6..8f8873d4cf3 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-tests-shaded @@ -144,4 +144,8 @@ + + + v4.16.0-rc2 + diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 6ca0e6aeb71..0b960f67414 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.distributedlog @@ -238,4 +238,8 @@ + + + v4.16.0-rc2 + diff --git a/shaded/pom.xml b/shaded/pom.xml index eac5dd2536d..4407963edd3 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index ec9d9b84df3..3f57962f54f 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,4 +59,8 @@ + + + v4.16.0-rc2 + diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 60aefd95be2..523bcfd0a5d 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,4 +53,8 @@ guava + + + v4.16.0-rc2 + diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index b45fe458f9d..5b0b4aa94be 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 bookkeeper-stats-providers @@ -29,4 +29,8 @@ codahale-metrics-provider prometheus-metrics-provider + + + v4.16.0-rc2 + diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 70151a575c0..3d7ff592d74 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,4 +72,8 @@ + + + v4.16.0-rc2 + diff --git a/stats/pom.xml b/stats/pom.xml index 302757e98e9..b278f629eb4 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 5d6067c4539..d1da33b85ac 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,4 +50,8 @@ jackson-annotations + + + v4.16.0-rc2 + diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 64288ce6391..065772faad1 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -46,4 +46,8 @@ freebuilder + + + v4.16.0-rc2 + diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 7fce49b5e4b..7e789b06349 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -77,4 +77,8 @@ test + + + v4.16.0-rc2 + diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 0130d73bd01..6a5d48144b9 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,4 +112,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index e7b2eefed87..65087532e53 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,4 +59,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 16aa9463ac0..6cb3bb1cf95 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,4 +47,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 3dfa255abad..891bc1d34e5 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-java-client-parent @@ -31,4 +31,8 @@ kv all + + + v4.16.0-rc2 + diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 88ab060bb4a..7ababa70f0d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-clients-parent @@ -47,4 +47,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/common/pom.xml b/stream/common/pom.xml index c11adffef4e..96f0318c895 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -74,4 +74,8 @@ test + + + v4.16.0-rc2 + diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 8c6d4febfed..6efbae77cd5 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,4 +106,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 67caafa1430..56a4d6c867d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,4 +138,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index e451bd80939..c0008b16f28 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.0-SNAPSHOT + 4.16.0 ../.. org.apache.distributedlog @@ -88,4 +88,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 8a59e6011a6..166c40d8f60 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 distributedlog-io @@ -28,4 +28,8 @@ dlfs + + + v4.16.0-rc2 + diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 88ed3749fcc..dd8cd43a612 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index cd29b40f628..913ff13f44e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.0 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,4 +61,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/pom.xml b/stream/pom.xml index f311ed213ec..aa0717839eb 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bd60d3de1e8..fecf937b89e 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -118,4 +118,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 3fc2255ee57..00b82d19fcc 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,4 +82,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 23996e66e70..27459b33559 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper @@ -130,4 +130,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 08532aa4a1e..b3c4dcf1c0f 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-service-api @@ -55,4 +55,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index c683eecf2ed..8068e9c9666 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-service-impl @@ -121,4 +121,8 @@ + + + v4.16.0-rc2 + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 22c48802e2f..c16d87a9761 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. stream-storage-service-parent @@ -30,4 +30,8 @@ api impl + + + v4.16.0-rc2 + diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 15c06e74c6f..64c8fcc6e15 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper.tests @@ -115,4 +115,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 83abcc55ac3..c6a53eae362 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -76,4 +76,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 14125dcbce9..26685b8fd8f 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server + + + v4.16.0-rc2 + diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 11b1f49f487..c6c29fa496c 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager + + + v4.16.0-rc2 + diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index b6a66a56867..d7e36ef6b4a 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) + + + v4.16.0-rc2 + diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 38252f3e423..a7edcef8396 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies + + + v4.16.0-rc2 + diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 0de99973608..0f102a1dde9 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.0-SNAPSHOT + 4.16.0 ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,4 +49,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 49ba4e6fb30..e7901be0f01 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -36,4 +36,8 @@ ${project.version} + + + v4.16.0-rc2 + diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 5251efbf632..a10fbc3c55a 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version + + + v4.16.0-rc2 + diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 24b933b76d2..beeb80c7e72 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version + + + v4.16.0-rc2 + diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 905ea4cc585..cd2b74bd54f 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -28,4 +28,8 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current + + + v4.16.0-rc2 + diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index c6fd2231b6a..03a2725a2a0 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.tests @@ -68,4 +68,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index e1f3b0bff8a..c9914151151 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0-SNAPSHOT + 4.16.0 4.0.0 org.apache.bookkeeper.tests @@ -108,4 +108,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 7e6d8b4d224..d90a52f3f8d 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests docker-images @@ -30,4 +30,8 @@ all-released-versions-image all-versions-image + + + v4.16.0-rc2 + diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index e0ec99b280f..898f876af02 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.0-SNAPSHOT + 4.16.0 ../integration-tests-base @@ -109,4 +109,8 @@ test + + + v4.16.0-rc2 + diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index bb41e64cc68..f41592fa350 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 1db5b38ee43..225e2934592 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -45,4 +45,8 @@ ${project.version} + + + v4.16.0-rc2 + diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 5ebe80613bf..a1d1349c065 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index af558658834..e5c659b7dd4 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -83,4 +83,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index f16e14da797..f770bdadd0f 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests integration @@ -70,4 +70,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index a9bedbd1a8a..fb9e6d8b259 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -72,4 +72,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index fd859cae43f..34e4489969b 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.0 .. @@ -68,4 +68,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/pom.xml b/tests/pom.xml index e5125198470..296b5464346 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 6a3e614d504..44ecc4f29b5 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 org.apache.bookkeeper.tests @@ -73,4 +73,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 9a4a9f7bb85..be8ad9a1ec8 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-shaded-test @@ -59,4 +59,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index b4451298527..1110479f305 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. bookkeeper-server-tests-shaded-test @@ -75,4 +75,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 7f56df50eff..5a146d916d8 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. distributedlog-core-shaded-test @@ -84,4 +84,8 @@ + + + v4.16.0-rc2 + diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index c0cbd8ddb00..926c6d07e53 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.0 .. org.apache.bookkeeper.tests.shaded @@ -32,4 +32,8 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test + + + v4.16.0-rc2 + diff --git a/testtools/pom.xml b/testtools/pom.xml index 5ad6441ebb1..93063d4eb81 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 testtools Apache BookKeeper :: Test Tools - 4.16.0-SNAPSHOT + 4.16.0 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index ee5c964cefc..34af4731c60 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools Apache BookKeeper :: Tools @@ -79,4 +79,8 @@ + + + v4.16.0-rc2 + diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 2eac74ce22b..7c36d4ba3d0 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,4 +41,8 @@ test + + + v4.16.0-rc2 + diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 748344109f8..f5c852d1464 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,4 +71,8 @@ test + + + v4.16.0-rc2 + diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index aa01fb322d5..fefaee72e0d 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,4 +48,8 @@ HdrHistogram + + + v4.16.0-rc2 + diff --git a/tools/pom.xml b/tools/pom.xml index ab36c8b8e4b..0c27733dc58 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.0 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 6add7836229..00e9eea9408 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0-SNAPSHOT + 4.16.0 stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,4 +48,8 @@ ${project.version} + + + v4.16.0-rc2 + From 25852eafdeb4a58192a40c830a0888ad09db21ca Mon Sep 17 00:00:00 2001 From: chenhang Date: Wed, 29 Mar 2023 11:44:28 +0000 Subject: [PATCH 010/233] [maven-release-plugin] rollback changes from release preparation of v4.16.0-rc2 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +----- bookkeeper-dist/bkctl/pom.xml | 6 +----- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +----- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +----- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +----- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +----- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +----- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +----- shaded/distributedlog-core-shaded/pom.xml | 6 +----- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +----- .../codahale-metrics-provider/pom.xml | 6 +----- stats/bookkeeper-stats-providers/pom.xml | 6 +----- .../prometheus-metrics-provider/pom.xml | 6 +----- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +----- stream/api/pom.xml | 6 +----- stream/bk-grpc-name-resolver/pom.xml | 6 +----- stream/clients/java/all/pom.xml | 6 +----- stream/clients/java/base/pom.xml | 6 +----- stream/clients/java/kv/pom.xml | 6 +----- stream/clients/java/pom.xml | 6 +----- stream/clients/pom.xml | 6 +----- stream/common/pom.xml | 6 +----- stream/distributedlog/common/pom.xml | 6 +----- stream/distributedlog/core/pom.xml | 6 +----- stream/distributedlog/io/dlfs/pom.xml | 6 +----- stream/distributedlog/io/pom.xml | 6 +----- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +----- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +----- stream/server/pom.xml | 6 +----- stream/statelib/pom.xml | 6 +----- stream/storage/api/pom.xml | 6 +----- stream/storage/impl/pom.xml | 6 +----- stream/storage/pom.xml | 6 +----- stream/tests-common/pom.xml | 6 +----- tests/backward-compat/bc-non-fips/pom.xml | 6 +----- tests/backward-compat/current-server-old-clients/pom.xml | 6 +----- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +----- tests/backward-compat/hostname-bookieid/pom.xml | 6 +----- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +----- tests/backward-compat/pom.xml | 6 +----- tests/backward-compat/recovery-no-password/pom.xml | 6 +----- tests/backward-compat/upgrade-direct/pom.xml | 6 +----- tests/backward-compat/upgrade/pom.xml | 6 +----- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +----- tests/docker-images/all-released-versions-image/pom.xml | 6 +----- tests/docker-images/all-versions-image/pom.xml | 6 +----- tests/docker-images/pom.xml | 6 +----- tests/integration-tests-base-groovy/pom.xml | 6 +----- tests/integration-tests-base/pom.xml | 6 +----- tests/integration-tests-topologies/pom.xml | 6 +----- tests/integration-tests-utils/pom.xml | 6 +----- tests/integration/cluster/pom.xml | 6 +----- tests/integration/pom.xml | 6 +----- tests/integration/smoke/pom.xml | 6 +----- tests/integration/standalone/pom.xml | 6 +----- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +----- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +----- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +----- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +----- tests/shaded/pom.xml | 6 +----- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +----- tools/framework/pom.xml | 6 +----- tools/ledger/pom.xml | 6 +----- tools/perf/pom.xml | 6 +----- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +----- 90 files changed, 93 insertions(+), 353 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 848e60da93d..2161747b8db 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 5760b29794f..7c6b4654165 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 4bd48e41f4b..7526bf02e3c 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index f2b922d0fa7..170d2e040c0 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -154,8 +154,4 @@ - - - v4.16.0-rc2 - diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 157eca70405..f26e8b0b694 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -79,8 +79,4 @@ - - - v4.16.0-rc2 - diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index fd7576d552d..405af3d86d3 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 12e80064896..b9fc5de8cf0 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -129,8 +129,4 @@ - - - v4.16.0-rc2 - diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index cdcc87cac8e..b14ad46a91e 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index f2ce4e45295..996708ca8ca 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 207192639d4..6ea0a35fd8f 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index a706473ecc3..2aae0c2813b 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index d0cc9070e48..c568eaf336d 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 68ed78bc6ee..ca7834ad410 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 49a59699544..9850f0d193a 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,14 +18,10 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API - - - v4.16.0-rc2 - diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 61bbcc6441c..cd59d929caa 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index fde8ad59257..0f3c98ef3f1 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -31,8 +31,4 @@ ${project.parent.version} - - - v4.16.0-rc2 - diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 312e1e9dabd..ae621a8ba6b 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.0 + 4.16.0-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 2f5930c4d23..f53fe9d92e8 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index a1a20ae7941..f218b8cf4c7 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 2dbe803bcb7..1a769c1ed4e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.0 + 4.16.0-SNAPSHOT .. 4.0.0 @@ -150,8 +150,4 @@ - - - v4.16.0-rc2 - diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 7a47a51817c..2cc467e7a15 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index deaa8a6618f..43096e97217 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index d2beac71651..d61ae3dfcd9 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index a9ae561a9d8..b43f99371d8 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.0-rc2 + branch-4.13 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index aced8969980..1134003932d 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-shaded @@ -126,8 +126,4 @@ - - - v4.16.0-rc2 - diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 8f8873d4cf3..137755ccfa6 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-tests-shaded @@ -144,8 +144,4 @@ - - - v4.16.0-rc2 - diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 0b960f67414..6ca0e6aeb71 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.distributedlog @@ -238,8 +238,4 @@ - - - v4.16.0-rc2 - diff --git a/shaded/pom.xml b/shaded/pom.xml index 4407963edd3..eac5dd2536d 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 3f57962f54f..ec9d9b84df3 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,8 +59,4 @@ - - - v4.16.0-rc2 - diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 523bcfd0a5d..60aefd95be2 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,8 +53,4 @@ guava - - - v4.16.0-rc2 - diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 5b0b4aa94be..b45fe458f9d 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 bookkeeper-stats-providers @@ -29,8 +29,4 @@ codahale-metrics-provider prometheus-metrics-provider - - - v4.16.0-rc2 - diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 3d7ff592d74..70151a575c0 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,8 +72,4 @@ - - - v4.16.0-rc2 - diff --git a/stats/pom.xml b/stats/pom.xml index b278f629eb4..302757e98e9 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index d1da33b85ac..5d6067c4539 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,8 +50,4 @@ jackson-annotations - - - v4.16.0-rc2 - diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 065772faad1..64288ce6391 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -46,8 +46,4 @@ freebuilder - - - v4.16.0-rc2 - diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 7e789b06349..7fce49b5e4b 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -77,8 +77,4 @@ test - - - v4.16.0-rc2 - diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 6a5d48144b9..0130d73bd01 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,8 +112,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 65087532e53..e7b2eefed87 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,8 +59,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 6cb3bb1cf95..16aa9463ac0 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,8 +47,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 891bc1d34e5..3dfa255abad 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-java-client-parent @@ -31,8 +31,4 @@ kv all - - - v4.16.0-rc2 - diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 7ababa70f0d..88ab060bb4a 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-clients-parent @@ -47,8 +47,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 96f0318c895..c11adffef4e 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -74,8 +74,4 @@ test - - - v4.16.0-rc2 - diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 6efbae77cd5..8c6d4febfed 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,8 +106,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 56a4d6c867d..67caafa1430 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,8 +138,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index c0008b16f28..e451bd80939 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.0 + 4.16.0-SNAPSHOT ../.. org.apache.distributedlog @@ -88,8 +88,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 166c40d8f60..8a59e6011a6 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 distributedlog-io @@ -28,8 +28,4 @@ dlfs - - - v4.16.0-rc2 - diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index dd8cd43a612..88ed3749fcc 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 913ff13f44e..cd29b40f628 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0 + 4.16.0-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,8 +61,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/pom.xml b/stream/pom.xml index aa0717839eb..f311ed213ec 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index fecf937b89e..bd60d3de1e8 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -118,8 +118,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 00b82d19fcc..3fc2255ee57 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,8 +82,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 27459b33559..23996e66e70 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper @@ -130,8 +130,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index b3c4dcf1c0f..08532aa4a1e 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-service-api @@ -55,8 +55,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 8068e9c9666..c683eecf2ed 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-service-impl @@ -121,8 +121,4 @@ - - - v4.16.0-rc2 - diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index c16d87a9761..22c48802e2f 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. stream-storage-service-parent @@ -30,8 +30,4 @@ api impl - - - v4.16.0-rc2 - diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 64c8fcc6e15..15c06e74c6f 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper.tests @@ -115,8 +115,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index c6a53eae362..83abcc55ac3 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -76,8 +76,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 26685b8fd8f..14125dcbce9 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server - - - v4.16.0-rc2 - diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index c6c29fa496c..11b1f49f487 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager - - - v4.16.0-rc2 - diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index d7e36ef6b4a..b6a66a56867 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) - - - v4.16.0-rc2 - diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index a7edcef8396..38252f3e423 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies - - - v4.16.0-rc2 - diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 0f102a1dde9..0de99973608 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.0 + 4.16.0-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,8 +49,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index e7901be0f01..49ba4e6fb30 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -36,8 +36,4 @@ ${project.version} - - - v4.16.0-rc2 - diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a10fbc3c55a..5251efbf632 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version - - - v4.16.0-rc2 - diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index beeb80c7e72..24b933b76d2 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version - - - v4.16.0-rc2 - diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index cd2b74bd54f..905ea4cc585 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -28,8 +28,4 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current - - - v4.16.0-rc2 - diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 03a2725a2a0..c6fd2231b6a 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -68,8 +68,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index c9914151151..e1f3b0bff8a 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0 + 4.16.0-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -108,8 +108,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index d90a52f3f8d..7e6d8b4d224 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests docker-images @@ -30,8 +30,4 @@ all-released-versions-image all-versions-image - - - v4.16.0-rc2 - diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 898f876af02..e0ec99b280f 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.0 + 4.16.0-SNAPSHOT ../integration-tests-base @@ -109,8 +109,4 @@ test - - - v4.16.0-rc2 - diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index f41592fa350..bb41e64cc68 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 225e2934592..1db5b38ee43 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -45,8 +45,4 @@ ${project.version} - - - v4.16.0-rc2 - diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index a1d1349c065..5ebe80613bf 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index e5c659b7dd4..af558658834 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -83,8 +83,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index f770bdadd0f..f16e14da797 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests integration @@ -70,8 +70,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index fb9e6d8b259..a9bedbd1a8a 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -72,8 +72,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 34e4489969b..fd859cae43f 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0 + 4.16.0-SNAPSHOT .. @@ -68,8 +68,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/pom.xml b/tests/pom.xml index 296b5464346..e5125198470 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 44ecc4f29b5..6a3e614d504 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT org.apache.bookkeeper.tests @@ -73,8 +73,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index be8ad9a1ec8..9a4a9f7bb85 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-shaded-test @@ -59,8 +59,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 1110479f305..b4451298527 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. bookkeeper-server-tests-shaded-test @@ -75,8 +75,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 5a146d916d8..7f56df50eff 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. distributedlog-core-shaded-test @@ -84,8 +84,4 @@ - - - v4.16.0-rc2 - diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 926c6d07e53..c0cbd8ddb00 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0 + 4.16.0-SNAPSHOT .. org.apache.bookkeeper.tests.shaded @@ -32,8 +32,4 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test - - - v4.16.0-rc2 - diff --git a/testtools/pom.xml b/testtools/pom.xml index 93063d4eb81..5ad6441ebb1 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.0 + 4.16.0-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 34af4731c60..ee5c964cefc 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools @@ -79,8 +79,4 @@ - - - v4.16.0-rc2 - diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 7c36d4ba3d0..2eac74ce22b 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,8 +41,4 @@ test - - - v4.16.0-rc2 - diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index f5c852d1464..748344109f8 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,8 +71,4 @@ test - - - v4.16.0-rc2 - diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index fefaee72e0d..aa01fb322d5 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,8 +48,4 @@ HdrHistogram - - - v4.16.0-rc2 - diff --git a/tools/pom.xml b/tools/pom.xml index 0c27733dc58..ab36c8b8e4b 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0 + 4.16.0-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 00e9eea9408..6add7836229 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0 + 4.16.0-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,8 +48,4 @@ ${project.version} - - - v4.16.0-rc2 - From 424ec12541371645ecb3ad0c8f524ec138a613e5 Mon Sep 17 00:00:00 2001 From: Michael Marshall Date: Fri, 14 Apr 2023 07:22:12 -0500 Subject: [PATCH 011/233] [fix] DigestManager should not advance readerIndex (#3919) (cherry picked from commit df4492012cc03682534cbc8dd68dd81163b0c947) --- .../org/apache/bookkeeper/proto/checksum/DigestManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DigestManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DigestManager.java index 9f931f731a2..eab33945b1e 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DigestManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DigestManager.java @@ -159,7 +159,7 @@ private ReferenceCounted computeDigestAndPackageForSendingV2(long entryId, long buf.readerIndex(0); if (isSmallEntry) { - buf.writeBytes(unwrapped); + buf.writeBytes(unwrapped, unwrapped.readerIndex(), unwrapped.readableBytes()); unwrapped.release(); return buf; } else { From c772d0e9a28f672a1f51968a425fe20194241f0d Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Sat, 15 Apr 2023 00:01:10 +0800 Subject: [PATCH 012/233] Upgrade python client version to 4.16.1 (#3921) --- stream/clients/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream/clients/python/setup.py b/stream/clients/python/setup.py index d2c1c36bffb..03d2c8a87c2 100644 --- a/stream/clients/python/setup.py +++ b/stream/clients/python/setup.py @@ -19,7 +19,7 @@ name = 'apache-bookkeeper-client' description = 'Apache BookKeeper client library' -version = '4.16.0' +version = '4.16.1' # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta' From d1b3dbfa5c3848f7cb5cb62142ab7d9445b86f65 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Sat, 15 Apr 2023 01:06:51 +0800 Subject: [PATCH 013/233] Bump branch-4.16 development version to 4.16.1-SNAPSHOT (#3920) --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 90 files changed, 92 insertions(+), 92 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 2161747b8db..c7b786a2e09 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 7c6b4654165..68df2afcc82 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 7526bf02e3c..7e37723c11a 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 170d2e040c0..bfa902a1f49 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index f26e8b0b694..53e11269108 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 405af3d86d3..7f0d86c8d43 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index b9fc5de8cf0..3c53c535462 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index b14ad46a91e..167ada7944a 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 996708ca8ca..0ee3ae1b2b9 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 6ea0a35fd8f..8a2e4f65b65 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 2aae0c2813b..b307ca775ec 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index c568eaf336d..e105e7c84ce 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index ca7834ad410..d53c3a40252 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 9850f0d193a..5640737eb4f 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index cd59d929caa..db52bf7cb5c 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 0f3c98ef3f1..94226b11867 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index ae621a8ba6b..22d52df9d0b 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index f53fe9d92e8..541c071cce3 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index f218b8cf4c7..23e333c1a46 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 1a769c1ed4e..2d13190404e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 2cc467e7a15..f22dda375ff 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 43096e97217..dfa6cd6cc58 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index d61ae3dfcd9..4ef4467b5e7 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index b43f99371d8..b04d8e1acc4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 1134003932d..5b357ff789c 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 137755ccfa6..b491fc5d986 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 6ca0e6aeb71..88db77d3006 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index eac5dd2536d..2ecfae091ad 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index ec9d9b84df3..0bb20a73e95 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 60aefd95be2..c247ba1e636 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index b45fe458f9d..0abc5dd27d3 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 70151a575c0..284da098703 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 302757e98e9..b7885a6c9b9 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 5d6067c4539..57f57ab687c 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 64288ce6391..4a431ba28ed 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 7fce49b5e4b..d06f8007c68 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 0130d73bd01..2c8c2ff9d76 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index e7b2eefed87..554ca204383 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 16aa9463ac0..aa597b9514c 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 3dfa255abad..a2a4d432f1c 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 88ab060bb4a..fe9f4b44f37 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index c11adffef4e..25a272714c2 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 8c6d4febfed..cac43c5c702 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 67caafa1430..1915206c938 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index e451bd80939..7a4b45abc71 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 8a59e6011a6..00fdef05aff 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 88ed3749fcc..e8c357dc977 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index cd29b40f628..8dfaa4df814 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index f311ed213ec..1050538d528 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bd60d3de1e8..18eb972aa1f 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 3fc2255ee57..b37e08959b1 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 23996e66e70..76a6eca6d57 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 08532aa4a1e..43a7c94b5b8 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index c683eecf2ed..266e631ff5d 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 22c48802e2f..c9e2a0f794a 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 15c06e74c6f..6961f64c509 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 83abcc55ac3..402b025f667 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 14125dcbce9..008b336e0c4 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 11b1f49f487..d64727ae18c 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index b6a66a56867..ca8df5dc603 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 38252f3e423..a625d253cc9 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 0de99973608..d673841c9bb 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 49ba4e6fb30..cdf79010d5e 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 5251efbf632..002212d8820 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 24b933b76d2..e7992d8520b 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 905ea4cc585..99f96f68b2f 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index c6fd2231b6a..8da404766b8 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index e1f3b0bff8a..881fb8d61e4 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 7e6d8b4d224..350bf731dc1 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index e0ec99b280f..59fa057863d 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index bb41e64cc68..3016acad0b5 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 1db5b38ee43..41467b34cb2 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 5ebe80613bf..2fffa5a89f9 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index af558658834..8d04433c8f9 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index f16e14da797..18bf94de153 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index a9bedbd1a8a..dcde0a7b7ff 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index fd859cae43f..26f7d8f0d32 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index e5125198470..21b0a718940 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 6a3e614d504..a369678dd7b 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 9a4a9f7bb85..0142dbcf0bd 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index b4451298527..bf70960c755 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 7f56df50eff..5be495d8c21 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index c0cbd8ddb00..22e2c2992f4 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 5ad6441ebb1..02e1b37791a 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index ee5c964cefc..c8dffe8c60c 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 2eac74ce22b..d2941bfe039 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 748344109f8..71dd242d373 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index aa01fb322d5..50b89b6ece8 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index ab36c8b8e4b..090c82c8acd 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 6add7836229..f8509d7fb4a 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.0-SNAPSHOT + 4.16.1-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From 8122a87c78a0159e422fc0baac43201eda44ae94 Mon Sep 17 00:00:00 2001 From: chenhang Date: Sat, 15 Apr 2023 01:46:55 +0000 Subject: [PATCH 014/233] [maven-release-plugin] prepare release v4.16.1-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +++++- bookkeeper-dist/bkctl/pom.xml | 6 +++++- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +++++- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +++++- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +++++- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +++++- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +++++- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +++++- shaded/distributedlog-core-shaded/pom.xml | 6 +++++- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +++++- .../codahale-metrics-provider/pom.xml | 6 +++++- stats/bookkeeper-stats-providers/pom.xml | 6 +++++- .../prometheus-metrics-provider/pom.xml | 6 +++++- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +++++- stream/api/pom.xml | 6 +++++- stream/bk-grpc-name-resolver/pom.xml | 6 +++++- stream/clients/java/all/pom.xml | 6 +++++- stream/clients/java/base/pom.xml | 6 +++++- stream/clients/java/kv/pom.xml | 6 +++++- stream/clients/java/pom.xml | 6 +++++- stream/clients/pom.xml | 6 +++++- stream/common/pom.xml | 6 +++++- stream/distributedlog/common/pom.xml | 6 +++++- stream/distributedlog/core/pom.xml | 6 +++++- stream/distributedlog/io/dlfs/pom.xml | 6 +++++- stream/distributedlog/io/pom.xml | 6 +++++- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +++++- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +++++- stream/server/pom.xml | 6 +++++- stream/statelib/pom.xml | 6 +++++- stream/storage/api/pom.xml | 6 +++++- stream/storage/impl/pom.xml | 6 +++++- stream/storage/pom.xml | 6 +++++- stream/tests-common/pom.xml | 6 +++++- tests/backward-compat/bc-non-fips/pom.xml | 6 +++++- tests/backward-compat/current-server-old-clients/pom.xml | 6 +++++- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +++++- tests/backward-compat/hostname-bookieid/pom.xml | 6 +++++- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +++++- tests/backward-compat/pom.xml | 6 +++++- tests/backward-compat/recovery-no-password/pom.xml | 6 +++++- tests/backward-compat/upgrade-direct/pom.xml | 6 +++++- tests/backward-compat/upgrade/pom.xml | 6 +++++- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +++++- tests/docker-images/all-released-versions-image/pom.xml | 6 +++++- tests/docker-images/all-versions-image/pom.xml | 6 +++++- tests/docker-images/pom.xml | 6 +++++- tests/integration-tests-base-groovy/pom.xml | 6 +++++- tests/integration-tests-base/pom.xml | 6 +++++- tests/integration-tests-topologies/pom.xml | 6 +++++- tests/integration-tests-utils/pom.xml | 6 +++++- tests/integration/cluster/pom.xml | 6 +++++- tests/integration/pom.xml | 6 +++++- tests/integration/smoke/pom.xml | 6 +++++- tests/integration/standalone/pom.xml | 6 +++++- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +++++- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +++++- tests/shaded/pom.xml | 6 +++++- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +++++- tools/framework/pom.xml | 6 +++++- tools/ledger/pom.xml | 6 +++++- tools/perf/pom.xml | 6 +++++- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +++++- 90 files changed, 353 insertions(+), 93 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index c7b786a2e09..b0927ae49d4 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 68df2afcc82..e922585bbe3 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 7e37723c11a..b6a1f376bf9 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index bfa902a1f49..070ddbe4fb5 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -154,4 +154,8 @@ + + + v4.16.1-rc0 + diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 53e11269108..72456ccde12 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -79,4 +79,8 @@ + + + v4.16.1-rc0 + diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 7f0d86c8d43..d96c1fdafe9 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 3c53c535462..cc9edfd8194 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -129,4 +129,8 @@ + + + v4.16.1-rc0 + diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 167ada7944a..8d1af899a6e 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 0ee3ae1b2b9..6d1b7e1c07c 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 8a2e4f65b65..2525d149853 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index b307ca775ec..86510ba65c4 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index e105e7c84ce..c12127bf0f6 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index d53c3a40252..d7155429762 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 5640737eb4f..dde58f3008b 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,10 +18,14 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API + + + v4.16.1-rc0 + diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index db52bf7cb5c..ffec9b3fed9 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 94226b11867..4f0a17183d1 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. org.apache.bookkeeper @@ -31,4 +31,8 @@ ${project.parent.version} + + + v4.16.1-rc0 + diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 22d52df9d0b..bfaabc853fc 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 buildtools Apache BookKeeper :: Build Tools - 4.16.1-SNAPSHOT + 4.16.1 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 541c071cce3..db6a9159f77 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 23e333c1a46..24053c4c88c 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 2d13190404e..beffac38fc1 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.1-SNAPSHOT + 4.16.1 .. 4.0.0 @@ -150,4 +150,8 @@ + + + v4.16.1-rc0 + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index f22dda375ff..33453a10277 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index dfa6cd6cc58..2fb3189848a 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 4ef4467b5e7..f3696274648 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. diff --git a/pom.xml b/pom.xml index b04d8e1acc4..379b18b9c3d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.13 + v4.16.1-rc0 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 5b357ff789c..db3f64237fa 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.1-SNAPSHOT + 4.16.1 .. bookkeeper-server-shaded @@ -126,4 +126,8 @@ + + + v4.16.1-rc0 + diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index b491fc5d986..b324b24f2c7 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.1-SNAPSHOT + 4.16.1 .. bookkeeper-server-tests-shaded @@ -144,4 +144,8 @@ + + + v4.16.1-rc0 + diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 88db77d3006..9ed95cda48d 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.1-SNAPSHOT + 4.16.1 .. org.apache.distributedlog @@ -238,4 +238,8 @@ + + + v4.16.1-rc0 + diff --git a/shaded/pom.xml b/shaded/pom.xml index 2ecfae091ad..67eb34fd3d2 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 0bb20a73e95..d899d335c3c 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,4 +59,8 @@ + + + v4.16.1-rc0 + diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index c247ba1e636..e1a08aaf8d1 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,4 +53,8 @@ guava + + + v4.16.1-rc0 + diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 0abc5dd27d3..7ae6952bb3b 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.1-SNAPSHOT + 4.16.1 4.0.0 bookkeeper-stats-providers @@ -29,4 +29,8 @@ codahale-metrics-provider prometheus-metrics-provider + + + v4.16.1-rc0 + diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 284da098703..32a83e86f93 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,4 +72,8 @@ + + + v4.16.1-rc0 + diff --git a/stats/pom.xml b/stats/pom.xml index b7885a6c9b9..57f863c4d0d 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 57f57ab687c..315fd1dc30c 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,4 +50,8 @@ jackson-annotations + + + v4.16.1-rc0 + diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 4a431ba28ed..016a31f4d8b 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. org.apache.bookkeeper @@ -46,4 +46,8 @@ freebuilder + + + v4.16.1-rc0 + diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index d06f8007c68..c50eb58bf68 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. org.apache.bookkeeper @@ -77,4 +77,8 @@ test + + + v4.16.1-rc0 + diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 2c8c2ff9d76..81d57ab7465 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.1-SNAPSHOT + 4.16.1 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,4 +112,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 554ca204383..7c371801700 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.1-SNAPSHOT + 4.16.1 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,4 +59,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index aa597b9514c..2307db58077 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.1-SNAPSHOT + 4.16.1 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,4 +47,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index a2a4d432f1c..eb0ebcf8af9 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.1-SNAPSHOT + 4.16.1 .. stream-storage-java-client-parent @@ -31,4 +31,8 @@ kv all + + + v4.16.1-rc0 + diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index fe9f4b44f37..d21ef7f7916 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1-SNAPSHOT + 4.16.1 .. stream-storage-clients-parent @@ -47,4 +47,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 25a272714c2..52e5800b488 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. org.apache.bookkeeper @@ -74,4 +74,8 @@ test + + + v4.16.1-rc0 + diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index cac43c5c702..13b35ff7395 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.1-SNAPSHOT + 4.16.1 distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,4 +106,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 1915206c938..ef11cf8edf2 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.1-SNAPSHOT + 4.16.1 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,4 +138,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 7a4b45abc71..46f1215e06a 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.1-SNAPSHOT + 4.16.1 ../.. org.apache.distributedlog @@ -88,4 +88,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 00fdef05aff..43a2c677811 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.1-SNAPSHOT + 4.16.1 4.0.0 distributedlog-io @@ -28,4 +28,8 @@ dlfs + + + v4.16.1-rc0 + diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index e8c357dc977..a2df28018f0 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 8dfaa4df814..108f2b9c5fc 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.1-SNAPSHOT + 4.16.1 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,4 +61,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/pom.xml b/stream/pom.xml index 1050538d528..8efe0fcfbf5 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 18eb972aa1f..67f844b0421 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1-SNAPSHOT + 4.16.1 .. org.apache.bookkeeper @@ -118,4 +118,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/server/pom.xml b/stream/server/pom.xml index b37e08959b1..df7a1ba00d3 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1-SNAPSHOT + 4.16.1 stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,4 +82,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 76a6eca6d57..bbf73beffd0 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 .. org.apache.bookkeeper @@ -130,4 +130,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 43a7c94b5b8..249e97fe8f2 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.1-SNAPSHOT + 4.16.1 .. stream-storage-service-api @@ -55,4 +55,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 266e631ff5d..0a75f13882c 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.1-SNAPSHOT + 4.16.1 .. stream-storage-service-impl @@ -121,4 +121,8 @@ + + + v4.16.1-rc0 + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index c9e2a0f794a..617758aac79 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1-SNAPSHOT + 4.16.1 .. stream-storage-service-parent @@ -30,4 +30,8 @@ api impl + + + v4.16.1-rc0 + diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 6961f64c509..700893dad32 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1-SNAPSHOT + 4.16.1 .. org.apache.bookkeeper.tests @@ -115,4 +115,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 402b025f667..85ef6346ce7 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -76,4 +76,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 008b336e0c4..e4d39594af0 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -28,4 +28,8 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server + + + v4.16.1-rc0 + diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index d64727ae18c..f81ea1036a2 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -28,4 +28,8 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager + + + v4.16.1-rc0 + diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index ca8df5dc603..f49a54ae6ac 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -28,4 +28,8 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) + + + v4.16.1-rc0 + diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index a625d253cc9..d29bb658aea 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -28,4 +28,8 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies + + + v4.16.1-rc0 + diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index d673841c9bb..e65f69725fe 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.1-SNAPSHOT + 4.16.1 ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,4 +49,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index cdf79010d5e..854d5811a0b 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -36,4 +36,8 @@ ${project.version} + + + v4.16.1-rc0 + diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 002212d8820..2fb0cb56dda 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -28,4 +28,8 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version + + + v4.16.1-rc0 + diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index e7992d8520b..50f893d7d61 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -28,4 +28,8 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version + + + v4.16.1-rc0 + diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 99f96f68b2f..4db96f02ec0 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -28,4 +28,8 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current + + + v4.16.1-rc0 + diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 8da404766b8..1bbe287bf79 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.1-SNAPSHOT + 4.16.1 4.0.0 org.apache.bookkeeper.tests @@ -68,4 +68,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 881fb8d61e4..39c3d62c425 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.1-SNAPSHOT + 4.16.1 4.0.0 org.apache.bookkeeper.tests @@ -108,4 +108,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 350bf731dc1..661660bc0c9 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper.tests docker-images @@ -30,4 +30,8 @@ all-released-versions-image all-versions-image + + + v4.16.1-rc0 + diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 59fa057863d..ba077a1f824 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.1-SNAPSHOT + 4.16.1 ../integration-tests-base @@ -109,4 +109,8 @@ test + + + v4.16.1-rc0 + diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 3016acad0b5..80e4fc6e0da 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 41467b34cb2..e5d3223cb0b 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper.tests @@ -45,4 +45,8 @@ ${project.version} + + + v4.16.1-rc0 + diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 2fffa5a89f9..f7445d553a7 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 8d04433c8f9..4d1d5bf00cf 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -83,4 +83,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 18bf94de153..e67344e48d3 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper.tests integration @@ -70,4 +70,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index dcde0a7b7ff..4413ca891c7 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -72,4 +72,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 26f7d8f0d32..479a4abe617 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.1-SNAPSHOT + 4.16.1 .. @@ -68,4 +68,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/pom.xml b/tests/pom.xml index 21b0a718940..5a6e6c1118c 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index a369678dd7b..b07475fecb4 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.1 org.apache.bookkeeper.tests @@ -73,4 +73,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 0142dbcf0bd..a6bc10563fe 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.1-SNAPSHOT + 4.16.1 .. bookkeeper-server-shaded-test @@ -59,4 +59,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index bf70960c755..17aba537fc1 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.1-SNAPSHOT + 4.16.1 .. bookkeeper-server-tests-shaded-test @@ -75,4 +75,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 5be495d8c21..115b506df6f 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.1-SNAPSHOT + 4.16.1 .. distributedlog-core-shaded-test @@ -84,4 +84,8 @@ + + + v4.16.1-rc0 + diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 22e2c2992f4..ab4f351713f 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.1 .. org.apache.bookkeeper.tests.shaded @@ -32,4 +32,8 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test + + + v4.16.1-rc0 + diff --git a/testtools/pom.xml b/testtools/pom.xml index 02e1b37791a..cba82fea320 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 testtools Apache BookKeeper :: Test Tools - 4.16.1-SNAPSHOT + 4.16.1 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index c8dffe8c60c..2a18e7cb8bf 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 bookkeeper-tools Apache BookKeeper :: Tools @@ -79,4 +79,8 @@ + + + v4.16.1-rc0 + diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index d2941bfe039..0674553c737 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,4 +41,8 @@ test + + + v4.16.1-rc0 + diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 71dd242d373..76c08ed281c 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,4 +71,8 @@ test + + + v4.16.1-rc0 + diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 50b89b6ece8..13cc1472a28 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.1-SNAPSHOT + 4.16.1 bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,4 +48,8 @@ HdrHistogram + + + v4.16.1-rc0 + diff --git a/tools/pom.xml b/tools/pom.xml index 090c82c8acd..8ce67771451 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.1 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index f8509d7fb4a..76c5e76abe0 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.1-SNAPSHOT + 4.16.1 stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,4 +48,8 @@ ${project.version} + + + v4.16.1-rc0 + From a39a5f90519b618659eb15aeed350e5bce862386 Mon Sep 17 00:00:00 2001 From: chenhang Date: Sat, 15 Apr 2023 01:47:08 +0000 Subject: [PATCH 015/233] [maven-release-plugin] rollback changes from release preparation of v4.16.1-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +----- bookkeeper-dist/bkctl/pom.xml | 6 +----- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +----- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +----- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +----- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +----- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +----- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +----- shaded/distributedlog-core-shaded/pom.xml | 6 +----- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +----- .../codahale-metrics-provider/pom.xml | 6 +----- stats/bookkeeper-stats-providers/pom.xml | 6 +----- .../prometheus-metrics-provider/pom.xml | 6 +----- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +----- stream/api/pom.xml | 6 +----- stream/bk-grpc-name-resolver/pom.xml | 6 +----- stream/clients/java/all/pom.xml | 6 +----- stream/clients/java/base/pom.xml | 6 +----- stream/clients/java/kv/pom.xml | 6 +----- stream/clients/java/pom.xml | 6 +----- stream/clients/pom.xml | 6 +----- stream/common/pom.xml | 6 +----- stream/distributedlog/common/pom.xml | 6 +----- stream/distributedlog/core/pom.xml | 6 +----- stream/distributedlog/io/dlfs/pom.xml | 6 +----- stream/distributedlog/io/pom.xml | 6 +----- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +----- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +----- stream/server/pom.xml | 6 +----- stream/statelib/pom.xml | 6 +----- stream/storage/api/pom.xml | 6 +----- stream/storage/impl/pom.xml | 6 +----- stream/storage/pom.xml | 6 +----- stream/tests-common/pom.xml | 6 +----- tests/backward-compat/bc-non-fips/pom.xml | 6 +----- tests/backward-compat/current-server-old-clients/pom.xml | 6 +----- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +----- tests/backward-compat/hostname-bookieid/pom.xml | 6 +----- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +----- tests/backward-compat/pom.xml | 6 +----- tests/backward-compat/recovery-no-password/pom.xml | 6 +----- tests/backward-compat/upgrade-direct/pom.xml | 6 +----- tests/backward-compat/upgrade/pom.xml | 6 +----- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +----- tests/docker-images/all-released-versions-image/pom.xml | 6 +----- tests/docker-images/all-versions-image/pom.xml | 6 +----- tests/docker-images/pom.xml | 6 +----- tests/integration-tests-base-groovy/pom.xml | 6 +----- tests/integration-tests-base/pom.xml | 6 +----- tests/integration-tests-topologies/pom.xml | 6 +----- tests/integration-tests-utils/pom.xml | 6 +----- tests/integration/cluster/pom.xml | 6 +----- tests/integration/pom.xml | 6 +----- tests/integration/smoke/pom.xml | 6 +----- tests/integration/standalone/pom.xml | 6 +----- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +----- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +----- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +----- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +----- tests/shaded/pom.xml | 6 +----- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +----- tools/framework/pom.xml | 6 +----- tools/ledger/pom.xml | 6 +----- tools/perf/pom.xml | 6 +----- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +----- 90 files changed, 93 insertions(+), 353 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index b0927ae49d4..c7b786a2e09 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index e922585bbe3..68df2afcc82 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index b6a1f376bf9..7e37723c11a 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 070ddbe4fb5..bfa902a1f49 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -154,8 +154,4 @@ - - - v4.16.1-rc0 - diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 72456ccde12..53e11269108 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -79,8 +79,4 @@ - - - v4.16.1-rc0 - diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index d96c1fdafe9..7f0d86c8d43 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index cc9edfd8194..3c53c535462 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -129,8 +129,4 @@ - - - v4.16.1-rc0 - diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 8d1af899a6e..167ada7944a 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 6d1b7e1c07c..0ee3ae1b2b9 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 2525d149853..8a2e4f65b65 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 86510ba65c4..b307ca775ec 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index c12127bf0f6..e105e7c84ce 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index d7155429762..d53c3a40252 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index dde58f3008b..5640737eb4f 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,14 +18,10 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API - - - v4.16.1-rc0 - diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index ffec9b3fed9..db52bf7cb5c 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 4f0a17183d1..94226b11867 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. org.apache.bookkeeper @@ -31,8 +31,4 @@ ${project.parent.version} - - - v4.16.1-rc0 - diff --git a/buildtools/pom.xml b/buildtools/pom.xml index bfaabc853fc..22d52df9d0b 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.1 + 4.16.1-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index db6a9159f77..541c071cce3 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 24053c4c88c..23e333c1a46 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index beffac38fc1..2d13190404e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.1 + 4.16.1-SNAPSHOT .. 4.0.0 @@ -150,8 +150,4 @@ - - - v4.16.1-rc0 - diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 33453a10277..f22dda375ff 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 2fb3189848a..dfa6cd6cc58 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index f3696274648..4ef4467b5e7 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 379b18b9c3d..b04d8e1acc4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.1-rc0 + branch-4.13 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index db3f64237fa..5b357ff789c 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.1 + 4.16.1-SNAPSHOT .. bookkeeper-server-shaded @@ -126,8 +126,4 @@ - - - v4.16.1-rc0 - diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index b324b24f2c7..b491fc5d986 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.1 + 4.16.1-SNAPSHOT .. bookkeeper-server-tests-shaded @@ -144,8 +144,4 @@ - - - v4.16.1-rc0 - diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 9ed95cda48d..88db77d3006 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.1 + 4.16.1-SNAPSHOT .. org.apache.distributedlog @@ -238,8 +238,4 @@ - - - v4.16.1-rc0 - diff --git a/shaded/pom.xml b/shaded/pom.xml index 67eb34fd3d2..2ecfae091ad 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index d899d335c3c..0bb20a73e95 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,8 +59,4 @@ - - - v4.16.1-rc0 - diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index e1a08aaf8d1..c247ba1e636 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,8 +53,4 @@ guava - - - v4.16.1-rc0 - diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 7ae6952bb3b..0abc5dd27d3 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.1 + 4.16.1-SNAPSHOT 4.0.0 bookkeeper-stats-providers @@ -29,8 +29,4 @@ codahale-metrics-provider prometheus-metrics-provider - - - v4.16.1-rc0 - diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 32a83e86f93..284da098703 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,8 +72,4 @@ - - - v4.16.1-rc0 - diff --git a/stats/pom.xml b/stats/pom.xml index 57f863c4d0d..b7885a6c9b9 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 315fd1dc30c..57f57ab687c 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,8 +50,4 @@ jackson-annotations - - - v4.16.1-rc0 - diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 016a31f4d8b..4a431ba28ed 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. org.apache.bookkeeper @@ -46,8 +46,4 @@ freebuilder - - - v4.16.1-rc0 - diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index c50eb58bf68..d06f8007c68 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. org.apache.bookkeeper @@ -77,8 +77,4 @@ test - - - v4.16.1-rc0 - diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 81d57ab7465..2c8c2ff9d76 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.1 + 4.16.1-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,8 +112,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 7c371801700..554ca204383 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.1 + 4.16.1-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,8 +59,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 2307db58077..aa597b9514c 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.1 + 4.16.1-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,8 +47,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index eb0ebcf8af9..a2a4d432f1c 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.1 + 4.16.1-SNAPSHOT .. stream-storage-java-client-parent @@ -31,8 +31,4 @@ kv all - - - v4.16.1-rc0 - diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index d21ef7f7916..fe9f4b44f37 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1 + 4.16.1-SNAPSHOT .. stream-storage-clients-parent @@ -47,8 +47,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 52e5800b488..25a272714c2 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. org.apache.bookkeeper @@ -74,8 +74,4 @@ test - - - v4.16.1-rc0 - diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 13b35ff7395..cac43c5c702 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.1 + 4.16.1-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,8 +106,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index ef11cf8edf2..1915206c938 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.1 + 4.16.1-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,8 +138,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 46f1215e06a..7a4b45abc71 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.1 + 4.16.1-SNAPSHOT ../.. org.apache.distributedlog @@ -88,8 +88,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 43a2c677811..00fdef05aff 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.1 + 4.16.1-SNAPSHOT 4.0.0 distributedlog-io @@ -28,8 +28,4 @@ dlfs - - - v4.16.1-rc0 - diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index a2df28018f0..e8c357dc977 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 108f2b9c5fc..8dfaa4df814 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.1 + 4.16.1-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,8 +61,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/pom.xml b/stream/pom.xml index 8efe0fcfbf5..1050538d528 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 67f844b0421..18eb972aa1f 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1 + 4.16.1-SNAPSHOT .. org.apache.bookkeeper @@ -118,8 +118,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/server/pom.xml b/stream/server/pom.xml index df7a1ba00d3..b37e08959b1 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1 + 4.16.1-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,8 +82,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index bbf73beffd0..76a6eca6d57 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT .. org.apache.bookkeeper @@ -130,8 +130,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 249e97fe8f2..43a7c94b5b8 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.1 + 4.16.1-SNAPSHOT .. stream-storage-service-api @@ -55,8 +55,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 0a75f13882c..266e631ff5d 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.1 + 4.16.1-SNAPSHOT .. stream-storage-service-impl @@ -121,8 +121,4 @@ - - - v4.16.1-rc0 - diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 617758aac79..c9e2a0f794a 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1 + 4.16.1-SNAPSHOT .. stream-storage-service-parent @@ -30,8 +30,4 @@ api impl - - - v4.16.1-rc0 - diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 700893dad32..6961f64c509 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1 + 4.16.1-SNAPSHOT .. org.apache.bookkeeper.tests @@ -115,8 +115,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 85ef6346ce7..402b025f667 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -76,8 +76,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index e4d39594af0..008b336e0c4 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -28,8 +28,4 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server - - - v4.16.1-rc0 - diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index f81ea1036a2..d64727ae18c 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -28,8 +28,4 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager - - - v4.16.1-rc0 - diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index f49a54ae6ac..ca8df5dc603 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -28,8 +28,4 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) - - - v4.16.1-rc0 - diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index d29bb658aea..a625d253cc9 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -28,8 +28,4 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies - - - v4.16.1-rc0 - diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index e65f69725fe..d673841c9bb 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.1 + 4.16.1-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,8 +49,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 854d5811a0b..cdf79010d5e 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -36,8 +36,4 @@ ${project.version} - - - v4.16.1-rc0 - diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 2fb0cb56dda..002212d8820 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version - - - v4.16.1-rc0 - diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 50f893d7d61..e7992d8520b 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version - - - v4.16.1-rc0 - diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 4db96f02ec0..99f96f68b2f 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -28,8 +28,4 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current - - - v4.16.1-rc0 - diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 1bbe287bf79..8da404766b8 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.1 + 4.16.1-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -68,8 +68,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 39c3d62c425..881fb8d61e4 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.1 + 4.16.1-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -108,8 +108,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 661660bc0c9..350bf731dc1 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests docker-images @@ -30,8 +30,4 @@ all-released-versions-image all-versions-image - - - v4.16.1-rc0 - diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index ba077a1f824..59fa057863d 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.1 + 4.16.1-SNAPSHOT ../integration-tests-base @@ -109,8 +109,4 @@ test - - - v4.16.1-rc0 - diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 80e4fc6e0da..3016acad0b5 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index e5d3223cb0b..41467b34cb2 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests @@ -45,8 +45,4 @@ ${project.version} - - - v4.16.1-rc0 - diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index f7445d553a7..2fffa5a89f9 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 4d1d5bf00cf..8d04433c8f9 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -83,8 +83,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index e67344e48d3..18bf94de153 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests integration @@ -70,8 +70,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 4413ca891c7..dcde0a7b7ff 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -72,8 +72,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 479a4abe617..26f7d8f0d32 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.1 + 4.16.1-SNAPSHOT .. @@ -68,8 +68,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/pom.xml b/tests/pom.xml index 5a6e6c1118c..21b0a718940 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index b07475fecb4..a369678dd7b 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1 + 4.16.1-SNAPSHOT org.apache.bookkeeper.tests @@ -73,8 +73,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index a6bc10563fe..0142dbcf0bd 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.1 + 4.16.1-SNAPSHOT .. bookkeeper-server-shaded-test @@ -59,8 +59,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 17aba537fc1..bf70960c755 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.1 + 4.16.1-SNAPSHOT .. bookkeeper-server-tests-shaded-test @@ -75,8 +75,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 115b506df6f..5be495d8c21 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.1 + 4.16.1-SNAPSHOT .. distributedlog-core-shaded-test @@ -84,8 +84,4 @@ - - - v4.16.1-rc0 - diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index ab4f351713f..22e2c2992f4 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1 + 4.16.1-SNAPSHOT .. org.apache.bookkeeper.tests.shaded @@ -32,8 +32,4 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test - - - v4.16.1-rc0 - diff --git a/testtools/pom.xml b/testtools/pom.xml index cba82fea320..02e1b37791a 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.1 + 4.16.1-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 2a18e7cb8bf..c8dffe8c60c 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools @@ -79,8 +79,4 @@ - - - v4.16.1-rc0 - diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 0674553c737..d2941bfe039 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,8 +41,4 @@ test - - - v4.16.1-rc0 - diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 76c08ed281c..71dd242d373 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,8 +71,4 @@ test - - - v4.16.1-rc0 - diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 13cc1472a28..50b89b6ece8 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.1 + 4.16.1-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,8 +48,4 @@ HdrHistogram - - - v4.16.1-rc0 - diff --git a/tools/pom.xml b/tools/pom.xml index 8ce67771451..090c82c8acd 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1 + 4.16.1-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 76c5e76abe0..f8509d7fb4a 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.1 + 4.16.1-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,8 +48,4 @@ ${project.version} - - - v4.16.1-rc0 - From e03949af7bc2200a3e8243ca3c0f521c3270e198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= Date: Thu, 4 May 2023 09:00:22 +0200 Subject: [PATCH 016/233] Use ChannelVoidPromise to avoid useless promise objects creation (#3733) (cherry picked from commit bbea67b09566002b9393a8b8f256988ea9755cc1) --- .../apache/bookkeeper/proto/AuthHandler.java | 42 ++++++----- .../proto/BookieRequestProcessor.java | 40 ++++++---- .../bookkeeper/proto/PacketProcessorBase.java | 4 +- .../bookkeeper/util/NettyChannelUtil.java | 62 ++++++++++++++++ .../bookkeeper/util/NettyChannelUtilTest.java | 73 +++++++++++++++++++ 5 files changed, 188 insertions(+), 33 deletions(-) create mode 100644 bookkeeper-server/src/main/java/org/apache/bookkeeper/util/NettyChannelUtil.java create mode 100644 bookkeeper-server/src/test/java/org/apache/bookkeeper/util/NettyChannelUtilTest.java diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java index f923b61ad50..720e7279f5a 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java @@ -41,6 +41,7 @@ import org.apache.bookkeeper.client.BKException; import org.apache.bookkeeper.proto.BookkeeperProtocol.AuthMessage; import org.apache.bookkeeper.util.ByteBufList; +import org.apache.bookkeeper.util.NettyChannelUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -102,15 +103,15 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception } else if (msg instanceof BookieProtocol.Request) { BookieProtocol.Request req = (BookieProtocol.Request) msg; if (req.getOpCode() == BookieProtocol.ADDENTRY) { - ctx.channel().writeAndFlush( - BookieProtocol.AddResponse.create( - req.getProtocolVersion(), BookieProtocol.EUA, - req.getLedgerId(), req.getEntryId())); + final BookieProtocol.AddResponse response = BookieProtocol.AddResponse.create( + req.getProtocolVersion(), BookieProtocol.EUA, + req.getLedgerId(), req.getEntryId()); + NettyChannelUtil.writeAndFlushWithVoidPromise(ctx.channel(), response); } else if (req.getOpCode() == BookieProtocol.READENTRY) { - ctx.channel().writeAndFlush( - new BookieProtocol.ReadResponse( - req.getProtocolVersion(), BookieProtocol.EUA, - req.getLedgerId(), req.getEntryId())); + final BookieProtocol.ReadResponse response = new BookieProtocol.ReadResponse( + req.getProtocolVersion(), BookieProtocol.EUA, + req.getLedgerId(), req.getEntryId()); + NettyChannelUtil.writeAndFlushWithVoidPromise(ctx.channel(), response); } else { ctx.channel().close(); } @@ -133,7 +134,7 @@ && checkAuthPlugin(req.getAuthRequest(), ctx.channel())) { .setHeader(req.getHeader()) .setStatus(BookkeeperProtocol.StatusCode.EUA); - ctx.channel().writeAndFlush(builder.build()); + NettyChannelUtil.writeAndFlushWithVoidPromise(ctx.channel(), builder.build()); } } else { // close the channel, junk coming over it @@ -172,7 +173,9 @@ public void operationComplete(int rc, AuthToken newam) { } AuthMessage message = AuthMessage.newBuilder().setAuthPluginName(req.authMessage.getAuthPluginName()) .setPayload(ByteString.copyFrom(newam.getData())).build(); - channel.writeAndFlush(new BookieProtocol.AuthResponse(req.getProtocolVersion(), message)); + final BookieProtocol.AuthResponse response = + new BookieProtocol.AuthResponse(req.getProtocolVersion(), message); + NettyChannelUtil.writeAndFlushWithVoidPromise(channel, response); } } @@ -196,14 +199,17 @@ public void operationComplete(int rc, AuthToken newam) { LOG.error("Error processing auth message, closing connection"); builder.setStatus(BookkeeperProtocol.StatusCode.EUA); - channel.writeAndFlush(builder.build()); - channel.close(); + NettyChannelUtil.writeAndFlushWithClosePromise( + channel, builder.build() + ); return; } else { AuthMessage message = AuthMessage.newBuilder().setAuthPluginName(pluginName) .setPayload(ByteString.copyFrom(newam.getData())).build(); builder.setStatus(BookkeeperProtocol.StatusCode.EOK).setAuthResponse(message); - channel.writeAndFlush(builder.build()); + NettyChannelUtil.writeAndFlushWithVoidPromise( + channel, builder.build() + ); } } } @@ -399,9 +405,9 @@ public void operationComplete(int rc, AuthToken newam) { .setPayload(ByteString.copyFrom(newam.getData())).build(); if (isUsingV2Protocol) { - channel.writeAndFlush( - new BookieProtocol.AuthRequest(BookieProtocol.CURRENT_PROTOCOL_VERSION, message), - channel.voidPromise()); + final BookieProtocol.AuthRequest msg = + new BookieProtocol.AuthRequest(BookieProtocol.CURRENT_PROTOCOL_VERSION, message); + NettyChannelUtil.writeAndFlushWithVoidPromise(channel, msg); } else { // V3 protocol BookkeeperProtocol.BKPacketHeader header = BookkeeperProtocol.BKPacketHeader.newBuilder() @@ -410,7 +416,7 @@ public void operationComplete(int rc, AuthToken newam) { BookkeeperProtocol.Request.Builder builder = BookkeeperProtocol.Request.newBuilder() .setHeader(header) .setAuthRequest(message); - channel.writeAndFlush(builder.build()); + NettyChannelUtil.writeAndFlushWithVoidPromise(channel, builder.build()); } } } @@ -429,7 +435,7 @@ public void operationComplete(int rc, Void v) { authenticated = true; Object msg = waitingForAuth.poll(); while (msg != null) { - ctx.writeAndFlush(msg); + NettyChannelUtil.writeAndFlushWithVoidPromise(ctx, msg); msg = waitingForAuth.poll(); } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java index 6e7f5abcbb7..7ebd8c90a7a 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java @@ -54,6 +54,7 @@ import org.apache.bookkeeper.tls.SecurityException; import org.apache.bookkeeper.tls.SecurityHandlerFactory; import org.apache.bookkeeper.tls.SecurityHandlerFactory.NodeType; +import org.apache.bookkeeper.util.NettyChannelUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -330,11 +331,12 @@ public void processRequest(Object msg, BookieRequestHandler requestHandler) { .setAuthPluginName(AuthProviderFactoryFactory.AUTHENTICATION_DISABLED_PLUGIN_NAME) .setPayload(ByteString.copyFrom(AuthToken.NULL.getData())) .build(); - BookkeeperProtocol.Response.Builder authResponse = BookkeeperProtocol.Response + final BookkeeperProtocol.Response authResponse = BookkeeperProtocol.Response .newBuilder().setHeader(r.getHeader()) .setStatus(BookkeeperProtocol.StatusCode.EOK) - .setAuthResponse(message); - channel.writeAndFlush(authResponse.build()); + .setAuthResponse(message) + .build(); + writeAndFlush(channel, authResponse); break; case WRITE_LAC: processWriteLacRequestV3(r, requestHandler); @@ -353,10 +355,11 @@ public void processRequest(Object msg, BookieRequestHandler requestHandler) { break; default: LOG.info("Unknown operation type {}", header.getOperation()); - BookkeeperProtocol.Response.Builder response = + final BookkeeperProtocol.Response response = BookkeeperProtocol.Response.newBuilder().setHeader(r.getHeader()) - .setStatus(BookkeeperProtocol.StatusCode.EBADREQ); - channel.writeAndFlush(response.build()); + .setStatus(BookkeeperProtocol.StatusCode.EBADREQ) + .build(); + writeAndFlush(channel, response); if (statsEnabled) { bkStats.getOpStats(BKStats.STATS_UNKNOWN).incrementFailedOps(); } @@ -386,12 +389,15 @@ public void processRequest(Object msg, BookieRequestHandler requestHandler) { .setPayload(ByteString.copyFrom(AuthToken.NULL.getData())) .build(); - channel.writeAndFlush(new BookieProtocol.AuthResponse( - BookieProtocol.CURRENT_PROTOCOL_VERSION, message)); + final BookieProtocol.AuthResponse response = new BookieProtocol.AuthResponse( + BookieProtocol.CURRENT_PROTOCOL_VERSION, message); + writeAndFlush(channel, response); break; default: LOG.error("Unknown op type {}, sending error", r.getOpCode()); - channel.writeAndFlush(ResponseBuilder.buildErrorResponse(BookieProtocol.EBADREQ, r)); + final BookieProtocol.Response errResponse = ResponseBuilder + .buildErrorResponse(BookieProtocol.EBADREQ, r); + writeAndFlush(channel, errResponse); if (statsEnabled) { bkStats.getOpStats(BKStats.STATS_UNKNOWN).incrementFailedOps(); } @@ -568,7 +574,7 @@ private void processStartTLSRequestV3(final BookkeeperProtocol.Request r, if (shFactory == null) { LOG.error("Got StartTLS request but TLS not configured"); response.setStatus(BookkeeperProtocol.StatusCode.EBADREQ); - c.writeAndFlush(response.build()); + writeAndFlush(c, response.build()); } else { // there is no need to execute in a different thread as this operation is light SslHandler sslHandler = shFactory.newTLSHandler(); @@ -597,16 +603,18 @@ public void operationComplete(Future future) throws Exception { } else { LOG.error("TLS Handshake failure: ", future.cause()); } - BookkeeperProtocol.Response.Builder errResponse = BookkeeperProtocol.Response.newBuilder() - .setHeader(r.getHeader()).setStatus(BookkeeperProtocol.StatusCode.EIO); - c.writeAndFlush(errResponse.build()); + final BookkeeperProtocol.Response errResponse = BookkeeperProtocol.Response.newBuilder() + .setHeader(r.getHeader()) + .setStatus(BookkeeperProtocol.StatusCode.EIO) + .build(); + writeAndFlush(c, errResponse); if (statsEnabled) { bkStats.getOpStats(BKStats.STATS_UNKNOWN).incrementFailedOps(); } } } }); - c.writeAndFlush(response.build()); + writeAndFlush(c, response.build()); } } @@ -722,4 +730,8 @@ public boolean isBlacklisted(Channel channel) { public void handleNonWritableChannel(Channel channel) { onResponseTimeout.accept(channel); } + + private static void writeAndFlush(Channel channel, Object msg) { + NettyChannelUtil.writeAndFlushWithVoidPromise(channel, msg); + } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PacketProcessorBase.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PacketProcessorBase.java index c9798156c25..889d3790d27 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PacketProcessorBase.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PacketProcessorBase.java @@ -122,13 +122,15 @@ protected void sendResponse(int rc, Object response, OpStatsLogger statsLogger) } if (channel.isActive()) { - ChannelPromise promise = channel.voidPromise(); + final ChannelPromise promise; if (logger.isDebugEnabled()) { promise = channel.newPromise().addListener(future -> { if (!future.isSuccess()) { logger.debug("Netty channel write exception. ", future.cause()); } }); + } else { + promise = channel.voidPromise(); } channel.writeAndFlush(response, promise); } else { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/NettyChannelUtil.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/NettyChannelUtil.java new file mode 100644 index 00000000000..7add100e748 --- /dev/null +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/NettyChannelUtil.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.bookkeeper.util; + +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelOutboundInvoker; +import io.netty.channel.VoidChannelPromise; + +/** + * Contains utility methods for working with Netty Channels. + */ +public final class NettyChannelUtil { + + private NettyChannelUtil() { + } + + /** + * Write and flush the message to the channel. + * + * The promise is an instance of {@link VoidChannelPromise} that properly propagates exceptions up to the pipeline. + * Netty has many ad-hoc optimization if the promise is an instance of {@link VoidChannelPromise}. + * Lastly, it reduces pollution of useless {@link io.netty.channel.ChannelPromise} objects created + * by the default write and flush method {@link ChannelOutboundInvoker#writeAndFlush(Object)}. + * See https://stackoverflow.com/q/54169262 and https://stackoverflow.com/a/9030420 for more details. + * + * @param ctx channel's context + * @param msg buffer to write in the channel + */ + public static void writeAndFlushWithVoidPromise(ChannelOutboundInvoker ctx, Object msg) { + ctx.writeAndFlush(msg, ctx.voidPromise()); + } + + /** + * Write and flush the message to the channel and the close the channel. + * + * This method is particularly helpful when the connection is in an invalid state + * and therefore a new connection must be created to continue. + * + * @param ctx channel's context + * @param msg buffer to write in the channel + */ + public static void writeAndFlushWithClosePromise(ChannelOutboundInvoker ctx, Object msg) { + ctx.writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE); + } + +} diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/NettyChannelUtilTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/NettyChannelUtilTest.java new file mode 100644 index 00000000000..ea47d83ec75 --- /dev/null +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/NettyChannelUtilTest.java @@ -0,0 +1,73 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.bookkeeper.util; + +import static org.mockito.ArgumentMatchers.same; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelOutboundInvoker; +import io.netty.channel.ChannelPromise; +import io.netty.channel.VoidChannelPromise; +import java.nio.charset.StandardCharsets; +import org.junit.Test; + +public class NettyChannelUtilTest { + + @Test + public void testWriteAndFlushWithVoidPromise() { + final ChannelOutboundInvoker ctx = mock(ChannelOutboundInvoker.class); + final VoidChannelPromise voidChannelPromise = new VoidChannelPromise(mock(Channel.class), true); + when(ctx.voidPromise()).thenReturn(voidChannelPromise); + final byte[] data = "test".getBytes(StandardCharsets.UTF_8); + final ByteBuf byteBuf = Unpooled.wrappedBuffer(data, 0, data.length); + try { + NettyChannelUtil.writeAndFlushWithVoidPromise(ctx, byteBuf); + verify(ctx).writeAndFlush(same(byteBuf), same(voidChannelPromise)); + verify(ctx).voidPromise(); + } finally { + byteBuf.release(); + } + } + + @Test + public void testWriteAndFlushWithClosePromise() { + final ChannelOutboundInvoker ctx = mock(ChannelOutboundInvoker.class); + final ChannelPromise promise = mock(ChannelPromise.class); + + final byte[] data = "test".getBytes(StandardCharsets.UTF_8); + final ByteBuf byteBuf = Unpooled.wrappedBuffer(data, 0, data.length); + when(ctx.writeAndFlush(same(byteBuf))).thenReturn(promise); + try { + NettyChannelUtil.writeAndFlushWithClosePromise(ctx, byteBuf); + verify(ctx).writeAndFlush(same(byteBuf)); + verify(promise).addListener(same(ChannelFutureListener.CLOSE)); + } finally { + byteBuf.release(); + } + } + +} \ No newline at end of file From e44264270bdcbd09588a05910696c2f2554bd9a5 Mon Sep 17 00:00:00 2001 From: Zhangao Date: Fri, 7 Apr 2023 15:08:42 +0800 Subject: [PATCH 017/233] Execute clean indexes in finally (#3772) Execute clean indexes in finally (#3772) (cherry picked from commit 04e572b9bccd1502c0f2c4a87f23d760d4d0d9b5) --- .../ldb/SingleDirectoryDbLedgerStorage.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java index 635a2727f9d..9f089d98641 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java @@ -824,21 +824,6 @@ public void checkpoint(Checkpoint checkpoint) throws IOException { ledgerIndex.flush(); recordSuccessfulEvent(dbLedgerStorageStats.getFlushLedgerIndexStats(), ledgerIndexStartTime); - cleanupExecutor.execute(() -> { - // There can only be one single cleanup task running because the cleanupExecutor - // is single-threaded - try { - if (log.isDebugEnabled()) { - log.debug("Removing deleted ledgers from db indexes"); - } - - entryLocationIndex.removeOffsetFromDeletedLedgers(); - ledgerIndex.removeDeletedLedgers(); - } catch (Throwable t) { - log.warn("Failed to cleanup db indexes", t); - } - }); - lastCheckpoint = thisCheckpoint; // Discard all the entry from the write cache, since they're now persisted @@ -858,6 +843,20 @@ public void checkpoint(Checkpoint checkpoint) throws IOException { // Leave IOExecption as it is throw e; } finally { + cleanupExecutor.execute(() -> { + // There can only be one single cleanup task running because the cleanupExecutor + // is single-threaded + try { + if (log.isDebugEnabled()) { + log.debug("Removing deleted ledgers from db indexes"); + } + + entryLocationIndex.removeOffsetFromDeletedLedgers(); + ledgerIndex.removeDeletedLedgers(); + } catch (Throwable t) { + log.warn("Failed to cleanup db indexes", t); + } + }); try { isFlushOngoing.set(false); } finally { From 39d5fc1c9ae1809cd140db5e654ec1217da1f143 Mon Sep 17 00:00:00 2001 From: Reid Chan Date: Fri, 16 Jun 2023 10:41:13 +0800 Subject: [PATCH 018/233] [Bug] Always one orphan ledger is created (#3813) Issue #3812 Descriptions of the changes in this PR: Fix bug and one UT for verification ### Motivation Fix the bug ### Changes To avoid the ledger being created twice, add a state check before setting a new state (cherry picked from commit b062e9ed7e9fe0b0413b1f330f74a4860f0ba19a) --- .../bk/SimpleLedgerAllocator.java | 4 +- .../distributedlog/TestBKLogWriteHandler.java | 48 +++++++++++++++++++ .../distributedlog/TestRollLogSegments.java | 2 + 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/bk/SimpleLedgerAllocator.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/bk/SimpleLedgerAllocator.java index da6ee153e34..c300c92c5a2 100644 --- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/bk/SimpleLedgerAllocator.java +++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/bk/SimpleLedgerAllocator.java @@ -310,7 +310,9 @@ private void confirmObtain(LongVersion zkVersion) { tryObtainTxn = null; tryObtainListener = null; // mark flag to issue an allocation request - shouldAllocate = true; + if (lhToNotify == null) { + shouldAllocate = true; + } } } if (null != listenerToNotify && null != lhToNotify) { diff --git a/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestBKLogWriteHandler.java b/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestBKLogWriteHandler.java index f4a3050ec7a..c2a631e7eb2 100644 --- a/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestBKLogWriteHandler.java +++ b/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestBKLogWriteHandler.java @@ -23,8 +23,13 @@ import java.io.IOException; import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.util.HashSet; +import java.util.Set; +import org.apache.bookkeeper.client.BookKeeperAdmin; import org.apache.distributedlog.api.AsyncLogWriter; import org.apache.distributedlog.api.DistributedLogManager; +import org.apache.distributedlog.api.LogWriter; import org.apache.distributedlog.api.namespace.NamespaceBuilder; import org.apache.distributedlog.bk.LedgerAllocator; import org.apache.distributedlog.bk.LedgerAllocatorPool; @@ -91,4 +96,47 @@ public void testAbortTransactionOnStartLogSegment() throws Exception { Utils.close(writer); } + @Test + public void testLedgerNumber() throws Exception { + URI uri = createDLMURI("/" + runtime.getMethodName()); + ensureURICreated(zkc, uri); + + DistributedLogConfiguration confLocal = new DistributedLogConfiguration(); + confLocal.addConfiguration(conf); + confLocal.setOutputBufferSize(0); + + BKDistributedLogNamespace namespace = (BKDistributedLogNamespace) + NamespaceBuilder.newBuilder() + .conf(confLocal) + .uri(uri) + .build(); + DistributedLogManager dlm = namespace.openLog("test-log"); + BookKeeperAdmin admin = new BookKeeperAdmin(zkServers); + + Set s1 = getLedgers(admin); + LOG.info("Ledgers after init: " + s1); + + LogWriter writer = dlm.openLogWriter(); + writer.write(new LogRecord(1, "test-data".getBytes(StandardCharsets.UTF_8))); + writer.close(); + + Set s2 = getLedgers(admin); + LOG.info("Ledgers after write: " + s2); + dlm.delete(); + assertEquals(1, s2.size() - s1.size()); // exact 1 ledger created only + + Set s3 = getLedgers(admin); + LOG.info("Ledgers after delete: " + s3); + + assertEquals(s1.size(), s3.size()); + + } + + // Get all ledgers from BK admin + private Set getLedgers(BookKeeperAdmin bkAdmin) throws IOException { + Set res = new HashSet<>(); + bkAdmin.listLedgers().forEach(res::add); + return res; + } + } diff --git a/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestRollLogSegments.java b/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestRollLogSegments.java index 180646ac701..1a8dc7d8a48 100644 --- a/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestRollLogSegments.java +++ b/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestRollLogSegments.java @@ -293,6 +293,7 @@ public void onFailure(Throwable cause) { List segments = dlm.getLogSegments(); logger.info("LogSegments : {}", segments); + logger.info("LogSegments size: {}", segments.size()); assertTrue(segments.size() >= 2); ensureOnlyOneInprogressLogSegments(segments); @@ -308,6 +309,7 @@ public void onFailure(Throwable cause) { segments = dlm.getLogSegments(); logger.info("LogSegments : {}", segments); + logger.info("LogSegments size: {}", segments.size()); assertEquals(numSegmentsAfterAsyncWrites + numLogSegments / 2, segments.size()); ensureOnlyOneInprogressLogSegments(segments); From 9a2cc8027367443c518c5d9c089a4405e77118a9 Mon Sep 17 00:00:00 2001 From: Zhangao Date: Mon, 3 Apr 2023 16:01:22 +0800 Subject: [PATCH 019/233] [Bookie] Prevent transit to writable mode when forceReadOnly mode is active (#3881) * Fix forceReadOnly * add unittest --------- Co-authored-by: gavingaozhangmin (cherry picked from commit a6387d191f28a59af72f6613b633d6898980a0b0) --- .../org/apache/bookkeeper/bookie/BookieStateManager.java | 5 +++++ .../java/org/apache/bookkeeper/bookie/StateManager.java | 5 +++++ .../server/http/service/BookieStateReadOnlyService.java | 5 +++++ .../apache/bookkeeper/server/http/TestHttpService.java | 8 ++++++++ 4 files changed, 23 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java index 83ae611ef0a..80226bd38e3 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java @@ -193,6 +193,11 @@ public boolean isReadOnly(){ return forceReadOnly.get() || bookieStatus.isInReadOnlyMode(); } + @Override + public boolean isForceReadOnly(){ + return forceReadOnly.get(); + } + @Override public boolean isAvailableForHighPriorityWrites() { return availableForHighPriorityWrites; diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java index f7f7a3feca3..d279893a8ac 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java @@ -48,6 +48,11 @@ public interface StateManager extends AutoCloseable { */ boolean isReadOnly(); + /** + * Check is forceReadOnly. + */ + boolean isForceReadOnly(); + /** * Check is Running. */ diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java index 2fe317728fa..23211d5218f 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java @@ -53,6 +53,11 @@ public HttpServiceResponse handle(HttpServiceRequest request) throws Exception { if (HttpServer.Method.PUT.equals(request.getMethod())) { ReadOnlyState inState = JsonUtil.fromJson(request.getBody(), ReadOnlyState.class); if (stateManager.isReadOnly() && !inState.isReadOnly()) { + if (stateManager.isForceReadOnly()) { + response.setCode(HttpServer.StatusCode.BAD_REQUEST); + response.setBody("Bookie is in forceReadOnly mode, cannot transit to writable mode"); + return response; + } stateManager.transitionToWritableMode().get(); } else if (!stateManager.isReadOnly() && inState.isReadOnly()) { stateManager.transitionToReadOnlyMode().get(); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java index fdab2f8f9ad..a59adcf6aff 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java @@ -1021,6 +1021,14 @@ public void testBookieReadOnlyState() throws Exception { response = bookieReadOnlyService.handle(request); readOnlyState = JsonUtil.fromJson(response.getBody(), ReadOnlyState.class); assertFalse(readOnlyState.isReadOnly()); + + //forceReadonly to writable + baseConf.setForceReadOnlyBookie(true); + baseConf.setReadOnlyModeEnabled(true); + restartBookies(); + request = new HttpServiceRequest(JsonUtil.toJson(new ReadOnlyState(false)), HttpServer.Method.PUT, null); + response = bookieReadOnlyService.handle(request); + assertEquals(400, response.getStatusCode()); } @Test From 68cff3d0356e79d6f9ddc819155b745cfd0e7c4b Mon Sep 17 00:00:00 2001 From: houxiaoyu Date: Fri, 12 May 2023 19:07:24 +0800 Subject: [PATCH 020/233] Return activeLogChannel if new create (#3894) * Return activeLogChannel if new create (cherry picked from commit 5beb8948baa0f287e597ff2a29ec672ac2cb1220) --- .../EntryLogManagerForSingleEntryLog.java | 1 + .../bookie/DefaultEntryLogTest.java | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java index d6b6b9b303b..59bcc02a577 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java @@ -93,6 +93,7 @@ synchronized BufferedLogChannel getCurrentLogForLedgerForAddEntry(long ledgerId, if (null == activeLogChannel) { // log channel can be null because the file is deferred to be created createNewLog(UNASSIGNED_LEDGERID, "because current active log channel has not initialized yet"); + return activeLogChannel; } boolean reachEntryLogLimit = rollLog ? reachEntryLogLimit(activeLogChannel, entrySize) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java index 64943dc4c5c..d18c9cf284d 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java @@ -26,6 +26,12 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import com.google.common.collect.Sets; import io.netty.buffer.ByteBuf; @@ -1434,6 +1440,21 @@ public void testEntryLogManagerForEntryLogPerLedger() throws Exception { } } + @Test + public void testSingleEntryLogCreateNewLog() throws Exception { + Assert.assertTrue(entryLogger.getEntryLogManager() instanceof EntryLogManagerForSingleEntryLog); + EntryLogManagerForSingleEntryLog singleEntryLog = + (EntryLogManagerForSingleEntryLog) entryLogger.getEntryLogManager(); + EntryLogManagerForSingleEntryLog mockSingleEntryLog = spy(singleEntryLog); + BufferedLogChannel activeLogChannel = mockSingleEntryLog.getCurrentLogForLedgerForAddEntry(1, 1024, true); + Assert.assertTrue(activeLogChannel != null); + + verify(mockSingleEntryLog, times(1)).createNewLog(anyLong(), anyString()); + // `readEntryLogHardLimit` and `reachEntryLogLimit` should not call if new create log + verify(mockSingleEntryLog, times(0)).reachEntryLogLimit(any(), anyLong()); + verify(mockSingleEntryLog, times(0)).readEntryLogHardLimit(any(), anyLong()); + } + /* * with entryLogPerLedger enabled, create multiple entrylogs, add entries of ledgers and read them before and after * flush From 25e77846866b32a05ac832c01a470dac2254d847 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 15 May 2023 21:56:35 +0800 Subject: [PATCH 021/233] Fix garbage collection blocked by runtime exception (#3901) ### Motivation When one ledger file is broken, `getEntryLogMetadata` will throw an IllegalArgumentException, which is a RuntimeException and won't be caught in the whole garbage collector execution path. The exception will be caught by the thread SafeRunnable and interrupt the garbage collector, leading to those deleted ledgers can't be recycled and the ledger disk usage up. ``` 2023-04-01T00:55:29,497+0000 [GarbageCollectorThread-11-1] INFO org.apache.bookkeeper.bookie.GarbageCollectorThread - Garbage collector thread forced to perform GC before expiry of wait time. 2023-04-01T00:55:29,498+0000 [GarbageCollectorThread-11-1] INFO org.apache.bookkeeper.bookie.GarbageCollectorThread - Extracting entry log meta from entryLogId: 17 2023-04-01T00:55:29,498+0000 [GarbageCollectorThread-11-1] INFO org.apache.bookkeeper.bookie.EntryLogger - Failed to get ledgers map index from: 17.log : Cannot deserialize ledgers map from ledger 9062744587808030975 2023-04-01T00:55:29,553+0000 [GarbageCollectorThread-11-1] ERROR org.apache.bookkeeper.common.util.SafeRunnable - Unexpected throwable caught java.lang.IllegalArgumentException: Negative position at sun.nio.ch.FileChannelImpl.read(FileChannelImpl.java:785) ~[?:?] at org.apache.bookkeeper.bookie.BufferedReadChannel.read(BufferedReadChannel.java:93) ~[org.apache.bookkeeper-bookkeeper-server-4.14.5.jar:4.14.5] at org.apache.bookkeeper.bookie.BufferedReadChannel.read(BufferedReadChannel.java:65) ~[org.apache.bookkeeper-bookkeeper-server-4.14.5.jar:4.14.5] at org.apache.bookkeeper.bookie.EntryLogger.readFromLogChannel(EntryLogger.java:418) ~[org.apache.bookkeeper-bookkeeper-server-4.14.5.jar:4.14.5] at org.apache.bookkeeper.bookie.EntryLogger.scanEntryLog(EntryLogger.java:996) ~[org.apache.bookkeeper-bookkeeper-server-4.14.5.jar:4.14.5] at org.apache.bookkeeper.bookie.EntryLogger.extractEntryLogMetadataByScanning(EntryLogger.java:1136) ~[org.apache.bookkeeper-bookkeeper-server-4.14.5.jar:4.14.5] at org.apache.bookkeeper.bookie.EntryLogger.getEntryLogMetadata(EntryLogger.java:1045) ~[org.apache.bookkeeper-bookkeeper-server-4.14.5.jar:4.14.5] at org.apache.bookkeeper.bookie.GarbageCollectorThread.extractMetaFromEntryLogs(GarbageCollectorThread.java:607) ~[org.apache.bookkeeper-bookkeeper-server-4.14.5.jar:4.14.5] at org.apache.bookkeeper.bookie.GarbageCollectorThread.runWithFlags(GarbageCollectorThread.java:348) ~[org.apache.bookkeeper-bookkeeper-server-4.14.5.jar:4.14.5] at org.apache.bookkeeper.bookie.GarbageCollectorThread.safeRun(GarbageCollectorThread.java:329) ~[org.apache.bookkeeper-bookkeeper-server-4.14.5.jar:4.14.5] at org.apache.bookkeeper.common.util.SafeRunnable.run(SafeRunnable.java:36) ~[org.apache.bookkeeper-bookkeeper-common-4.14.5.jar:4.14.5] at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) ~[?:?] at java.util.concurrent.FutureTask.runAndReset(FutureTask.java:305) ~[?:?] at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:305) ~[?:?] at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) ~[?:?] at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) ~[?:?] at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) ~[io.netty-netty-common-4.1.77.Final.jar:4.1.77.Final] at java.lang.Thread.run(Thread.java:829) ~[?:?] ``` ### Changes Catch the RuntimeException when getting the metadata for each entry log file. (cherry picked from commit 8309b1895c240a7fba8719cacf551b2cc4abda42) --- .../org/apache/bookkeeper/bookie/GarbageCollectorThread.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java index 5de2292263a..3208baf19cc 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java @@ -759,7 +759,7 @@ protected void extractMetaFromEntryLogs() throws EntryLogMetadataMapException { } else { entryLogMetaMap.put(entryLogId, entryLogMeta); } - } catch (IOException e) { + } catch (IOException | RuntimeException e) { LOG.warn("Premature exception when processing " + entryLogId + " recovery will take care of the problem", e); } From 4d65b9e123f62ae3a873d189688b33ed0907228a Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 10 Apr 2023 09:23:27 +0800 Subject: [PATCH 022/233] Fix keys leak in EntryLocationIndex when ledgersToDelete is empty (#3903) ### Motivation In EntryLocationIndex#removeOffsetFromDeletedLedgers, if there are no ledgers to delete, the key pair will leak. ### Changes Check the ledgers to deletion Set first, and if the set is not empty, then generate the keys. (cherry picked from commit ceba60565cf7cb438e9be4ab7416a2808b9168a1) --- .../bookkeeper/bookie/storage/ldb/EntryLocationIndex.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/EntryLocationIndex.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/EntryLocationIndex.java index 335609aa860..a496909f67e 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/EntryLocationIndex.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/EntryLocationIndex.java @@ -208,15 +208,15 @@ public boolean isCompacting() { } public void removeOffsetFromDeletedLedgers() throws IOException { - LongPairWrapper firstKeyWrapper = LongPairWrapper.get(-1, -1); - LongPairWrapper lastKeyWrapper = LongPairWrapper.get(-1, -1); - Set ledgersToDelete = deletedLedgers.items(); if (ledgersToDelete.isEmpty()) { return; } + LongPairWrapper firstKeyWrapper = LongPairWrapper.get(-1, -1); + LongPairWrapper lastKeyWrapper = LongPairWrapper.get(-1, -1); + log.info("Deleting indexes for ledgers: {}", ledgersToDelete); long startTime = System.nanoTime(); From b66af0fd73e681a832efa0cd47d7991eb5a6e107 Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Sat, 22 Apr 2023 10:25:27 +0800 Subject: [PATCH 023/233] Fix ReclaimedSpaceViaDeletes stats incorrect problem. (#3906) Descriptions of the changes in this PR: https://github.com/apache/bookkeeper/blob/a6387d191f28a59af72f6613b633d6898980a0b0/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java#L487-L517 At line 501, increases getReclaimedSpaceViaDeletes stats. https://github.com/apache/bookkeeper/blob/a6387d191f28a59af72f6613b633d6898980a0b0/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java#L734-L767 But at line 755, it didn't increase getReclaimedSpaceViaDeletes stats. (cherry picked from commit cad143637547a556a25bab4950c78e630e9b38f8) --- .../bookkeeper/bookie/GarbageCollectorThread.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java index 3208baf19cc..552592f624f 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java @@ -751,11 +751,12 @@ protected void extractMetaFromEntryLogs() throws EntryLogMetadataMapException { EntryLogMetadata entryLogMeta = entryLogger.getEntryLogMetadata(entryLogId, throttler); removeIfLedgerNotExists(entryLogMeta); if (entryLogMeta.isEmpty()) { - LOG.info("Entry log file {} is empty, delete it from disk.", Long.toHexString(entryLogId)); - entryLogger.removeEntryLog(entryLogId); - // remove it from entrylogmetadata-map if it is present in - // the map - entryLogMetaMap.remove(entryLogId); + // This means the entry log is not associated with any active + // ledgers anymore. + // We can remove this entry log file now. + LOG.info("Deleting entryLogId {} as it has no active ledgers!", entryLogId); + removeEntryLog(entryLogId); + gcStats.getReclaimedSpaceViaDeletes().addCount(entryLogMeta.getTotalSize()); } else { entryLogMetaMap.put(entryLogId, entryLogMeta); } From d3f8aa3389cc93f86a87f39368e1ddcbeaff9430 Mon Sep 17 00:00:00 2001 From: houxiaoyu Date: Wed, 12 Apr 2023 22:37:52 +0800 Subject: [PATCH 024/233] Cleanup CbThreadFactory (#3907) * Cleanup CbThreadFactory * checkstyle (cherry picked from commit 912896deb2e748389e15e74c37539b2ff36302c7) --- .../java/org/apache/bookkeeper/bookie/Journal.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java index 4fd2c2f28d1..99eaa238191 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java @@ -41,7 +41,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import org.apache.bookkeeper.bookie.LedgerDirsManager.NoWritableLedgerDirException; import org.apache.bookkeeper.bookie.stats.JournalStats; @@ -555,18 +554,6 @@ void shutdown() throws InterruptedException { } } - private static class CbThreadFactory implements ThreadFactory { - private int counter = 0; - private String threadBaseName = "bookie-journal-callback"; - - public Thread newThread(Runnable r) { - int threadOrdinal = counter++; - Thread t = new Thread(r, threadBaseName + "-" + threadOrdinal); - ThreadRegistry.register(threadBaseName, threadOrdinal, t.getId()); - return t; - } - } - static final int PADDING_MASK = -0x100; static void writePaddingBytes(JournalChannel jc, ByteBuf paddingBuffer, int journalAlignSize) From 4b688521c3c32f51179242db08149b19ea0f3012 Mon Sep 17 00:00:00 2001 From: StevenLuMT Date: Fri, 7 Apr 2023 18:33:19 +0800 Subject: [PATCH 025/233] [Bug] SingleDirectoryDbLedgerStorage#flushMutex does not release lock on all exception paths (#3909) Co-authored-by: lushiji (cherry picked from commit f1657eaf4cbe7257a729ab784ddf2b002e989300) --- .../ldb/SingleDirectoryDbLedgerStorage.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java index 9f089d98641..dd673f319a0 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java @@ -843,21 +843,22 @@ public void checkpoint(Checkpoint checkpoint) throws IOException { // Leave IOExecption as it is throw e; } finally { - cleanupExecutor.execute(() -> { - // There can only be one single cleanup task running because the cleanupExecutor - // is single-threaded - try { - if (log.isDebugEnabled()) { - log.debug("Removing deleted ledgers from db indexes"); + try { + cleanupExecutor.execute(() -> { + // There can only be one single cleanup task running because the cleanupExecutor + // is single-threaded + try { + if (log.isDebugEnabled()) { + log.debug("Removing deleted ledgers from db indexes"); + } + + entryLocationIndex.removeOffsetFromDeletedLedgers(); + ledgerIndex.removeDeletedLedgers(); + } catch (Throwable t) { + log.warn("Failed to cleanup db indexes", t); } + }); - entryLocationIndex.removeOffsetFromDeletedLedgers(); - ledgerIndex.removeDeletedLedgers(); - } catch (Throwable t) { - log.warn("Failed to cleanup db indexes", t); - } - }); - try { isFlushOngoing.set(false); } finally { flushMutex.unlock(); From 067985847923a005aec92a232824bc9a91c1d262 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 17 Apr 2023 11:28:47 +0800 Subject: [PATCH 026/233] Remove avro, hadoop-auth and jersey-json dependencies from hadoop-common to resolve CVE-2019-10202, CVE-2023-1370 and CVE-2022-45685 (#3911) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Motivation #### [CVE-2019-10202](https://www.cve.org/CVERecord?id=CVE-2019-10202) After upgrading the Hadoop version to 3.3.5, the CVE-2019-10202 still exists. Detailed paths Introduced through: org.apache.distributedlog:dlfs@4.16.0-SNAPSHOT › org.apache.hadoop:hadoop-common@3.3.5 › org.apache.avro:avro@1.7.7 › org.codehaus.jackson:jackson-mapper-asl@1.9.13 #### [CVE-2023-1370](https://www.cve.org/CVERecord?id=CVE-2023-1370) Detailed paths Introduced through: org.apache.distributedlog:dlfs@4.16.0-SNAPSHOT › org.apache.hadoop:hadoop-common@3.3.5 › org.apache.hadoop:hadoop-auth@3.3.5 › net.minidev:json-smart@2.4.7 Fix: No remediation path available. #### [CVE-2022-45685](https://www.cve.org/CVERecord?id=CVE-2022-45685) Detailed paths Introduced through: org.apache.distributedlog:dlfs@4.16.0-SNAPSHOT › org.apache.hadoop:hadoop-common@3.3.5 › com.github.pjfanning:jersey-json@1.20 › org.codehaus.jettison:jettison@1.1 Fix: No remediation path available. After checking the code of package `org.apache.distributedlog.fs`, those classes only use `org.apache.hadoop.conf`, `org.apache.hadoop.fs` and `org.apache.hadoop.util` packages. They don't use any Avro-related, json-smart and jersey-json dependencies. It is safe to remove the those dependencies to resolve the CVE issue. https://github.com/apache/bookkeeper/tree/master/stream/distributedlog/io/dlfs/src/main/java/org/apache/distributedlog/fs ### Changes Exclude the Avro dependency from `hadoop-common` (cherry picked from commit 94e15b3dc0286de1dda1bd3989fd8b9de12e8d05) --- stream/distributedlog/io/dlfs/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 7a4b45abc71..388ea7bde87 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -58,6 +58,18 @@ log4j log4j + + org.apache.avro + avro + + + net.minidev + json-smart + + + com.github.pjfanning + jersey-json + From 36043c3ffe223a0cdc97b6162907f51d036587a6 Mon Sep 17 00:00:00 2001 From: wenbingshen Date: Wed, 26 Apr 2023 13:54:24 +0800 Subject: [PATCH 027/233] recycle dropping read-write requests when various exceptions happened (#3912) (cherry picked from commit 3a9fe1b2874dd238766569895175ce2e9cabcabf) --- .../java/org/apache/bookkeeper/proto/ReadEntryProcessor.java | 1 + .../java/org/apache/bookkeeper/proto/WriteEntryProcessor.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java index c44216a0283..4c9c1c9440f 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java @@ -65,6 +65,7 @@ protected void processPacket() { LOG.debug("Dropping read request for closed channel: {}", requestHandler.ctx().channel()); } requestProcessor.onReadRequestFinish(); + recycle(); return; } int errorCode = BookieProtocol.EOK; diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java index 29b3a5abb70..0cd01c7970d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java @@ -65,6 +65,7 @@ protected void processPacket() { requestProcessor.getRequestStats().getAddRequestStats()); request.release(); request.recycle(); + recycle(); return; } @@ -109,6 +110,7 @@ protected void processPacket() { ResponseBuilder.buildErrorResponse(rc, request), requestProcessor.getRequestStats().getAddRequestStats()); request.recycle(); + recycle(); } } From 8c4f3c8cbb36cc8fe272dfc2916b6fa7cce98ffe Mon Sep 17 00:00:00 2001 From: wenbingshen Date: Sat, 22 Apr 2023 10:23:52 +0800 Subject: [PATCH 028/233] Enable PCBC completionObjects autoShrink to reduce memory usage and gc (#3913) ### Motivation PerChannelBookieClient completionObjects occupy a lot of heap space and cannot be recycled. The figure below shows that the internal table array of ConcurrentOpenHashMap has used space size=0, but the array length is still 16384, and the memory overhead is 65552bytes. ![image](https://user-images.githubusercontent.com/35599757/231114802-db90c49b-d295-46d7-b7db-785035b341f0.png) ![image](https://user-images.githubusercontent.com/35599757/231113930-bd9f3f54-9052-4c0b-9a3f-2fc493632e35.png) ConcurrentOpenHashMap default DefaultConcurrencyLevel=16. We have hundreds of bookie nodes. Due to the feature of bookie polling and writing, the client and server have long connection characteristics, which will as a result, the memory usage of about 65552 * 16 * 1776 = 1.74GB cannot be recycled, and the space take up by these tables is all size=0 (The broker's owner topic has drifted to other brokers due to Full GC). ![image](https://user-images.githubusercontent.com/35599757/231117087-08c80320-fa71-49c2-a199-cfee3d83ddc5.png) When the throughput of the pulsar cluster increases and the bookie cluster expands, these memory usage will also increase. Coupled with the unreasonable memory usage in other aspects of pulsar that we know, this will cause the pulsar broker to continuously generate full gc. ### Changes I think adding autoShrink to completionObjects can reduce this part of memory usage and reduce the frequency of Full GC. (cherry picked from commit ca33b31d3918d04bee63fba54b81b531709a6536) --- .../org/apache/bookkeeper/proto/PerChannelBookieClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java index 41add30ca56..f84343a71b4 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java @@ -187,7 +187,7 @@ public class PerChannelBookieClient extends ChannelInboundHandlerAdapter { final int startTLSTimeout; private final ConcurrentOpenHashMap completionObjects = - ConcurrentOpenHashMap.newBuilder().build(); + ConcurrentOpenHashMap.newBuilder().autoShrink(true).build(); // Map that hold duplicated read requests. The idea is to only use this map (synchronized) when there is a duplicate // read request for the same ledgerId/entryId From 81fd119ff1fa1858992e75d58600cd5172eeb5a7 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Thu, 13 Apr 2023 21:34:38 +0800 Subject: [PATCH 029/233] Upgrade docker base image to resolve CVE-2023-0286 (#3916) (cherry picked from commit 35e9da9b55b5d44459d3421e8704be47afc6f914) --- dev/docker/Dockerfile | 2 +- dev/release/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile index 63102a939ca..a23a363beef 100644 --- a/dev/docker/Dockerfile +++ b/dev/docker/Dockerfile @@ -17,7 +17,7 @@ # under the License. # -FROM maven:3.8.6-eclipse-temurin-11 +FROM maven:3.9.0-eclipse-temurin-11 RUN apt-get update RUN apt-get install -y g++ cmake diff --git a/dev/release/Dockerfile b/dev/release/Dockerfile index 0c349d9b5fe..6901b304cf1 100644 --- a/dev/release/Dockerfile +++ b/dev/release/Dockerfile @@ -17,7 +17,7 @@ # under the License. # -FROM maven:3.8.6-eclipse-temurin-8 +FROM maven:3.9.0-eclipse-temurin-8 RUN apt-get update RUN apt-get install -y g++ cmake gnupg2 vim subversion From db41a5c33f11b4f9e1c3aae7a81badf72ef1ab56 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 19 Jun 2023 15:07:05 +0800 Subject: [PATCH 030/233] Fix ledger replicated failed blocks bookie decommission process (#3917) ### Motivation When I decommission one bookie (bk3), one ledger replicate failed and blocked decommission process. This is the auto-recovery log: ``` 2023-03-29T06:29:22,642+0000 [ReplicationWorker] ERROR org.apache.bookkeeper.client.LedgerHandle - ReadEntries exception on ledgerId:904368 firstEntry:14 lastEntry:14 lastAddConfirmed:13 2023-03-29T06:29:22,642+0000 [ReplicationWorker] ERROR org.apache.bookkeeper.replication.ReplicationWorker - Received error: -1 while trying to read entry: 14 of ledger: 904368 in ReplicationWorker 2023-03-29T06:29:22,642+0000 [ReplicationWorker] ERROR org.apache.bookkeeper.replication.ReplicationWorker - Failed to read faulty entries, so giving up replicating ledgerFragment Fragment(LedgerID: 904368, FirstEntryID: 0[0], LastKnownEntryID: 14[14], Host: [betausc1-bk-10.betausc1-bk-headless.o-vaxkx.svc.cluster.local:3181], Closed: true) 2023-03-29T06:29:22,644+0000 [ReplicationWorker] ERROR org.apache.bookkeeper.replication.ReplicationWorker - ReplicationWorker failed to replicate Ledger : 904368 for 6 number of times, so deferring the ledger lock release by 300000 msecs ``` The ledger's metadata: ``` ledgerID: 904368 2023-03-29T06:47:56,511+0000 [main] INFO org.apache.bookkeeper.tools.cli.commands. client.LedgerMetaDataCommand - LedgerMetadata{formatVersion=3, ensembleSize=3, writeQuorumSize=3, ackQuorumSize=2, state=OPEN, digestType=CRC32C, password=base64:, ensembles={0=[bk1:3181, bk2:3181, bk3:3181], 15=[bk1:3181, bk2:3181, bk4:3181]},...} ``` The ledger (904368) has two ensembles, `ensembles={0=[bk1:3181, bk2:3181, bk3:3181], 15=[bk1:3181, bk2:3181, bk4:3181]}`. However, the replication worker got the ledger's LAC is 13, but it got the replication fragment entry range is [0, 14]. When reading entry 14, it failed. ### One question **Why the ensembles created a new ensemble starting with entryId = 15, but the ledger's lastAddConfirm is 13.** This question is related to two parts, one is how the new ensemble was created and the other is how the lastAddConfirm was generated. #### 1. How the new ensemble was created The ensemble change is controlled on the bookie client side. When one entry is ready to send to the bookie server, the bookie client will check whether need to do the ensemble change. https://github.com/apache/bookkeeper/blob/912896deb2e748389e15e74c37539b2ff36302c7/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java#L254 For the above case, when writing entry 15, one bookie is lost, it will trigger the ensemble change and generate the new ensemble: 15=[bk1:3181, bk2:3181, bk4:3181]. However, entry 15 write failed, such as timeout or bookie server rejected the write. For now, entry 14 is written succeed. #### 2. How the lastAddConfirm was generated Due to the ledger being in the `OPEN` state, the ledger handle will send a readLAC request according to the last ensemble to get the ledger's lastAddConfirm. For the above case, the readLAC request will send to bk1, bk2, and bk4. For the `V2` protocol (Pulsar uses the V2 protocol to interact with the BookKeeper cluster), the bookie client put the lastAddConfirm EntryId in the next Entry's metadata. https://github.com/apache/bookkeeper/blob/df4492012cc03682534cbc8dd68dd81163b0c947/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DigestManager.java#L134 When we use the `V2` protocol to open an `OPEN` state ledger to read, it will send a readLastAddConfirm request to the bookie server, and the bookie server gets the last entry of this ledger and return to the client. https://github.com/apache/bookkeeper/blob/df4492012cc03682534cbc8dd68dd81163b0c947/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java#L108 However, the bookie client will parse the response entry and get the lastAddConfirm from the entry's metadata. Due to the entry just recording the previous EntryId as the lastAddConfirm, the LedgerHandle got the lastAddConfirm will be the penultimate EntryId of the ledger. For the above case, the bk1 holds the max entry 14, bk2 holds the max entry 14, and bk4 returns NoSuchEntryException, LedgerHandle gets lastAddConfirm will be `14 - 1 = 13`, not 14. When the replicator tries to recover the first ensemble 0=[bk1:3181, bk2:3181, bk3:3181] with entry range [0, 14], reading entry 14 will throw a ReadEntryException due to the lastAddConfirm is 13. https://github.com/apache/bookkeeper/blob/df4492012cc03682534cbc8dd68dd81163b0c947/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java#L685-L690 ### Solution When encountered that case that - The ledger is `OPEN` - The ledger has multiple ensembles - The ledger's last ensemble doesn't have any entries, which means `lastAddConfirm < last ensemble key - 1` We should treat the penultimate segment/ensemble of the ledger as an `OPEN` state instead of a closed state. https://github.com/apache/bookkeeper/blob/df4492012cc03682534cbc8dd68dd81163b0c947/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragment.java#L56-L57 After we treat the segment/ensemble as `OPEN` state, the replicator will close the ledger first and replicate it. (cherry picked from commit eff38e45e317b90eb1cd456bd5d5629dedc1fd5f) --- .../bookkeeper/client/LedgerFragment.java | 7 +- .../replication/ReplicationWorker.java | 14 ++++ .../client/BookieWriteLedgerTest.java | 75 +++++++++++++++++++ .../replication/ReplicationTestUtil.java | 2 +- .../replication/TestReplicationWorker.java | 27 +++++++ 5 files changed, 123 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragment.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragment.java index 6a09922f67e..fba45aff110 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragment.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragment.java @@ -53,8 +53,13 @@ public LedgerFragment(LedgerHandle lh, this.schedule = lh.getDistributionSchedule(); SortedMap> ensembles = lh .getLedgerMetadata().getAllEnsembles(); + // Check if the ledger fragment is closed has two conditions + // 1. The ledger is closed + // 2. This fragment is not the last fragment and this ledger's lastAddConfirm >= ensembles.lastKey() - 1. + // This case happens when the ledger's last ensemble is empty this.isLedgerClosed = lh.getLedgerMetadata().isClosed() - || !ensemble.equals(ensembles.get(ensembles.lastKey())); + || (!ensemble.equals(ensembles.get(ensembles.lastKey())) + && lh.getLastAddConfirmed() >= ensembles.lastKey() - 1); } public LedgerFragment(LedgerFragment lf, Set subset) { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java index 942c09d4fa2..f22231c5676 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java @@ -34,6 +34,7 @@ import com.google.common.cache.LoadingCache; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -45,6 +46,7 @@ import java.util.SortedMap; import java.util.Timer; import java.util.TimerTask; +import java.util.TreeMap; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.CountDownLatch; @@ -561,6 +563,14 @@ private boolean rereplicate(long ledgerIdToReplicate) throws InterruptedExceptio * *

Missing bookies in closed ledgers are fine, as we know the last confirmed add, so * we can tell which entries are supposed to exist and rereplicate them if necessary. + * + *

Another corner case is that there are multiple ensembles in the ledger and the last + * segment/ensemble is open, but nothing has been written to some quorums in the ensemble. + * For the v2 protocol, this ledger's lastAddConfirm entry is the last segment/ensemble's `key - 2`, + * not `key - 2`, the explanation please refer to: https://github.com/apache/bookkeeper/pull/3917. + * If we treat the penultimate segment/ensemble as closed state, we will can't replicate + * the last entry in the segment. So in this case, we should also check if the penultimate + * segment/ensemble has missing bookies. */ private boolean isLastSegmentOpenAndMissingBookies(LedgerHandle lh) throws BKException { LedgerMetadata md = admin.getLedgerMetadata(lh); @@ -570,6 +580,10 @@ private boolean isLastSegmentOpenAndMissingBookies(LedgerHandle lh) throws BKExc SortedMap> ensembles = admin.getLedgerMetadata(lh).getAllEnsembles(); List finalEnsemble = ensembles.get(ensembles.lastKey()); + if (ensembles.size() > 1 && lh.getLastAddConfirmed() < ensembles.lastKey() - 1) { + finalEnsemble = new ArrayList<>(finalEnsemble); + finalEnsemble.addAll((new TreeMap<>(ensembles)).floorEntry(ensembles.lastKey() - 1).getValue()); + } Collection available = admin.getAvailableBookies(); for (BookieId b : finalEnsemble) { if (!available.contains(b)) { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java index 2a57f9952f2..3cfd398985f 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java @@ -26,6 +26,7 @@ import static org.apache.bookkeeper.client.BookKeeperClientStats.READ_OP_DM; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -36,10 +37,12 @@ import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledByteBufAllocator; import java.io.IOException; +import java.net.URI; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.List; @@ -60,12 +63,22 @@ import org.apache.bookkeeper.client.api.ReadHandle; import org.apache.bookkeeper.client.api.WriteAdvHandle; import org.apache.bookkeeper.conf.ServerConfiguration; +import org.apache.bookkeeper.meta.LedgerManagerFactory; import org.apache.bookkeeper.meta.LedgerMetadataSerDe; +import org.apache.bookkeeper.meta.LedgerUnderreplicationManager; import org.apache.bookkeeper.meta.LongHierarchicalLedgerManagerFactory; +import org.apache.bookkeeper.meta.MetadataBookieDriver; +import org.apache.bookkeeper.meta.MetadataDrivers; +import org.apache.bookkeeper.meta.zk.ZKMetadataDriverBase; import org.apache.bookkeeper.net.BookieId; +import org.apache.bookkeeper.replication.ReplicationTestUtil; +import org.apache.bookkeeper.replication.ReplicationWorker; +import org.apache.bookkeeper.stats.NullStatsLogger; import org.apache.bookkeeper.test.BookKeeperClusterTestCase; import org.apache.bookkeeper.test.TestStatsProvider; +import org.apache.bookkeeper.util.BookKeeperConstants; import org.apache.commons.lang3.tuple.Pair; +import org.awaitility.Awaitility; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -1453,6 +1466,68 @@ public void testLedgerCreateByteBufRefCnt() throws Exception { bkc.deleteLedger(lh.ledgerId); } + @Test + public void testReadLacNotSameWithMetadataLedgerReplication() throws Exception { + lh = bkc.createLedger(3, 3, 2, digestType, ledgerPassword); + for (int i = 0; i < 10; ++i) { + ByteBuffer entry = ByteBuffer.allocate(4); + entry.putInt(rng.nextInt(maxInt)); + entry.position(0); + lh.addEntry(entry.array()); + } + + List ensemble = lh.getLedgerMetadata().getAllEnsembles().entrySet().iterator().next().getValue(); + assertEquals(1, lh.getLedgerMetadata().getAllEnsembles().size()); + killBookie(ensemble.get(1)); + + try { + lh.ensembleChangeLoop(ensemble, Collections.singletonMap(1, ensemble.get(1))); + } catch (Exception e) { + fail(); + } + + LedgerHandle lh1 = bkc.openLedgerNoRecovery(lh.ledgerId, digestType, ledgerPassword); + assertEquals(2, lh1.getLedgerMetadata().getAllEnsembles().size()); + List firstEnsemble = lh1.getLedgerMetadata().getAllEnsembles().firstEntry().getValue(); + + long entryId = lh1.getLedgerMetadata().getAllEnsembles().lastEntry().getKey() - 1; + try { + lh1.readAsync(entryId, entryId).get(); + fail(); + } catch (Exception e) { + LOG.info("Failed to read entry: {} ", entryId, e); + } + + MetadataBookieDriver driver = MetadataDrivers.getBookieDriver( + URI.create(baseConf.getMetadataServiceUri())); + driver.initialize( + baseConf, + NullStatsLogger.INSTANCE); + // initialize urReplicationManager + LedgerManagerFactory mFactory = driver.getLedgerManagerFactory(); + LedgerUnderreplicationManager underReplicationManager = mFactory.newLedgerUnderreplicationManager(); + baseConf.setOpenLedgerRereplicationGracePeriod(String.valueOf(30)); + + + ReplicationWorker replicationWorker = new ReplicationWorker(baseConf); + replicationWorker.start(); + String basePath = ZKMetadataDriverBase.resolveZkLedgersRootPath(baseClientConf) + '/' + + BookKeeperConstants.UNDER_REPLICATION_NODE + + BookKeeperConstants.DEFAULT_ZK_LEDGERS_ROOT_PATH; + + try { + underReplicationManager.markLedgerUnderreplicated(lh1.getId(), ensemble.get(1).toString()); + + Awaitility.waitAtMost(30, TimeUnit.SECONDS).untilAsserted(() -> + assertFalse(ReplicationTestUtil.isLedgerInUnderReplication(zkc, lh1.getId(), basePath)) + ); + + assertNotEquals(firstEnsemble, lh1.getLedgerMetadata().getAllEnsembles().firstEntry().getValue()); + } finally { + replicationWorker.shutdown(); + } + } + @Test public void testLedgerMetadataTest() throws Exception { baseClientConf.setLedgerMetadataFormatVersion(LedgerMetadataSerDe.METADATA_FORMAT_VERSION_2); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/ReplicationTestUtil.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/ReplicationTestUtil.java index 65a6f31c35a..e36955a0c29 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/ReplicationTestUtil.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/ReplicationTestUtil.java @@ -32,7 +32,7 @@ public class ReplicationTestUtil { /** * Checks whether ledger is in under-replication. */ - static boolean isLedgerInUnderReplication(ZooKeeper zkc, long id, + public static boolean isLedgerInUnderReplication(ZooKeeper zkc, long id, String basePath) throws KeeperException, InterruptedException { List children; try { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java index fab068ae609..8caad1178c3 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java @@ -1158,6 +1158,33 @@ public void testRWShutDownInTheCaseOfZKOperationFailures() throws Exception { } } + @Test + public void testReplicateEmptyOpenStateLedger() throws Exception { + LedgerHandle lh = bkc.createLedger(3, 3, 2, BookKeeper.DigestType.CRC32, TESTPASSWD); + assertFalse(lh.getLedgerMetadata().isClosed()); + + List firstEnsemble = lh.getLedgerMetadata().getAllEnsembles().firstEntry().getValue(); + List ensemble = lh.getLedgerMetadata().getAllEnsembles().entrySet().iterator().next().getValue(); + killBookie(ensemble.get(1)); + + startNewBookie(); + baseConf.setOpenLedgerRereplicationGracePeriod(String.valueOf(30)); + ReplicationWorker replicationWorker = new ReplicationWorker(baseConf); + replicationWorker.start(); + + try { + underReplicationManager.markLedgerUnderreplicated(lh.getId(), ensemble.get(1).toString()); + Awaitility.waitAtMost(60, TimeUnit.SECONDS).untilAsserted(() -> + assertFalse(ReplicationTestUtil.isLedgerInUnderReplication(zkc, lh.getId(), basePath)) + ); + + LedgerHandle lh1 = bkc.openLedgerNoRecovery(lh.getId(), BookKeeper.DigestType.CRC32, TESTPASSWD); + assertTrue(lh1.getLedgerMetadata().isClosed()); + } finally { + replicationWorker.shutdown(); + } + } + @Test public void testRepairedNotAdheringPlacementPolicyLedgerFragmentsOnRack() throws Exception { testRepairedNotAdheringPlacementPolicyLedgerFragments(RackawareEnsemblePlacementPolicy.class, null); From eaefcfc47bb9dff94ba417bdb76338e67e3c8006 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Thu, 4 May 2023 11:47:03 +0800 Subject: [PATCH 031/233] Fix some metrics generated by prometheus client without type info (#3927) ### Motivation When we get the metrics output from Prometheus, we found the metrics generated by the Prometheus client without type info, which will lead to some monitor integration systems can't parse the metrics ``` jvm_gc_collection_seconds_count{gc="G1 Young Generation"} 4.0 jvm_gc_collection_seconds_sum{gc="G1 Young Generation"} 2.287 jvm_gc_collection_seconds_count{gc="G1 Old Generation"} 0.0 jvm_gc_collection_seconds_sum{gc="G1 Old Generation"} 0.0 jvm_memory_direct_bytes_max{} 2.147483648E9 jvm_threads_current{} 136.0 jvm_threads_daemon{} 18.0 jvm_threads_peak{} 137.0 jvm_threads_started_total{} 415.0 jvm_threads_deadlocked{} 0.0 jvm_threads_deadlocked_monitor{} 0.0 process_cpu_seconds_total{} 740.860392 process_start_time_seconds{} 1.681901598385E9 process_open_fds{} 484.0 process_max_fds{} 10240.0 log4j2_appender_total{level="debug"} 0.0 log4j2_appender_total{level="warn"} 20.0 log4j2_appender_total{level="trace"} 0.0 log4j2_appender_total{level="error"} 3.0 log4j2_appender_total{level="fatal"} 0.0 log4j2_appender_total{level="info"} 317.0 caffeine_cache_hit_total{cache="bookies-racks-exists"} 0.0 caffeine_cache_hit_total{cache="bookies-racks-children"} 0.0 caffeine_cache_hit_total{cache="bookies-racks-data"} 2.0 caffeine_cache_miss_total{cache="bookies-racks-exists"} 0.0 caffeine_cache_miss_total{cache="bookies-racks-children"} 0.0 caffeine_cache_miss_total{cache="bookies-racks-data"} 2.0 caffeine_cache_requests_total{cache="bookies-racks-exists"} 0.0 caffeine_cache_requests_total{cache="bookies-racks-children"} 0.0 caffeine_cache_requests_total{cache="bookies-racks-data"} 4.0 caffeine_cache_eviction_total{cache="bookies-racks-exists"} 0.0 caffeine_cache_eviction_total{cache="bookies-racks-children"} 0.0 ``` ### Changes Write the metrics' type info to the output. (cherry picked from commit 16282e71dfa88c5b29356a263a2a78669329bdb5) --- .../prometheus/PrometheusTextFormat.java | 27 +++++++++ .../prometheus/PrometheusTextFormatTest.java | 39 ------------- .../prometheus/TestPrometheusFormatter.java | 56 +++++++++++++++++++ 3 files changed, 83 insertions(+), 39 deletions(-) delete mode 100644 stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/PrometheusTextFormatTest.java diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/PrometheusTextFormat.java b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/PrometheusTextFormat.java index a3bf919f1fd..20fc1f5a493 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/PrometheusTextFormat.java +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/PrometheusTextFormat.java @@ -178,6 +178,9 @@ static void writeMetricsCollectedByPrometheusClient(Writer w, CollectorRegistry Enumeration metricFamilySamples = registry.metricFamilySamples(); while (metricFamilySamples.hasMoreElements()) { MetricFamilySamples metricFamily = metricFamilySamples.nextElement(); + // Write type of metric + w.append("# TYPE ").append(metricFamily.name).append(getTypeNameSuffix(metricFamily.type)).append(' ') + .append(getTypeStr(metricFamily.type)).write('\n'); for (int i = 0; i < metricFamily.samples.size(); i++) { Sample sample = metricFamily.samples.get(i); @@ -200,6 +203,30 @@ static void writeMetricsCollectedByPrometheusClient(Writer w, CollectorRegistry } } + static String getTypeNameSuffix(Collector.Type type) { + if (type.equals(Collector.Type.INFO)) { + return "_info"; + } + return ""; + } + + static String getTypeStr(Collector.Type type) { + switch (type) { + case COUNTER: + return "counter"; + case GAUGE: + case INFO: + return "gauge"; + case SUMMARY: + return "summary"; + case HISTOGRAM: + return "histogram"; + case UNKNOWN: + default: + return "unknown"; + } + } + void writeType(Writer w, String name, String type) throws IOException { if (metricNameSet.contains(name)) { return; diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/PrometheusTextFormatTest.java b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/PrometheusTextFormatTest.java deleted file mode 100644 index bce5fce4802..00000000000 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/PrometheusTextFormatTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.bookkeeper.stats.prometheus; - -import java.io.IOException; -import java.io.StringWriter; -import org.junit.Assert; -import org.junit.Test; - -/** - * Test for {@link PrometheusTextFormat}. - */ -public class PrometheusTextFormatTest { - - @Test - public void testPrometheusTypeDuplicate() throws IOException { - PrometheusTextFormat prometheusTextFormat = new PrometheusTextFormat(); - StringWriter writer = new StringWriter(); - prometheusTextFormat.writeType(writer, "counter", "gauge"); - prometheusTextFormat.writeType(writer, "counter", "gauge"); - String string = writer.toString(); - Assert.assertEquals("# TYPE counter gauge\n", string); - } - -} diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/TestPrometheusFormatter.java b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/TestPrometheusFormatter.java index 7ef06eb4de1..8855044f24a 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/TestPrometheusFormatter.java +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/TestPrometheusFormatter.java @@ -19,11 +19,19 @@ import static com.google.common.base.Preconditions.checkArgument; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import com.google.common.base.MoreObjects; import com.google.common.base.Splitter; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; +import io.prometheus.client.CollectorRegistry; +import io.prometheus.client.Gauge; +import io.prometheus.client.hotspot.GarbageCollectorExports; +import io.prometheus.client.hotspot.MemoryPoolsExports; +import io.prometheus.client.hotspot.StandardExports; +import io.prometheus.client.hotspot.ThreadExports; +import java.io.IOException; import java.io.StringWriter; import java.util.List; import java.util.Map; @@ -168,6 +176,54 @@ public void testStatsOutput() throws Exception { assertTrue(found); } + @Test + public void testWriteMetricsCollectedByPrometheusClient() { + CollectorRegistry registry = CollectorRegistry.defaultRegistry; + registry.register(new StandardExports()); + registry.register(new MemoryPoolsExports()); + registry.register(new GarbageCollectorExports()); + registry.register(new ThreadExports()); + registry.register(Gauge.build("jvm_memory_direct_bytes_used", "-").create().setChild(new Gauge.Child() { + @Override + public double get() { + return 1.0; + } + })); + registry.register(Gauge.build("jvm_memory_direct_bytes_max", "-").create().setChild(new Gauge.Child() { + @Override + public double get() { + return 100.0; + } + })); + PrometheusMetricsProvider provider = new PrometheusMetricsProvider(registry); + StringWriter writer = new StringWriter(); + try { + provider.rotateLatencyCollection(); + provider.writeAllMetrics(writer); + String output = writer.toString(); + parseMetrics(output); + assertTrue(output.contains("# TYPE jvm_memory_direct_bytes_max gauge")); + assertTrue(output.contains("# TYPE jvm_memory_direct_bytes_used gauge")); + assertTrue(output.contains("# TYPE jvm_gc_collection_seconds summary")); + assertTrue(output.contains("# TYPE jvm_memory_pool_bytes_committed gauge")); + assertTrue(output.contains("# TYPE process_cpu_seconds counter")); + } catch (Exception e) { + fail(); + } + + } + + @Test + public void testPrometheusTypeDuplicate() throws IOException { + PrometheusTextFormat prometheusTextFormat = new PrometheusTextFormat(); + StringWriter writer = new StringWriter(); + prometheusTextFormat.writeType(writer, "counter", "gauge"); + prometheusTextFormat.writeType(writer, "counter", "gauge"); + String string = writer.toString(); + assertEquals("# TYPE counter gauge\n", string); + } + + /** * Hacky parsing of Prometheus text format. Sould be good enough for unit tests */ From 3e884383f0c4578ab0c567e6a4a17e1cdb34a594 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Thu, 4 May 2023 11:43:47 +0800 Subject: [PATCH 032/233] Upgrade docusaurus to 2.4.0 (#3936) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Motivation There are many CVEs in docusaurus 2.0.0-beta.17 version. #### [CVE-2023-2251](https://www.cve.org/CVERecord?id=CVE-2023-2251) Detailed paths Introduced through: site-3@0.0.0 › @docusaurus/core@2.0.0-beta.17 › cssnano@5.1.0 › yaml@1.10.2 Fix: No remediation path available. Introduced through: site-3@0.0.0 › @docusaurus/core@2.0.0-beta.17 › postcss-loader@6.2.1 › cosmiconfig@7.0.1 › yaml@1.10.2 Fix: [Upgrade](https://app.snyk.io/org/streamnative-org/fix/b453ecf3-1fc1-4ac1-a9e6-7c4cc6a8b4a1?vuln=SNYK-JS-YAML-5458867) to @docusaurus/core@2.0.0 Introduced through: site-3@0.0.0 › @docusaurus/core@2.0.0-beta.17 › css-minimizer-webpack-plugin@3.4.1 › cssnano@5.1.0 › yaml@1.10.2 Fix: No remediation path available. #### [CVE-2022-25967](https://www.cve.org/CVERecord?id=CVE-2022-25967) Detailed paths and remediation Introduced through: site-3@0.0.0 › @docusaurus/core@2.0.0-beta.17 › eta@1.12.3 Fix: [Upgrade](https://app.snyk.io/org/streamnative-org/fix/b453ecf3-1fc1-4ac1-a9e6-7c4cc6a8b4a1?vuln=SNYK-JS-ETA-2936803) to @docusaurus/core@2.3.1 Introduced through: site-3@0.0.0 › @docusaurus/preset-classic@2.0.0-beta.17 › @docusaurus/core@2.0.0-beta.17 › eta@1.12.3 Fix: [Upgrade](https://app.snyk.io/org/streamnative-org/fix/b453ecf3-1fc1-4ac1-a9e6-7c4cc6a8b4a1?vuln=SNYK-JS-ETA-2936803) to @docusaurus/preset-classic@2.3.1 Introduced through: site-3@0.0.0 › @docusaurus/preset-classic@2.0.0-beta.17 › @docusaurus/theme-search-algolia@2.0.0-beta.17 › eta@1.12.3 Fix: [Upgrade](https://app.snyk.io/org/streamnative-org/fix/b453ecf3-1fc1-4ac1-a9e6-7c4cc6a8b4a1?vuln=SNYK-JS-ETA-2936803) to @docusaurus/preset-classic@2.3.1 ### Changes Upgrade the docusaurus to 2.4.0 to resolve those CVEs (cherry picked from commit 93fc91742d532815ea12e125c49bcdcf899fd912) --- .github/workflows/website-deploy.yaml | 2 +- .github/workflows/website-pr-validation.yml | 2 +- site3/website/package.json | 4 +- site3/website/yarn.lock | 3732 ++++++++++++------- 4 files changed, 2436 insertions(+), 1304 deletions(-) diff --git a/.github/workflows/website-deploy.yaml b/.github/workflows/website-deploy.yaml index 4e09c0544d7..b35eb4b7efa 100644 --- a/.github/workflows/website-deploy.yaml +++ b/.github/workflows/website-deploy.yaml @@ -54,7 +54,7 @@ jobs: - name: Setup NodeJS uses: actions/setup-node@v2 with: - node-version: '14' + node-version: '16' - name: Setup yarn run: npm install -g yarn diff --git a/.github/workflows/website-pr-validation.yml b/.github/workflows/website-pr-validation.yml index 426552432f5..f66dbf9f5d8 100644 --- a/.github/workflows/website-pr-validation.yml +++ b/.github/workflows/website-pr-validation.yml @@ -51,7 +51,7 @@ jobs: - name: Setup NodeJS uses: actions/setup-node@v2 with: - node-version: '14' + node-version: '16' - name: Setup yarn run: npm install -g yarn diff --git a/site3/website/package.json b/site3/website/package.json index 94d91d01513..3eb00996b6d 100644 --- a/site3/website/package.json +++ b/site3/website/package.json @@ -15,8 +15,8 @@ "write-heading-ids": "docusaurus write-heading-ids" }, "dependencies": { - "@docusaurus/core": "2.0.0-beta.17", - "@docusaurus/preset-classic": "2.0.0-beta.17", + "@docusaurus/core": "2.4.0", + "@docusaurus/preset-classic": "2.4.0", "@mdx-js/react": "^1.6.22", "clsx": "^1.1.1", "docusaurus-plugin-sass": "^0.2.2", diff --git a/site3/website/yarn.lock b/site3/website/yarn.lock index 376e078e40a..f2e66b6d6ae 100644 --- a/site3/website/yarn.lock +++ b/site3/website/yarn.lock @@ -2,24 +2,24 @@ # yarn lockfile v1 -"@algolia/autocomplete-core@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.5.2.tgz#ec0178e07b44fd74a057728ac157291b26cecf37" - integrity sha512-DY0bhyczFSS1b/CqJlTE/nQRtnTAHl6IemIkBy0nEWnhDzRDdtdx4p5Uuk3vwAFxwEEgi1WqKwgSSMx6DpNL4A== +"@algolia/autocomplete-core@1.7.4": + version "1.7.4" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.7.4.tgz#85ff36b2673654a393c8c505345eaedd6eaa4f70" + integrity sha512-daoLpQ3ps/VTMRZDEBfU8ixXd+amZcNJ4QSP3IERGyzqnL5Ch8uSRFt/4G8pUvW9c3o6GA4vtVv4I4lmnkdXyg== dependencies: - "@algolia/autocomplete-shared" "1.5.2" + "@algolia/autocomplete-shared" "1.7.4" -"@algolia/autocomplete-preset-algolia@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.5.2.tgz#36c5638cc6dba6ea46a86e5a0314637ca40a77ca" - integrity sha512-3MRYnYQFJyovANzSX2CToS6/5cfVjbLLqFsZTKcvF3abhQzxbqwwaMBlJtt620uBUOeMzhdfasKhCc40+RHiZw== +"@algolia/autocomplete-preset-algolia@1.7.4": + version "1.7.4" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.4.tgz#610ee1d887962f230b987cba2fd6556478000bc3" + integrity sha512-s37hrvLEIfcmKY8VU9LsAXgm2yfmkdHT3DnA3SgHaY93yjZ2qL57wzb5QweVkYuEBZkT2PIREvRoLXC2sxTbpQ== dependencies: - "@algolia/autocomplete-shared" "1.5.2" + "@algolia/autocomplete-shared" "1.7.4" -"@algolia/autocomplete-shared@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.5.2.tgz#e157f9ad624ab8fd940ff28bd2094cdf199cdd79" - integrity sha512-ylQAYv5H0YKMfHgVWX0j0NmL8XBcAeeeVQUmppnnMtzDbDnca6CzhKj3Q8eF9cHCgcdTDdb5K+3aKyGWA0obug== +"@algolia/autocomplete-shared@1.7.4": + version "1.7.4" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.4.tgz#78aea1140a50c4d193e1f06a13b7f12c5e2cbeea" + integrity sha512-2VGCk7I9tA9Ge73Km99+Qg87w0wzW4tgUruvWAn/gfey1ZXgmxZtyIRBebk35R1O8TbK77wujVtCnpsGpRy1kg== "@algolia/cache-browser-local-storage@4.12.2": version "4.12.2" @@ -28,11 +28,23 @@ dependencies: "@algolia/cache-common" "4.12.2" +"@algolia/cache-browser-local-storage@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.17.0.tgz#4c54a9b1795dcc1cd9f9533144f7df3057984d39" + integrity sha512-myRSRZDIMYB8uCkO+lb40YKiYHi0fjpWRtJpR/dgkaiBlSD0plRyB6lLOh1XIfmMcSeBOqDE7y9m8xZMrXYfyQ== + dependencies: + "@algolia/cache-common" "4.17.0" + "@algolia/cache-common@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.12.2.tgz#8512f311524f4d0aae8611e9879214a5e2a577ae" integrity sha512-r//r7MF0Na0HxD2BHnjWsDKuI72Z5UEf/Rb/8MC08XKBsjCwBihGxWxycjRcNGjNEIxJBsvRMIEOipcd9qD54g== +"@algolia/cache-common@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.17.0.tgz#bc3da15548df585b44d76c55e66b0056a2b3f917" + integrity sha512-g8mXzkrcUBIPZaulAuqE7xyHhLAYAcF2xSch7d9dABheybaU3U91LjBX6eJTEB7XVhEsgK4Smi27vWtAJRhIKQ== + "@algolia/cache-in-memory@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.12.2.tgz#cacd13c02a7826bfad1c391d012ce00bc5db3859" @@ -40,6 +52,13 @@ dependencies: "@algolia/cache-common" "4.12.2" +"@algolia/cache-in-memory@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.17.0.tgz#eb55a92cb8eb8641903a2b23fd6d05ebdaca2010" + integrity sha512-PT32ciC/xI8z919d0oknWVu3kMfTlhQn3MKxDln3pkn+yA7F7xrxSALysxquv+MhFfNAcrtQ/oVvQVBAQSHtdw== + dependencies: + "@algolia/cache-common" "4.17.0" + "@algolia/client-account@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.12.2.tgz#adc4833b78576d1558ba45b7d44be22747debdc9" @@ -49,6 +68,15 @@ "@algolia/client-search" "4.12.2" "@algolia/transporter" "4.12.2" +"@algolia/client-account@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.17.0.tgz#4b13e5a8e50a06be1f3289d9db337096ebc66b73" + integrity sha512-sSEHx9GA6m7wrlsSMNBGfyzlIfDT2fkz2u7jqfCCd6JEEwmxt8emGmxAU/0qBfbhRSuGvzojoLJlr83BSZAKjA== + dependencies: + "@algolia/client-common" "4.17.0" + "@algolia/client-search" "4.17.0" + "@algolia/transporter" "4.17.0" + "@algolia/client-analytics@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.12.2.tgz#741115db1af7db9526acdd702890480480dc09ce" @@ -59,6 +87,16 @@ "@algolia/requester-common" "4.12.2" "@algolia/transporter" "4.12.2" +"@algolia/client-analytics@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.17.0.tgz#1b36ffbe913b7b4d8900bc15982ca431f47a473c" + integrity sha512-84ooP8QA3mQ958hQ9wozk7hFUbAO+81CX1CjAuerxBqjKIInh1fOhXKTaku05O/GHBvcfExpPLIQuSuLYziBXQ== + dependencies: + "@algolia/client-common" "4.17.0" + "@algolia/client-search" "4.17.0" + "@algolia/requester-common" "4.17.0" + "@algolia/transporter" "4.17.0" + "@algolia/client-common@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.12.2.tgz#88ffd3ddececdc5f343a4a9cb1f6c4058fe780c1" @@ -67,6 +105,14 @@ "@algolia/requester-common" "4.12.2" "@algolia/transporter" "4.12.2" +"@algolia/client-common@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.17.0.tgz#67fd898006e3ac359ea3e3ed61abfc26147ffa53" + integrity sha512-jHMks0ZFicf8nRDn6ma8DNNsdwGgP/NKiAAL9z6rS7CymJ7L0+QqTJl3rYxRW7TmBhsUH40wqzmrG6aMIN/DrQ== + dependencies: + "@algolia/requester-common" "4.17.0" + "@algolia/transporter" "4.17.0" + "@algolia/client-personalization@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.12.2.tgz#5aa1d2a4bbc64559a98bb6d029dda59dbc86e490" @@ -76,6 +122,15 @@ "@algolia/requester-common" "4.12.2" "@algolia/transporter" "4.12.2" +"@algolia/client-personalization@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.17.0.tgz#428d9f4762c22856b6062bb54351eb31834db6c1" + integrity sha512-RMzN4dZLIta1YuwT7QC9o+OeGz2cU6eTOlGNE/6RcUBLOU3l9tkCOdln5dPE2jp8GZXPl2yk54b2nSs1+pAjqw== + dependencies: + "@algolia/client-common" "4.17.0" + "@algolia/requester-common" "4.17.0" + "@algolia/transporter" "4.17.0" + "@algolia/client-search@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.12.2.tgz#940dd07ae4fa7aa86e382ecaf0a82445010b1b4c" @@ -85,6 +140,15 @@ "@algolia/requester-common" "4.12.2" "@algolia/transporter" "4.12.2" +"@algolia/client-search@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.17.0.tgz#0053c682f5f588e006c20791c27e8bcb0aa5b53c" + integrity sha512-x4P2wKrrRIXszT8gb7eWsMHNNHAJs0wE7/uqbufm4tZenAp+hwU/hq5KVsY50v+PfwM0LcDwwn/1DroujsTFoA== + dependencies: + "@algolia/client-common" "4.17.0" + "@algolia/requester-common" "4.17.0" + "@algolia/transporter" "4.17.0" + "@algolia/events@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@algolia/events/-/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950" @@ -95,6 +159,11 @@ resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.12.2.tgz#cdc9a685d7cf356a4d9e5915f741f1ee1a6baade" integrity sha512-iOiJAymLjq137G7+8EQuUEkrgta0cZGMg6scp8s4hJ+X6k+6By4nyptdkCWYwKLsW/Xy927QcIhGlkWV78vQIQ== +"@algolia/logger-common@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.17.0.tgz#0fcea39c9485554edb4cdbfd965c5748b0b837ac" + integrity sha512-DGuoZqpTmIKJFDeyAJ7M8E/LOenIjWiOsg1XJ1OqAU/eofp49JfqXxbfgctlVZVmDABIyOz8LqEoJ6ZP4DTyvw== + "@algolia/logger-console@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.12.2.tgz#d7348e41378fbab5413cb5f97d8ae2ff378cfdb8" @@ -102,6 +171,13 @@ dependencies: "@algolia/logger-common" "4.12.2" +"@algolia/logger-console@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.17.0.tgz#8ac56ef4259c4fa3eb9eb6586c7b4b4ed942e8da" + integrity sha512-zMPvugQV/gbXUvWBCzihw6m7oxIKp48w37QBIUu/XqQQfxhjoOE9xyfJr1KldUt5FrYOKZJVsJaEjTsu+bIgQg== + dependencies: + "@algolia/logger-common" "4.17.0" + "@algolia/requester-browser-xhr@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.12.2.tgz#abfcb1901602ccdf51879b10d914208b776aa418" @@ -109,11 +185,23 @@ dependencies: "@algolia/requester-common" "4.12.2" +"@algolia/requester-browser-xhr@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.17.0.tgz#f52fdeeac2f3c531f00838920af33a73066a159b" + integrity sha512-aSOX/smauyTkP21Pf52pJ1O2LmNFJ5iHRIzEeTh0mwBeADO4GdG94cAWDILFA9rNblq/nK3EDh3+UyHHjplZ1A== + dependencies: + "@algolia/requester-common" "4.17.0" + "@algolia/requester-common@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.12.2.tgz#6d6181fb961205695bf535e108d2e5be8f8c9047" integrity sha512-4szj/lvDQf/u8EyyRBBRZD1ZkKDyLBbckLj7meQDlnbfwnW1UpLwpB2l3XJ9wDmDSftGxUCeTl5oMFe4z9OEvQ== +"@algolia/requester-common@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.17.0.tgz#746020d2cbc829213e7cede8eef2182c7a71e32b" + integrity sha512-XJjmWFEUlHu0ijvcHBoixuXfEoiRUdyzQM6YwTuB8usJNIgShua8ouFlRWF8iCeag0vZZiUm4S2WCVBPkdxFgg== + "@algolia/requester-node-http@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.12.2.tgz#f91e749ee6854c944cc741f13c539dff23363f67" @@ -121,6 +209,13 @@ dependencies: "@algolia/requester-common" "4.12.2" +"@algolia/requester-node-http@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.17.0.tgz#262276d94c25a4ec2128b1bdfb9471529528d8b9" + integrity sha512-bpb/wDA1aC6WxxM8v7TsFspB7yBN3nqCGs2H1OADolQR/hiAIjAxusbuMxVbRFOdaUvAIqioIIkWvZdpYNIn8w== + dependencies: + "@algolia/requester-common" "4.17.0" + "@algolia/transporter@4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.12.2.tgz#60189b626b170f3386deb1d7a0a1e70ed8156864" @@ -130,6 +225,15 @@ "@algolia/logger-common" "4.12.2" "@algolia/requester-common" "4.12.2" +"@algolia/transporter@4.17.0": + version "4.17.0" + resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.17.0.tgz#6aabdbc20c475d72d83c8e6519f1191f1a51fb37" + integrity sha512-6xL6H6fe+Fi0AEP3ziSgC+G04RK37iRb4uUUqVAH9WPYFI8g+LYFq6iv5HS8Cbuc5TTut+Bwj6G+dh/asdb9uA== + dependencies: + "@algolia/cache-common" "4.17.0" + "@algolia/logger-common" "4.17.0" + "@algolia/requester-common" "4.17.0" + "@ampproject/remapping@^2.1.0": version "2.1.2" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34" @@ -137,6 +241,14 @@ dependencies: "@jridgewell/trace-mapping" "^0.3.0" +"@ampproject/remapping@^2.2.0": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" + integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" @@ -144,11 +256,23 @@ dependencies: "@babel/highlight" "^7.16.7" +"@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" + integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== + dependencies: + "@babel/highlight" "^7.18.6" + "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34" integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng== +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" + integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g== + "@babel/core@7.12.9": version "7.12.9" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" @@ -171,7 +295,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.15.5", "@babel/core@^7.17.5": +"@babel/core@^7.15.5": version "7.17.5" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225" integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA== @@ -192,6 +316,27 @@ json5 "^2.1.2" semver "^6.3.0" +"@babel/core@^7.18.6": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659" + integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA== + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.21.4" + "@babel/helper-compilation-targets" "^7.21.4" + "@babel/helper-module-transforms" "^7.21.2" + "@babel/helpers" "^7.21.0" + "@babel/parser" "^7.21.4" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.4" + "@babel/types" "^7.21.4" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.2" + semver "^6.3.0" + "@babel/generator@^7.12.5", "@babel/generator@^7.17.3": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200" @@ -201,6 +346,16 @@ jsesc "^2.5.1" source-map "^0.5.0" +"@babel/generator@^7.18.7", "@babel/generator@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc" + integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA== + dependencies: + "@babel/types" "^7.21.4" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" @@ -208,6 +363,13 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-annotate-as-pure@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" + integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== + dependencies: + "@babel/types" "^7.18.6" + "@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" @@ -216,6 +378,14 @@ "@babel/helper-explode-assignable-expression" "^7.16.7" "@babel/types" "^7.16.7" +"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb" + integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw== + dependencies: + "@babel/helper-explode-assignable-expression" "^7.18.6" + "@babel/types" "^7.18.9" + "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b" @@ -226,6 +396,17 @@ browserslist "^4.17.5" semver "^6.3.0" +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656" + integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg== + dependencies: + "@babel/compat-data" "^7.21.4" + "@babel/helper-validator-option" "^7.21.0" + browserslist "^4.21.3" + lru-cache "^5.1.1" + semver "^6.3.0" + "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6": version "7.17.6" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9" @@ -239,6 +420,20 @@ "@babel/helper-replace-supers" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz#3a017163dc3c2ba7deb9a7950849a9586ea24c18" + integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.21.0" + "@babel/helper-member-expression-to-functions" "^7.21.0" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/helper-replace-supers" "^7.20.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-create-regexp-features-plugin@^7.16.7": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" @@ -247,6 +442,14 @@ "@babel/helper-annotate-as-pure" "^7.16.7" regexpu-core "^5.0.1" +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz#40411a8ab134258ad2cf3a3d987ec6aa0723cee5" + integrity sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + regexpu-core "^5.3.1" + "@babel/helper-define-polyfill-provider@^0.3.1": version "0.3.1" resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665" @@ -261,6 +464,18 @@ resolve "^1.14.2" semver "^6.1.2" +"@babel/helper-define-polyfill-provider@^0.3.3": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a" + integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww== + dependencies: + "@babel/helper-compilation-targets" "^7.17.7" + "@babel/helper-plugin-utils" "^7.16.7" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + semver "^6.1.2" + "@babel/helper-environment-visitor@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" @@ -268,6 +483,11 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-environment-visitor@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== + "@babel/helper-explode-assignable-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" @@ -275,6 +495,13 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-explode-assignable-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" + integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg== + dependencies: + "@babel/types" "^7.18.6" + "@babel/helper-function-name@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" @@ -284,6 +511,14 @@ "@babel/template" "^7.16.7" "@babel/types" "^7.16.7" +"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" + integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== + dependencies: + "@babel/template" "^7.20.7" + "@babel/types" "^7.21.0" + "@babel/helper-get-function-arity@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" @@ -298,6 +533,13 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-hoist-variables@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" + integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== + dependencies: + "@babel/types" "^7.18.6" + "@babel/helper-member-expression-to-functions@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0" @@ -305,6 +547,13 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5" + integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q== + dependencies: + "@babel/types" "^7.21.0" + "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" @@ -312,6 +561,13 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af" + integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg== + dependencies: + "@babel/types" "^7.21.4" + "@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.16.7": version "7.17.6" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz#3c3b03cc6617e33d68ef5a27a67419ac5199ccd0" @@ -326,6 +582,20 @@ "@babel/traverse" "^7.17.3" "@babel/types" "^7.17.0" +"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2": + version "7.21.2" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2" + integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.2" + "@babel/types" "^7.21.2" + "@babel/helper-optimise-call-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" @@ -333,6 +603,13 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-optimise-call-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" + integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA== + dependencies: + "@babel/types" "^7.18.6" + "@babel/helper-plugin-utils@7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" @@ -343,6 +620,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== +"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" + integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== + "@babel/helper-remap-async-to-generator@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" @@ -352,6 +634,16 @@ "@babel/helper-wrap-function" "^7.16.8" "@babel/types" "^7.16.8" +"@babel/helper-remap-async-to-generator@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" + integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-wrap-function" "^7.18.9" + "@babel/types" "^7.18.9" + "@babel/helper-replace-supers@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" @@ -363,6 +655,18 @@ "@babel/traverse" "^7.16.7" "@babel/types" "^7.16.7" +"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" + integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.20.7" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" + "@babel/helper-simple-access@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7" @@ -370,6 +674,13 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-simple-access@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" + integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== + dependencies: + "@babel/types" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" @@ -377,6 +688,13 @@ dependencies: "@babel/types" "^7.16.0" +"@babel/helper-skip-transparent-expression-wrappers@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" + integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== + dependencies: + "@babel/types" "^7.20.0" + "@babel/helper-split-export-declaration@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" @@ -384,16 +702,38 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-split-export-declaration@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" + integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== + "@babel/helper-validator-identifier@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== +"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== + "@babel/helper-validator-option@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== +"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" + integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== + "@babel/helper-wrap-function@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200" @@ -404,6 +744,16 @@ "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" +"@babel/helper-wrap-function@^7.18.9": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3" + integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q== + dependencies: + "@babel/helper-function-name" "^7.19.0" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.20.5" + "@babel/types" "^7.20.5" + "@babel/helpers@^7.12.5", "@babel/helpers@^7.17.2": version "7.17.2" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417" @@ -413,6 +763,15 @@ "@babel/traverse" "^7.17.0" "@babel/types" "^7.17.0" +"@babel/helpers@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e" + integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA== + dependencies: + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.0" + "@babel/types" "^7.21.0" + "@babel/highlight@^7.16.7": version "7.16.10" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" @@ -422,11 +781,25 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== + dependencies: + "@babel/helper-validator-identifier" "^7.18.6" + chalk "^2.0.0" + js-tokens "^4.0.0" + "@babel/parser@^7.12.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0" integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA== +"@babel/parser@^7.18.8", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17" + integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" @@ -434,6 +807,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" + integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" @@ -443,6 +823,15 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-proposal-optional-chaining" "^7.16.7" +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1" + integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/plugin-proposal-optional-chaining" "^7.20.7" + "@babel/plugin-proposal-async-generator-functions@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" @@ -452,6 +841,16 @@ "@babel/helper-remap-async-to-generator" "^7.16.8" "@babel/plugin-syntax-async-generators" "^7.8.4" +"@babel/plugin-proposal-async-generator-functions@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326" + integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-remap-async-to-generator" "^7.18.9" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-proposal-class-properties@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" @@ -460,6 +859,14 @@ "@babel/helper-create-class-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-proposal-class-properties@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" + integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-proposal-class-static-block@^7.16.7": version "7.17.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c" @@ -469,6 +876,15 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" +"@babel/plugin-proposal-class-static-block@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d" + integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.21.0" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-proposal-dynamic-import@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" @@ -477,6 +893,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" +"@babel/plugin-proposal-dynamic-import@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94" + integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-proposal-export-namespace-from@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" @@ -485,6 +909,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" +"@babel/plugin-proposal-export-namespace-from@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203" + integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA== + dependencies: + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-proposal-json-strings@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" @@ -493,6 +925,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-json-strings" "^7.8.3" +"@babel/plugin-proposal-json-strings@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b" + integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-proposal-logical-assignment-operators@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" @@ -501,6 +941,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" +"@babel/plugin-proposal-logical-assignment-operators@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83" + integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" @@ -509,6 +957,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" +"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" + integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-proposal-numeric-separator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" @@ -517,6 +973,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" +"@babel/plugin-proposal-numeric-separator@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75" + integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-proposal-object-rest-spread@7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069" @@ -537,6 +1001,17 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.16.7" +"@babel/plugin-proposal-object-rest-spread@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a" + integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== + dependencies: + "@babel/compat-data" "^7.20.5" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.20.7" + "@babel/plugin-proposal-optional-catch-binding@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" @@ -545,6 +1020,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" +"@babel/plugin-proposal-optional-catch-binding@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb" + integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-proposal-optional-chaining@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" @@ -554,6 +1037,15 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" +"@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea" + integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-proposal-private-methods@^7.16.11": version "7.16.11" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" @@ -562,6 +1054,14 @@ "@babel/helper-create-class-features-plugin" "^7.16.10" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-proposal-private-methods@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea" + integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-proposal-private-property-in-object@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" @@ -572,6 +1072,16 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" +"@babel/plugin-proposal-private-property-in-object@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc" + integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.21.0" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" @@ -580,6 +1090,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-proposal-unicode-property-regex@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e" + integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" @@ -615,6 +1133,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-syntax-import-assertions@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4" + integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ== + dependencies: + "@babel/helper-plugin-utils" "^7.19.0" + "@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" @@ -636,6 +1161,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-syntax-jsx@^7.18.6", "@babel/plugin-syntax-jsx@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2" + integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-logical-assignment-operators@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" @@ -699,6 +1231,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-syntax-typescript@^7.20.0": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz#2751948e9b7c6d771a8efa59340c15d4a2891ff8" + integrity sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-transform-arrow-functions@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" @@ -706,6 +1245,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-arrow-functions@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551" + integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-transform-async-to-generator@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" @@ -715,6 +1261,15 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-remap-async-to-generator" "^7.16.8" +"@babel/plugin-transform-async-to-generator@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354" + integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q== + dependencies: + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-remap-async-to-generator" "^7.18.9" + "@babel/plugin-transform-block-scoped-functions@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" @@ -722,6 +1277,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-block-scoped-functions@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8" + integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-transform-block-scoping@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" @@ -729,6 +1291,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-block-scoping@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02" + integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-transform-classes@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" @@ -743,6 +1312,21 @@ "@babel/helper-split-export-declaration" "^7.16.7" globals "^11.1.0" +"@babel/plugin-transform-classes@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665" + integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.21.0" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-replace-supers" "^7.20.7" + "@babel/helper-split-export-declaration" "^7.18.6" + globals "^11.1.0" + "@babel/plugin-transform-computed-properties@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" @@ -750,6 +1334,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-computed-properties@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa" + integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/template" "^7.20.7" + "@babel/plugin-transform-destructuring@^7.16.7": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz#c445f75819641788a27a0a3a759d9df911df6abc" @@ -757,6 +1349,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-destructuring@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401" + integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" @@ -765,6 +1364,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-dotall-regex@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8" + integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-transform-duplicate-keys@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" @@ -772,6 +1379,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-duplicate-keys@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e" + integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw== + dependencies: + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/plugin-transform-exponentiation-operator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" @@ -780,6 +1394,14 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-exponentiation-operator@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd" + integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw== + dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-transform-for-of@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" @@ -787,6 +1409,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-for-of@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e" + integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-transform-function-name@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" @@ -796,6 +1425,15 @@ "@babel/helper-function-name" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-function-name@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0" + integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ== + dependencies: + "@babel/helper-compilation-targets" "^7.18.9" + "@babel/helper-function-name" "^7.18.9" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/plugin-transform-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" @@ -803,6 +1441,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-literals@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc" + integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg== + dependencies: + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/plugin-transform-member-expression-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" @@ -810,6 +1455,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-member-expression-literals@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e" + integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-transform-modules-amd@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" @@ -819,6 +1471,14 @@ "@babel/helper-plugin-utils" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" +"@babel/plugin-transform-modules-amd@^7.20.11": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a" + integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g== + dependencies: + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-transform-modules-commonjs@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe" @@ -829,6 +1489,15 @@ "@babel/helper-simple-access" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" +"@babel/plugin-transform-modules-commonjs@^7.21.2": + version "7.21.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7" + integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA== + dependencies: + "@babel/helper-module-transforms" "^7.21.2" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-simple-access" "^7.20.2" + "@babel/plugin-transform-modules-systemjs@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" @@ -840,6 +1509,16 @@ "@babel/helper-validator-identifier" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" +"@babel/plugin-transform-modules-systemjs@^7.20.11": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e" + integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw== + dependencies: + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/plugin-transform-modules-umd@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" @@ -848,6 +1527,14 @@ "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-modules-umd@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9" + integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ== + dependencies: + "@babel/helper-module-transforms" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-transform-named-capturing-groups-regex@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252" @@ -855,6 +1542,14 @@ dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" +"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8" + integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.20.5" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-transform-new-target@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" @@ -862,6 +1557,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-new-target@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8" + integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-transform-object-super@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" @@ -870,6 +1572,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-replace-supers" "^7.16.7" +"@babel/plugin-transform-object-super@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c" + integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-replace-supers" "^7.18.6" + "@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f" @@ -877,6 +1587,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db" + integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-transform-property-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" @@ -884,6 +1601,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-property-literals@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3" + integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-transform-react-constant-elements@^7.14.5": version "7.17.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.6.tgz#6cc273c2f612a6a50cb657e63ee1303e5e68d10a" @@ -898,6 +1622,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-react-display-name@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415" + integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-transform-react-jsx-development@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8" @@ -905,6 +1636,13 @@ dependencies: "@babel/plugin-transform-react-jsx" "^7.16.7" +"@babel/plugin-transform-react-jsx-development@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5" + integrity sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA== + dependencies: + "@babel/plugin-transform-react-jsx" "^7.18.6" + "@babel/plugin-transform-react-jsx@^7.16.7": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz#eac1565da176ccb1a715dae0b4609858808008c1" @@ -916,6 +1654,17 @@ "@babel/plugin-syntax-jsx" "^7.16.7" "@babel/types" "^7.17.0" +"@babel/plugin-transform-react-jsx@^7.18.6": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz#656b42c2fdea0a6d8762075d58ef9d4e3c4ab8a2" + integrity sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-jsx" "^7.18.6" + "@babel/types" "^7.21.0" + "@babel/plugin-transform-react-pure-annotations@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67" @@ -924,6 +1673,14 @@ "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-react-pure-annotations@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844" + integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-transform-regenerator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" @@ -931,6 +1688,14 @@ dependencies: regenerator-transform "^0.14.2" +"@babel/plugin-transform-regenerator@^7.20.5": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d" + integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + regenerator-transform "^0.15.1" + "@babel/plugin-transform-reserved-words@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" @@ -938,16 +1703,23 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-runtime@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz#0a2e08b5e2b2d95c4b1d3b3371a2180617455b70" - integrity sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A== +"@babel/plugin-transform-reserved-words@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a" + integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA== dependencies: - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.5.0" - babel-plugin-polyfill-regenerator "^0.3.0" + "@babel/helper-plugin-utils" "^7.18.6" + +"@babel/plugin-transform-runtime@^7.18.6": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.4.tgz#2e1da21ca597a7d01fc96b699b21d8d2023191aa" + integrity sha512-1J4dhrw1h1PqnNNpzwxQ2UBymJUF8KuPjAAnlLwZcGhHAIqUigFW7cdK6GHoB64ubY4qXQNYknoUeks4Wz7CUA== + dependencies: + "@babel/helper-module-imports" "^7.21.4" + "@babel/helper-plugin-utils" "^7.20.2" + babel-plugin-polyfill-corejs2 "^0.3.3" + babel-plugin-polyfill-corejs3 "^0.6.0" + babel-plugin-polyfill-regenerator "^0.4.1" semver "^6.3.0" "@babel/plugin-transform-shorthand-properties@^7.16.7": @@ -957,6 +1729,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-shorthand-properties@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9" + integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-transform-spread@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" @@ -965,6 +1744,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" +"@babel/plugin-transform-spread@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e" + integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/plugin-transform-sticky-regex@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" @@ -972,6 +1759,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-sticky-regex@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc" + integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-transform-template-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" @@ -979,6 +1773,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-template-literals@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e" + integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA== + dependencies: + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/plugin-transform-typeof-symbol@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" @@ -986,6 +1787,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-typeof-symbol@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0" + integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw== + dependencies: + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/plugin-transform-typescript@^7.16.7": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0" @@ -995,6 +1803,16 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-typescript" "^7.16.7" +"@babel/plugin-transform-typescript@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz#316c5be579856ea890a57ebc5116c5d064658f2b" + integrity sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.21.0" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-typescript" "^7.20.0" + "@babel/plugin-transform-unicode-escapes@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" @@ -1002,6 +1820,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-unicode-escapes@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246" + integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ== + dependencies: + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/plugin-transform-unicode-regex@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" @@ -1010,7 +1835,15 @@ "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/preset-env@^7.15.6", "@babel/preset-env@^7.16.11": +"@babel/plugin-transform-unicode-regex@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca" + integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + +"@babel/preset-env@^7.15.6": version "7.16.11" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982" integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g== @@ -1090,6 +1923,87 @@ core-js-compat "^3.20.2" semver "^6.3.0" +"@babel/preset-env@^7.18.6": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.4.tgz#a952482e634a8dd8271a3fe5459a16eb10739c58" + integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw== + dependencies: + "@babel/compat-data" "^7.21.4" + "@babel/helper-compilation-targets" "^7.21.4" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-validator-option" "^7.21.0" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7" + "@babel/plugin-proposal-async-generator-functions" "^7.20.7" + "@babel/plugin-proposal-class-properties" "^7.18.6" + "@babel/plugin-proposal-class-static-block" "^7.21.0" + "@babel/plugin-proposal-dynamic-import" "^7.18.6" + "@babel/plugin-proposal-export-namespace-from" "^7.18.9" + "@babel/plugin-proposal-json-strings" "^7.18.6" + "@babel/plugin-proposal-logical-assignment-operators" "^7.20.7" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" + "@babel/plugin-proposal-numeric-separator" "^7.18.6" + "@babel/plugin-proposal-object-rest-spread" "^7.20.7" + "@babel/plugin-proposal-optional-catch-binding" "^7.18.6" + "@babel/plugin-proposal-optional-chaining" "^7.21.0" + "@babel/plugin-proposal-private-methods" "^7.18.6" + "@babel/plugin-proposal-private-property-in-object" "^7.21.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.18.6" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-syntax-import-assertions" "^7.20.0" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-syntax-top-level-await" "^7.14.5" + "@babel/plugin-transform-arrow-functions" "^7.20.7" + "@babel/plugin-transform-async-to-generator" "^7.20.7" + "@babel/plugin-transform-block-scoped-functions" "^7.18.6" + "@babel/plugin-transform-block-scoping" "^7.21.0" + "@babel/plugin-transform-classes" "^7.21.0" + "@babel/plugin-transform-computed-properties" "^7.20.7" + "@babel/plugin-transform-destructuring" "^7.21.3" + "@babel/plugin-transform-dotall-regex" "^7.18.6" + "@babel/plugin-transform-duplicate-keys" "^7.18.9" + "@babel/plugin-transform-exponentiation-operator" "^7.18.6" + "@babel/plugin-transform-for-of" "^7.21.0" + "@babel/plugin-transform-function-name" "^7.18.9" + "@babel/plugin-transform-literals" "^7.18.9" + "@babel/plugin-transform-member-expression-literals" "^7.18.6" + "@babel/plugin-transform-modules-amd" "^7.20.11" + "@babel/plugin-transform-modules-commonjs" "^7.21.2" + "@babel/plugin-transform-modules-systemjs" "^7.20.11" + "@babel/plugin-transform-modules-umd" "^7.18.6" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5" + "@babel/plugin-transform-new-target" "^7.18.6" + "@babel/plugin-transform-object-super" "^7.18.6" + "@babel/plugin-transform-parameters" "^7.21.3" + "@babel/plugin-transform-property-literals" "^7.18.6" + "@babel/plugin-transform-regenerator" "^7.20.5" + "@babel/plugin-transform-reserved-words" "^7.18.6" + "@babel/plugin-transform-shorthand-properties" "^7.18.6" + "@babel/plugin-transform-spread" "^7.20.7" + "@babel/plugin-transform-sticky-regex" "^7.18.6" + "@babel/plugin-transform-template-literals" "^7.18.9" + "@babel/plugin-transform-typeof-symbol" "^7.18.9" + "@babel/plugin-transform-unicode-escapes" "^7.18.10" + "@babel/plugin-transform-unicode-regex" "^7.18.6" + "@babel/preset-modules" "^0.1.5" + "@babel/types" "^7.21.4" + babel-plugin-polyfill-corejs2 "^0.3.3" + babel-plugin-polyfill-corejs3 "^0.6.0" + babel-plugin-polyfill-regenerator "^0.4.1" + core-js-compat "^3.25.1" + semver "^6.3.0" + "@babel/preset-modules@^0.1.5": version "0.1.5" resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" @@ -1101,7 +2015,7 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/preset-react@^7.14.5", "@babel/preset-react@^7.16.7": +"@babel/preset-react@^7.14.5": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852" integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA== @@ -1113,7 +2027,19 @@ "@babel/plugin-transform-react-jsx-development" "^7.16.7" "@babel/plugin-transform-react-pure-annotations" "^7.16.7" -"@babel/preset-typescript@^7.15.0", "@babel/preset-typescript@^7.16.7": +"@babel/preset-react@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.18.6.tgz#979f76d6277048dc19094c217b507f3ad517dd2d" + integrity sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-validator-option" "^7.18.6" + "@babel/plugin-transform-react-display-name" "^7.18.6" + "@babel/plugin-transform-react-jsx" "^7.18.6" + "@babel/plugin-transform-react-jsx-development" "^7.18.6" + "@babel/plugin-transform-react-pure-annotations" "^7.18.6" + +"@babel/preset-typescript@^7.15.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9" integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ== @@ -1122,21 +2048,44 @@ "@babel/helper-validator-option" "^7.16.7" "@babel/plugin-transform-typescript" "^7.16.7" -"@babel/runtime-corejs3@^7.17.2": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.2.tgz#fdca2cd05fba63388babe85d349b6801b008fd13" - integrity sha512-NcKtr2epxfIrNM4VOmPKO46TvDMCBhgi2CrSHaEarrz+Plk2K5r9QemmOFTGpZaoKnWoGH5MO+CzeRsih/Fcgg== +"@babel/preset-typescript@^7.18.6": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz#b913ac8e6aa8932e47c21b01b4368d8aa239a529" + integrity sha512-sMLNWY37TCdRH/bJ6ZeeOH1nPuanED7Ai9Y/vH31IPqalioJ6ZNFUWONsakhv4r4n+I6gm5lmoE0olkgib/j/A== dependencies: - core-js-pure "^3.20.2" - regenerator-runtime "^0.13.4" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-validator-option" "^7.21.0" + "@babel/plugin-syntax-jsx" "^7.21.4" + "@babel/plugin-transform-modules-commonjs" "^7.21.2" + "@babel/plugin-transform-typescript" "^7.21.3" + +"@babel/regjsgen@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" + integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.17.2", "@babel/runtime@^7.8.4": +"@babel/runtime-corejs3@^7.18.6": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.21.0.tgz#6e4939d9d9789ff63e2dc58e88f13a3913a24eba" + integrity sha512-TDD4UJzos3JJtM+tHX+w2Uc+KWj7GV+VKKFdMVd2Rx8sdA19hcc3P3AHFYd5LVOw+pYuSd5lICC3gm52B6Rwxw== + dependencies: + core-js-pure "^3.25.1" + regenerator-runtime "^0.13.11" + +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.8.4": version "7.17.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941" integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw== dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.18.6": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" + integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== + dependencies: + regenerator-runtime "^0.13.11" + "@babel/template@^7.12.7", "@babel/template@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" @@ -1146,6 +2095,15 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" +"@babel/template@^7.18.10", "@babel/template@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" + "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" @@ -1162,6 +2120,22 @@ debug "^4.1.0" globals "^11.1.0" +"@babel/traverse@^7.18.8", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36" + integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q== + dependencies: + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.21.4" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.21.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.21.4" + "@babel/types" "^7.21.4" + debug "^4.1.0" + globals "^11.1.0" + "@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" @@ -1170,263 +2144,300 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" -"@docsearch/css@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.0.0.tgz#fe57b474802ffd706d3246eab25d52fac8aa3698" - integrity sha512-1kkV7tkAsiuEd0shunYRByKJe3xQDG2q7wYg24SOw1nV9/2lwEd4WrUYRJC/ukGTl2/kHeFxsaUvtiOy0y6fFA== - -"@docsearch/react@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.0.0.tgz#d02ebdc67573412185a6a4df13bc254c7c0da491" - integrity sha512-yhMacqS6TVQYoBh/o603zszIb5Bl8MIXuOc6Vy617I74pirisDzzcNh0NEaYQt50fVVR3khUbeEhUEWEWipESg== +"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4" + integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA== dependencies: - "@algolia/autocomplete-core" "1.5.2" - "@algolia/autocomplete-preset-algolia" "1.5.2" - "@docsearch/css" "3.0.0" + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" + to-fast-properties "^2.0.0" + +"@colors/colors@1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" + integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== + +"@docsearch/css@3.3.3": + version "3.3.3" + resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.3.3.tgz#f9346c9e24602218341f51b8ba91eb9109add434" + integrity sha512-6SCwI7P8ao+se1TUsdZ7B4XzL+gqeQZnBc+2EONZlcVa0dVrk0NjETxozFKgMv0eEGH8QzP1fkN+A1rH61l4eg== + +"@docsearch/react@^3.1.1": + version "3.3.3" + resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.3.3.tgz#907b6936a565f880b4c0892624b4f7a9f132d298" + integrity sha512-pLa0cxnl+G0FuIDuYlW+EBK6Rw2jwLw9B1RHIeS4N4s2VhsfJ/wzeCi3CWcs5yVfxLd5ZK50t//TMA5e79YT7Q== + dependencies: + "@algolia/autocomplete-core" "1.7.4" + "@algolia/autocomplete-preset-algolia" "1.7.4" + "@docsearch/css" "3.3.3" algoliasearch "^4.0.0" -"@docusaurus/core@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.17.tgz#f631aae04405de42a428a31928998242cd1d7b77" - integrity sha512-iNdW7CsmHNOgc4PxD9BFxa+MD8+i7ln7erOBkF3FSMMPnsKUeVqsR3rr31aLmLZRlTXMITSPLxlXwtBZa3KPCw== +"@docusaurus/core@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.4.0.tgz#a12c175cb2e5a7e4582e65876a50813f6168913d" + integrity sha512-J55/WEoIpRcLf3afO5POHPguVZosKmJEQWKBL+K7TAnfuE7i+Y0NPLlkKtnWCehagGsgTqClfQEexH/UT4kELA== dependencies: - "@babel/core" "^7.17.5" - "@babel/generator" "^7.17.3" + "@babel/core" "^7.18.6" + "@babel/generator" "^7.18.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-transform-runtime" "^7.17.0" - "@babel/preset-env" "^7.16.11" - "@babel/preset-react" "^7.16.7" - "@babel/preset-typescript" "^7.16.7" - "@babel/runtime" "^7.17.2" - "@babel/runtime-corejs3" "^7.17.2" - "@babel/traverse" "^7.17.3" - "@docusaurus/cssnano-preset" "2.0.0-beta.17" - "@docusaurus/logger" "2.0.0-beta.17" - "@docusaurus/mdx-loader" "2.0.0-beta.17" + "@babel/plugin-transform-runtime" "^7.18.6" + "@babel/preset-env" "^7.18.6" + "@babel/preset-react" "^7.18.6" + "@babel/preset-typescript" "^7.18.6" + "@babel/runtime" "^7.18.6" + "@babel/runtime-corejs3" "^7.18.6" + "@babel/traverse" "^7.18.8" + "@docusaurus/cssnano-preset" "2.4.0" + "@docusaurus/logger" "2.4.0" + "@docusaurus/mdx-loader" "2.4.0" "@docusaurus/react-loadable" "5.5.2" - "@docusaurus/utils" "2.0.0-beta.17" - "@docusaurus/utils-common" "2.0.0-beta.17" - "@docusaurus/utils-validation" "2.0.0-beta.17" - "@slorber/static-site-generator-webpack-plugin" "^4.0.1" + "@docusaurus/utils" "2.4.0" + "@docusaurus/utils-common" "2.4.0" + "@docusaurus/utils-validation" "2.4.0" + "@slorber/static-site-generator-webpack-plugin" "^4.0.7" "@svgr/webpack" "^6.2.1" - autoprefixer "^10.4.2" - babel-loader "^8.2.3" - babel-plugin-dynamic-import-node "2.3.0" + autoprefixer "^10.4.7" + babel-loader "^8.2.5" + babel-plugin-dynamic-import-node "^2.3.3" boxen "^6.2.1" + chalk "^4.1.2" chokidar "^3.5.3" - clean-css "^5.2.4" - cli-table3 "^0.6.1" + clean-css "^5.3.0" + cli-table3 "^0.6.2" combine-promises "^1.1.0" commander "^5.1.0" - copy-webpack-plugin "^10.2.4" - core-js "^3.21.1" - css-loader "^6.6.0" - css-minimizer-webpack-plugin "^3.4.1" - cssnano "^5.0.17" - del "^6.0.0" + copy-webpack-plugin "^11.0.0" + core-js "^3.23.3" + css-loader "^6.7.1" + css-minimizer-webpack-plugin "^4.0.0" + cssnano "^5.1.12" + del "^6.1.1" detect-port "^1.3.0" escape-html "^1.0.3" - eta "^1.12.3" + eta "^2.0.0" file-loader "^6.2.0" - fs-extra "^10.0.1" + fs-extra "^10.1.0" html-minifier-terser "^6.1.0" - html-tags "^3.1.0" + html-tags "^3.2.0" html-webpack-plugin "^5.5.0" import-fresh "^3.3.0" - is-root "^2.1.0" leven "^3.1.0" lodash "^4.17.21" - mini-css-extract-plugin "^2.5.3" - nprogress "^0.2.0" - postcss "^8.4.7" - postcss-loader "^6.2.1" + mini-css-extract-plugin "^2.6.1" + postcss "^8.4.14" + postcss-loader "^7.0.0" prompts "^2.4.2" - react-dev-utils "^12.0.0" - react-helmet-async "^1.2.3" + react-dev-utils "^12.0.1" + react-helmet-async "^1.3.0" react-loadable "npm:@docusaurus/react-loadable@5.5.2" react-loadable-ssr-addon-v5-slorber "^1.0.1" - react-router "^5.2.0" + react-router "^5.3.3" react-router-config "^5.1.1" - react-router-dom "^5.2.0" - remark-admonitions "^1.2.1" + react-router-dom "^5.3.3" rtl-detect "^1.0.4" - semver "^7.3.4" + semver "^7.3.7" serve-handler "^6.1.3" shelljs "^0.8.5" - terser-webpack-plugin "^5.3.1" - tslib "^2.3.1" + terser-webpack-plugin "^5.3.3" + tslib "^2.4.0" update-notifier "^5.1.0" url-loader "^4.1.1" wait-on "^6.0.1" - webpack "^5.69.1" + webpack "^5.73.0" webpack-bundle-analyzer "^4.5.0" - webpack-dev-server "^4.7.4" + webpack-dev-server "^4.9.3" webpack-merge "^5.8.0" webpackbar "^5.0.2" -"@docusaurus/cssnano-preset@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.17.tgz#f687bc6e5c8cb2139a7830dec757cfcb92dbb681" - integrity sha512-DoBwtLjJ9IY9/lNMHIEdo90L4NDayvU28nLgtjR2Sc6aBIMEB/3a5Ndjehnp+jZAkwcDdNASA86EkZVUyz1O1A== +"@docusaurus/cssnano-preset@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.4.0.tgz#9213586358e0cce517f614af041eb7d184f8add6" + integrity sha512-RmdiA3IpsLgZGXRzqnmTbGv43W4OD44PCo+6Q/aYjEM2V57vKCVqNzuafE94jv0z/PjHoXUrjr69SaRymBKYYw== dependencies: - cssnano-preset-advanced "^5.1.12" - postcss "^8.4.7" + cssnano-preset-advanced "^5.3.8" + postcss "^8.4.14" postcss-sort-media-queries "^4.2.1" + tslib "^2.4.0" -"@docusaurus/logger@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.17.tgz#89c5ace3b4efd5274adb0d8919328892c4466d02" - integrity sha512-F9JDl06/VLg+ylsvnq9NpILSUeWtl0j4H2LtlLzX5gufEL4dGiCMlnUzYdHl7FSHSzYJ0A/R7vu0SYofsexC4w== +"@docusaurus/logger@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.4.0.tgz#393d91ad9ecdb9a8f80167dd6a34d4b45219b835" + integrity sha512-T8+qR4APN+MjcC9yL2Es+xPJ2923S9hpzDmMtdsOcUGLqpCGBbU1vp3AAqDwXtVgFkq+NsEk7sHdVsfLWR/AXw== dependencies: chalk "^4.1.2" - tslib "^2.3.1" + tslib "^2.4.0" -"@docusaurus/mdx-loader@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.17.tgz#838f87f4cbf12701c4d8eb11e4f9698fb7155bf8" - integrity sha512-AhJ3GWRmjQYCyINHE595pff5tn3Rt83oGpdev5UT9uvG9lPYPC8nEmh1LI6c0ogfw7YkNznzxWSW4hyyVbYQ3A== +"@docusaurus/mdx-loader@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.4.0.tgz#c6310342904af2f203e7df86a9df623f86840f2d" + integrity sha512-GWoH4izZKOmFoC+gbI2/y8deH/xKLvzz/T5BsEexBye8EHQlwsA7FMrVa48N063bJBH4FUOiRRXxk5rq9cC36g== dependencies: - "@babel/parser" "^7.17.3" - "@babel/traverse" "^7.17.3" - "@docusaurus/logger" "2.0.0-beta.17" - "@docusaurus/utils" "2.0.0-beta.17" + "@babel/parser" "^7.18.8" + "@babel/traverse" "^7.18.8" + "@docusaurus/logger" "2.4.0" + "@docusaurus/utils" "2.4.0" "@mdx-js/mdx" "^1.6.22" escape-html "^1.0.3" file-loader "^6.2.0" - fs-extra "^10.0.1" + fs-extra "^10.1.0" image-size "^1.0.1" mdast-util-to-string "^2.0.0" - remark-emoji "^2.1.0" + remark-emoji "^2.2.0" stringify-object "^3.3.0" - tslib "^2.3.1" - unist-util-visit "^2.0.2" + tslib "^2.4.0" + unified "^9.2.2" + unist-util-visit "^2.0.3" url-loader "^4.1.1" - webpack "^5.69.1" + webpack "^5.73.0" -"@docusaurus/module-type-aliases@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.0.0-beta.17.tgz#73f6d34be202ac093e78769ff72613d353087cd7" - integrity sha512-Tu+8geC/wyygBudbSwvWIHEvt5RwyA7dEoE1JmPbgQtmqUxOZ9bgnfemwXpJW5mKuDiJASbN4of1DhbLqf4sPg== +"@docusaurus/module-type-aliases@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.4.0.tgz#6961605d20cd46f86163ed8c2d83d438b02b4028" + integrity sha512-YEQO2D3UXs72qCn8Cr+RlycSQXVGN9iEUyuHwTuK4/uL/HFomB2FHSU0vSDM23oLd+X/KibQ3Ez6nGjQLqXcHg== dependencies: - "@docusaurus/types" "2.0.0-beta.17" + "@docusaurus/react-loadable" "5.5.2" + "@docusaurus/types" "2.4.0" + "@types/history" "^4.7.11" "@types/react" "*" "@types/react-router-config" "*" "@types/react-router-dom" "*" react-helmet-async "*" + react-loadable "npm:@docusaurus/react-loadable@5.5.2" -"@docusaurus/plugin-content-blog@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.17.tgz#1d1063bfda78a80d517694567b965d5c3a70479f" - integrity sha512-gcX4UR+WKT4bhF8FICBQHy+ESS9iRMeaglSboTZbA/YHGax/3EuZtcPU3dU4E/HFJeZ866wgUdbLKpIpsZOidg== - dependencies: - "@docusaurus/core" "2.0.0-beta.17" - "@docusaurus/logger" "2.0.0-beta.17" - "@docusaurus/mdx-loader" "2.0.0-beta.17" - "@docusaurus/utils" "2.0.0-beta.17" - "@docusaurus/utils-common" "2.0.0-beta.17" - "@docusaurus/utils-validation" "2.0.0-beta.17" - cheerio "^1.0.0-rc.10" +"@docusaurus/plugin-content-blog@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.4.0.tgz#50dbfbc7b51f152ae660385fd8b34076713374c3" + integrity sha512-YwkAkVUxtxoBAIj/MCb4ohN0SCtHBs4AS75jMhPpf67qf3j+U/4n33cELq7567hwyZ6fMz2GPJcVmctzlGGThQ== + dependencies: + "@docusaurus/core" "2.4.0" + "@docusaurus/logger" "2.4.0" + "@docusaurus/mdx-loader" "2.4.0" + "@docusaurus/types" "2.4.0" + "@docusaurus/utils" "2.4.0" + "@docusaurus/utils-common" "2.4.0" + "@docusaurus/utils-validation" "2.4.0" + cheerio "^1.0.0-rc.12" feed "^4.2.2" - fs-extra "^10.0.1" + fs-extra "^10.1.0" lodash "^4.17.21" reading-time "^1.5.0" - remark-admonitions "^1.2.1" - tslib "^2.3.1" + tslib "^2.4.0" + unist-util-visit "^2.0.3" utility-types "^3.10.0" - webpack "^5.69.1" - -"@docusaurus/plugin-content-docs@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.17.tgz#97f13bb458e165224db6867836e8e9637ea15921" - integrity sha512-YYrBpuRfTfE6NtENrpSHTJ7K7PZifn6j6hcuvdC0QKE+WD8pS+O2/Ws30yoyvHwLnAnfhvaderh1v9Kaa0/ANg== - dependencies: - "@docusaurus/core" "2.0.0-beta.17" - "@docusaurus/logger" "2.0.0-beta.17" - "@docusaurus/mdx-loader" "2.0.0-beta.17" - "@docusaurus/utils" "2.0.0-beta.17" - "@docusaurus/utils-validation" "2.0.0-beta.17" + webpack "^5.73.0" + +"@docusaurus/plugin-content-docs@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.4.0.tgz#36e235adf902325735b873b4f535205884363728" + integrity sha512-ic/Z/ZN5Rk/RQo+Io6rUGpToOtNbtPloMR2JcGwC1xT2riMu6zzfSwmBi9tHJgdXH6CB5jG+0dOZZO8QS5tmDg== + dependencies: + "@docusaurus/core" "2.4.0" + "@docusaurus/logger" "2.4.0" + "@docusaurus/mdx-loader" "2.4.0" + "@docusaurus/module-type-aliases" "2.4.0" + "@docusaurus/types" "2.4.0" + "@docusaurus/utils" "2.4.0" + "@docusaurus/utils-validation" "2.4.0" + "@types/react-router-config" "^5.0.6" combine-promises "^1.1.0" - fs-extra "^10.0.1" + fs-extra "^10.1.0" import-fresh "^3.3.0" js-yaml "^4.1.0" lodash "^4.17.21" - remark-admonitions "^1.2.1" - tslib "^2.3.1" + tslib "^2.4.0" utility-types "^3.10.0" - webpack "^5.69.1" - -"@docusaurus/plugin-content-pages@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.17.tgz#d5955d3cc23722518a6032f830cf8c7b7aeb3d5a" - integrity sha512-d5x0mXTMJ44ojRQccmLyshYoamFOep2AnBe69osCDnwWMbD3Or3pnc2KMK9N7mVpQFnNFKbHNCLrX3Rv0uwEHA== - dependencies: - "@docusaurus/core" "2.0.0-beta.17" - "@docusaurus/mdx-loader" "2.0.0-beta.17" - "@docusaurus/utils" "2.0.0-beta.17" - "@docusaurus/utils-validation" "2.0.0-beta.17" - fs-extra "^10.0.1" - remark-admonitions "^1.2.1" - tslib "^2.3.1" - webpack "^5.69.1" - -"@docusaurus/plugin-debug@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.17.tgz#0185dfd5575aa940443d2cb9fab4bed3308ed3a1" - integrity sha512-p26fjYFRSC0esEmKo/kRrLVwXoFnzPCFDumwrImhPyqfVxbj+IKFaiXkayb2qHnyEGE/1KSDIgRF4CHt/pyhiw== - dependencies: - "@docusaurus/core" "2.0.0-beta.17" - "@docusaurus/utils" "2.0.0-beta.17" - fs-extra "^10.0.1" + webpack "^5.73.0" + +"@docusaurus/plugin-content-pages@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.4.0.tgz#6169909a486e1eae0ddffff0b1717ce4332db4d4" + integrity sha512-Pk2pOeOxk8MeU3mrTU0XLIgP9NZixbdcJmJ7RUFrZp1Aj42nd0RhIT14BGvXXyqb8yTQlk4DmYGAzqOfBsFyGw== + dependencies: + "@docusaurus/core" "2.4.0" + "@docusaurus/mdx-loader" "2.4.0" + "@docusaurus/types" "2.4.0" + "@docusaurus/utils" "2.4.0" + "@docusaurus/utils-validation" "2.4.0" + fs-extra "^10.1.0" + tslib "^2.4.0" + webpack "^5.73.0" + +"@docusaurus/plugin-debug@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.4.0.tgz#1ad513fe9bcaf017deccf62df8b8843faeeb7d37" + integrity sha512-KC56DdYjYT7Txyux71vXHXGYZuP6yYtqwClvYpjKreWIHWus5Zt6VNi23rMZv3/QKhOCrN64zplUbdfQMvddBQ== + dependencies: + "@docusaurus/core" "2.4.0" + "@docusaurus/types" "2.4.0" + "@docusaurus/utils" "2.4.0" + fs-extra "^10.1.0" react-json-view "^1.21.3" - tslib "^2.3.1" - -"@docusaurus/plugin-google-analytics@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.17.tgz#31ca1ef88f0f7874c6e12c642d64abe694494720" - integrity sha512-jvgYIhggYD1W2jymqQVAAyjPJUV1xMCn70bAzaCMxriureMWzhQ/kQMVQpop0ijTMvifOxaV9yTcL1VRXev++A== - dependencies: - "@docusaurus/core" "2.0.0-beta.17" - "@docusaurus/utils-validation" "2.0.0-beta.17" - tslib "^2.3.1" - -"@docusaurus/plugin-google-gtag@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.17.tgz#e6baf8f03cea756ed2259a5356fa689388bc303d" - integrity sha512-1pnWHtIk1Jfeqwvr8PlcPE5SODWT1gW4TI+ptmJbJ296FjjyvL/pG0AcGEJmYLY/OQc3oz0VQ0W2ognw9jmFIw== - dependencies: - "@docusaurus/core" "2.0.0-beta.17" - "@docusaurus/utils-validation" "2.0.0-beta.17" - tslib "^2.3.1" - -"@docusaurus/plugin-sitemap@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.17.tgz#e1aa67ff09d9145e8e5522c4541bbcdd6365560c" - integrity sha512-19/PaGCsap6cjUPZPGs87yV9e1hAIyd0CTSeVV6Caega8nmOKk20FTrQGFJjZPeX8jvD9QIXcdg6BJnPxcKkaQ== - dependencies: - "@docusaurus/core" "2.0.0-beta.17" - "@docusaurus/utils" "2.0.0-beta.17" - "@docusaurus/utils-common" "2.0.0-beta.17" - "@docusaurus/utils-validation" "2.0.0-beta.17" - fs-extra "^10.0.1" + tslib "^2.4.0" + +"@docusaurus/plugin-google-analytics@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.4.0.tgz#8062d7a09d366329dfd3ce4e8a619da8624b6cc3" + integrity sha512-uGUzX67DOAIglygdNrmMOvEp8qG03X20jMWadeqVQktS6nADvozpSLGx4J0xbkblhJkUzN21WiilsP9iVP+zkw== + dependencies: + "@docusaurus/core" "2.4.0" + "@docusaurus/types" "2.4.0" + "@docusaurus/utils-validation" "2.4.0" + tslib "^2.4.0" + +"@docusaurus/plugin-google-gtag@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.4.0.tgz#a8efda476f971410dfb3aab1cfe1f0f7d269adc5" + integrity sha512-adj/70DANaQs2+TF/nRdMezDXFAV/O/pjAbUgmKBlyOTq5qoMe0Tk4muvQIwWUmiUQxFJe+sKlZGM771ownyOg== + dependencies: + "@docusaurus/core" "2.4.0" + "@docusaurus/types" "2.4.0" + "@docusaurus/utils-validation" "2.4.0" + tslib "^2.4.0" + +"@docusaurus/plugin-google-tag-manager@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-2.4.0.tgz#9a94324ac496835fc34e233cc60441df4e04dfdd" + integrity sha512-E66uGcYs4l7yitmp/8kMEVQftFPwV9iC62ORh47Veqzs6ExwnhzBkJmwDnwIysHBF1vlxnzET0Fl2LfL5fRR3A== + dependencies: + "@docusaurus/core" "2.4.0" + "@docusaurus/types" "2.4.0" + "@docusaurus/utils-validation" "2.4.0" + tslib "^2.4.0" + +"@docusaurus/plugin-sitemap@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.4.0.tgz#ba0eb43565039fe011bdd874b5c5d7252b19d709" + integrity sha512-pZxh+ygfnI657sN8a/FkYVIAmVv0CGk71QMKqJBOfMmDHNN1FeDeFkBjWP49ejBqpqAhjufkv5UWq3UOu2soCw== + dependencies: + "@docusaurus/core" "2.4.0" + "@docusaurus/logger" "2.4.0" + "@docusaurus/types" "2.4.0" + "@docusaurus/utils" "2.4.0" + "@docusaurus/utils-common" "2.4.0" + "@docusaurus/utils-validation" "2.4.0" + fs-extra "^10.1.0" sitemap "^7.1.1" - tslib "^2.3.1" - -"@docusaurus/preset-classic@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.17.tgz#a8fc3447aa6fe0e5f259d894cc8dd64c049c7605" - integrity sha512-7YUxPEgM09aZWr25/hpDEp1gPl+1KsCPV1ZTRW43sbQ9TinPm+9AKR3rHVDa8ea8MdiS7BpqCVyK+H/eiyQrUw== - dependencies: - "@docusaurus/core" "2.0.0-beta.17" - "@docusaurus/plugin-content-blog" "2.0.0-beta.17" - "@docusaurus/plugin-content-docs" "2.0.0-beta.17" - "@docusaurus/plugin-content-pages" "2.0.0-beta.17" - "@docusaurus/plugin-debug" "2.0.0-beta.17" - "@docusaurus/plugin-google-analytics" "2.0.0-beta.17" - "@docusaurus/plugin-google-gtag" "2.0.0-beta.17" - "@docusaurus/plugin-sitemap" "2.0.0-beta.17" - "@docusaurus/theme-classic" "2.0.0-beta.17" - "@docusaurus/theme-common" "2.0.0-beta.17" - "@docusaurus/theme-search-algolia" "2.0.0-beta.17" + tslib "^2.4.0" + +"@docusaurus/preset-classic@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.4.0.tgz#92fdcfab35d8d0ffb8c38bcbf439e4e1cb0566a3" + integrity sha512-/5z5o/9bc6+P5ool2y01PbJhoGddEGsC0ej1MF6mCoazk8A+kW4feoUd68l7Bnv01rCnG3xy7kHUQP97Y0grUA== + dependencies: + "@docusaurus/core" "2.4.0" + "@docusaurus/plugin-content-blog" "2.4.0" + "@docusaurus/plugin-content-docs" "2.4.0" + "@docusaurus/plugin-content-pages" "2.4.0" + "@docusaurus/plugin-debug" "2.4.0" + "@docusaurus/plugin-google-analytics" "2.4.0" + "@docusaurus/plugin-google-gtag" "2.4.0" + "@docusaurus/plugin-google-tag-manager" "2.4.0" + "@docusaurus/plugin-sitemap" "2.4.0" + "@docusaurus/theme-classic" "2.4.0" + "@docusaurus/theme-common" "2.4.0" + "@docusaurus/theme-search-algolia" "2.4.0" + "@docusaurus/types" "2.4.0" "@docusaurus/react-loadable@5.5.2", "react-loadable@npm:@docusaurus/react-loadable@5.5.2": version "5.5.2" @@ -1436,124 +2447,142 @@ "@types/react" "*" prop-types "^15.6.2" -"@docusaurus/theme-classic@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.17.tgz#1f7a1dd714993819f266ce422d06dd4533d4ab3a" - integrity sha512-xfZ9kpgqo0lP9YO4rJj79wtiQJXU6ARo5wYy10IIwiWN+lg00scJHhkmNV431b05xIUjUr0cKeH9nqZmEsQRKg== - dependencies: - "@docusaurus/core" "2.0.0-beta.17" - "@docusaurus/plugin-content-blog" "2.0.0-beta.17" - "@docusaurus/plugin-content-docs" "2.0.0-beta.17" - "@docusaurus/plugin-content-pages" "2.0.0-beta.17" - "@docusaurus/theme-common" "2.0.0-beta.17" - "@docusaurus/theme-translations" "2.0.0-beta.17" - "@docusaurus/utils" "2.0.0-beta.17" - "@docusaurus/utils-common" "2.0.0-beta.17" - "@docusaurus/utils-validation" "2.0.0-beta.17" +"@docusaurus/theme-classic@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.4.0.tgz#a5404967b00adec3472efca4c3b3f6a5e2021c78" + integrity sha512-GMDX5WU6Z0OC65eQFgl3iNNEbI9IMJz9f6KnOyuMxNUR6q0qVLsKCNopFUDfFNJ55UU50o7P7o21yVhkwpfJ9w== + dependencies: + "@docusaurus/core" "2.4.0" + "@docusaurus/mdx-loader" "2.4.0" + "@docusaurus/module-type-aliases" "2.4.0" + "@docusaurus/plugin-content-blog" "2.4.0" + "@docusaurus/plugin-content-docs" "2.4.0" + "@docusaurus/plugin-content-pages" "2.4.0" + "@docusaurus/theme-common" "2.4.0" + "@docusaurus/theme-translations" "2.4.0" + "@docusaurus/types" "2.4.0" + "@docusaurus/utils" "2.4.0" + "@docusaurus/utils-common" "2.4.0" + "@docusaurus/utils-validation" "2.4.0" "@mdx-js/react" "^1.6.22" - clsx "^1.1.1" + clsx "^1.2.1" copy-text-to-clipboard "^3.0.1" - infima "0.2.0-alpha.37" + infima "0.2.0-alpha.43" lodash "^4.17.21" - postcss "^8.4.7" - prism-react-renderer "^1.2.1" - prismjs "^1.27.0" - react-router-dom "^5.2.0" - rtlcss "^3.3.0" - -"@docusaurus/theme-common@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.0.0-beta.17.tgz#3b71bb8b0973a0cee969a1bb76794c81d597f290" - integrity sha512-LJBDhx+Qexn1JHBqZbE4k+7lBaV1LgpE33enXf43ShB7ebhC91d5HLHhBwgt0pih4+elZU4rG+BG/roAmsNM0g== - dependencies: - "@docusaurus/module-type-aliases" "2.0.0-beta.17" - "@docusaurus/plugin-content-blog" "2.0.0-beta.17" - "@docusaurus/plugin-content-docs" "2.0.0-beta.17" - "@docusaurus/plugin-content-pages" "2.0.0-beta.17" - clsx "^1.1.1" + nprogress "^0.2.0" + postcss "^8.4.14" + prism-react-renderer "^1.3.5" + prismjs "^1.28.0" + react-router-dom "^5.3.3" + rtlcss "^3.5.0" + tslib "^2.4.0" + utility-types "^3.10.0" + +"@docusaurus/theme-common@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.4.0.tgz#626096fe9552d240a2115b492c7e12099070cf2d" + integrity sha512-IkG/l5f/FLY6cBIxtPmFnxpuPzc5TupuqlOx+XDN+035MdQcAh8wHXXZJAkTeYDeZ3anIUSUIvWa7/nRKoQEfg== + dependencies: + "@docusaurus/mdx-loader" "2.4.0" + "@docusaurus/module-type-aliases" "2.4.0" + "@docusaurus/plugin-content-blog" "2.4.0" + "@docusaurus/plugin-content-docs" "2.4.0" + "@docusaurus/plugin-content-pages" "2.4.0" + "@docusaurus/utils" "2.4.0" + "@docusaurus/utils-common" "2.4.0" + "@types/history" "^4.7.11" + "@types/react" "*" + "@types/react-router-config" "*" + clsx "^1.2.1" parse-numeric-range "^1.3.0" - prism-react-renderer "^1.3.1" - tslib "^2.3.1" + prism-react-renderer "^1.3.5" + tslib "^2.4.0" + use-sync-external-store "^1.2.0" utility-types "^3.10.0" -"@docusaurus/theme-search-algolia@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.17.tgz#880fb965b71e5aa7f01d456a1a2aa8eb6c244082" - integrity sha512-W12XKM7QC5Jmrec359bJ7aDp5U8DNkCxjVKsMNIs8rDunBoI/N+R35ERJ0N7Bg9ONAWO6o7VkUERQsfGqdvr9w== - dependencies: - "@docsearch/react" "^3.0.0" - "@docusaurus/core" "2.0.0-beta.17" - "@docusaurus/logger" "2.0.0-beta.17" - "@docusaurus/theme-common" "2.0.0-beta.17" - "@docusaurus/theme-translations" "2.0.0-beta.17" - "@docusaurus/utils" "2.0.0-beta.17" - "@docusaurus/utils-validation" "2.0.0-beta.17" - algoliasearch "^4.12.1" - algoliasearch-helper "^3.7.0" - clsx "^1.1.1" - eta "^1.12.3" - fs-extra "^10.0.1" +"@docusaurus/theme-search-algolia@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.4.0.tgz#07d297d50c44446d6bc5a37be39afb8f014084e1" + integrity sha512-pPCJSCL1Qt4pu/Z0uxBAuke0yEBbxh0s4fOvimna7TEcBLPq0x06/K78AaABXrTVQM6S0vdocFl9EoNgU17hqA== + dependencies: + "@docsearch/react" "^3.1.1" + "@docusaurus/core" "2.4.0" + "@docusaurus/logger" "2.4.0" + "@docusaurus/plugin-content-docs" "2.4.0" + "@docusaurus/theme-common" "2.4.0" + "@docusaurus/theme-translations" "2.4.0" + "@docusaurus/utils" "2.4.0" + "@docusaurus/utils-validation" "2.4.0" + algoliasearch "^4.13.1" + algoliasearch-helper "^3.10.0" + clsx "^1.2.1" + eta "^2.0.0" + fs-extra "^10.1.0" lodash "^4.17.21" - tslib "^2.3.1" + tslib "^2.4.0" utility-types "^3.10.0" -"@docusaurus/theme-translations@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.0.0-beta.17.tgz#a4b84fa63befc11847da471922387aa3eb4e5626" - integrity sha512-oxCX6khjZH3lgdRCL0DH06KkUM/kDr9+lzB35+vY8rpFeQruVgRdi8ekPqG3+Wr0U/N+LMhcYE5BmCb6D0Fv2A== +"@docusaurus/theme-translations@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.4.0.tgz#62dacb7997322f4c5a828b3ab66177ec6769eb33" + integrity sha512-kEoITnPXzDPUMBHk3+fzEzbopxLD3fR5sDoayNH0vXkpUukA88/aDL1bqkhxWZHA3LOfJ3f0vJbOwmnXW5v85Q== dependencies: - fs-extra "^10.0.1" - tslib "^2.3.1" + fs-extra "^10.1.0" + tslib "^2.4.0" -"@docusaurus/types@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-2.0.0-beta.17.tgz#582e3d961ce4409ed17454669b3f6a7a9f696cdd" - integrity sha512-4o7TXu5sKlQpybfFFtsGUElBXwSpiXKsQyyWaRKj7DRBkvMtkDX6ITZNnZO9+EHfLbP/cfrokB8C/oO7mCQ5BQ== +"@docusaurus/types@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-2.4.0.tgz#f94f89a0253778b617c5d40ac6f16b17ec55ce41" + integrity sha512-xaBXr+KIPDkIaef06c+i2HeTqVNixB7yFut5fBXPGI2f1rrmEV2vLMznNGsFwvZ5XmA3Quuefd4OGRkdo97Dhw== dependencies: + "@types/history" "^4.7.11" + "@types/react" "*" commander "^5.1.0" joi "^17.6.0" - querystring "0.2.1" + react-helmet-async "^1.3.0" utility-types "^3.10.0" - webpack "^5.69.1" + webpack "^5.73.0" webpack-merge "^5.8.0" -"@docusaurus/utils-common@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.17.tgz#cefd950a7722f5f702690b4de27ea19fd65f3364" - integrity sha512-90WCVdj6zYzs7neEIS594qfLO78cUL6EVK1CsRHJgVkkGjcYlCQ1NwkyO7bOb+nIAwdJrPJRc2FBSpuEGxPD3w== +"@docusaurus/utils-common@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.4.0.tgz#eb2913871860ed32e73858b4c7787dd820c5558d" + integrity sha512-zIMf10xuKxddYfLg5cS19x44zud/E9I7lj3+0bv8UIs0aahpErfNrGhijEfJpAfikhQ8tL3m35nH3hJ3sOG82A== dependencies: - tslib "^2.3.1" + tslib "^2.4.0" -"@docusaurus/utils-validation@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.17.tgz#d7dbfc1a29768c37c0d8a6af85eb1bdfef7656df" - integrity sha512-5UjayUP16fDjgd52eSEhL7SlN9x60pIhyS+K7kt7RmpSLy42+4/bSr2pns2VlATmuaoNOO6iIFdB2jgSYJ6SGA== +"@docusaurus/utils-validation@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.4.0.tgz#1ed92bfab5da321c4a4d99cad28a15627091aa90" + integrity sha512-IrBsBbbAp6y7mZdJx4S4pIA7dUyWSA0GNosPk6ZJ0fX3uYIEQgcQSGIgTeSC+8xPEx3c16o03en1jSDpgQgz/w== dependencies: - "@docusaurus/logger" "2.0.0-beta.17" - "@docusaurus/utils" "2.0.0-beta.17" + "@docusaurus/logger" "2.4.0" + "@docusaurus/utils" "2.4.0" joi "^17.6.0" - tslib "^2.3.1" + js-yaml "^4.1.0" + tslib "^2.4.0" -"@docusaurus/utils@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.17.tgz#6a696e2ec5e50b2271f2d26d31562e9f3e2bc559" - integrity sha512-yRKGdzSc5v6M/6GyQ4omkrAHCleevwKYiIrufCJgRbOtkhYE574d8mIjjirOuA/emcyLxjh+TLtqAA5TwhIryA== +"@docusaurus/utils@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.4.0.tgz#fdf0c3545819e48bb57eafc5057495fd4d50e900" + integrity sha512-89hLYkvtRX92j+C+ERYTuSUK6nF9bGM32QThcHPg2EDDHVw6FzYQXmX6/p+pU5SDyyx5nBlE4qXR92RxCAOqfg== dependencies: - "@docusaurus/logger" "2.0.0-beta.17" - "@svgr/webpack" "^6.0.0" + "@docusaurus/logger" "2.4.0" + "@svgr/webpack" "^6.2.1" + escape-string-regexp "^4.0.0" file-loader "^6.2.0" - fs-extra "^10.0.1" + fs-extra "^10.1.0" github-slugger "^1.4.0" - globby "^11.0.4" + globby "^11.1.0" gray-matter "^4.0.3" js-yaml "^4.1.0" lodash "^4.17.21" - micromatch "^4.0.4" + micromatch "^4.0.5" resolve-pathname "^3.0.0" shelljs "^0.8.5" - tslib "^2.3.1" + tslib "^2.4.0" url-loader "^4.1.1" - webpack "^5.69.1" + webpack "^5.73.0" "@hapi/hoek@^9.0.0": version "9.2.1" @@ -1567,6 +2596,25 @@ dependencies: "@hapi/hoek" "^9.0.0" +"@jest/schemas@^29.4.3": + version "29.4.3" + resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788" + integrity sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg== + dependencies: + "@sinclair/typebox" "^0.25.16" + +"@jest/types@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593" + integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog== + dependencies: + "@jest/schemas" "^29.4.3" + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^17.0.8" + chalk "^4.0.0" + "@jridgewell/gen-mapping@^0.3.0": version "0.3.2" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" @@ -1576,7 +2624,16 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@^3.0.3": +"@jridgewell/gen-mapping@^0.3.2": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" + integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3": version "3.1.0" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== @@ -1594,7 +2651,7 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== @@ -1607,6 +2664,14 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" +"@jridgewell/trace-mapping@^0.3.17": + version "0.3.18" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" + integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== + dependencies: + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" + "@jridgewell/trace-mapping@^0.3.9": version "0.3.14" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" @@ -1615,6 +2680,11 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" +"@leichtgewicht/ip-codec@^2.0.1": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" + integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== + "@mdx-js/mdx@^1.6.22": version "1.6.22" resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" @@ -1693,21 +2763,24 @@ resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== +"@sinclair/typebox@^0.25.16": + version "0.25.24" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718" + integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ== + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== -"@slorber/static-site-generator-webpack-plugin@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.1.tgz#0c8852146441aaa683693deaa5aee2f991d94841" - integrity sha512-PSv4RIVO1Y3kvHxjvqeVisk3E9XFoO04uwYBDWe217MFqKspplYswTuKLiJu0aLORQWzuQjfVsSlLPojwfYsLw== +"@slorber/static-site-generator-webpack-plugin@^4.0.7": + version "4.0.7" + resolved "https://registry.yarnpkg.com/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.7.tgz#fc1678bddefab014e2145cbe25b3ce4e1cfc36f3" + integrity sha512-Ug7x6z5lwrz0WqdnNFOMYrDQNTPAprvHLSh6+/fmml3qUiz6l5eq+2MzLKWtn/q5K5NpSiFsZTP/fck/3vjSxA== dependencies: - bluebird "^3.7.1" - cheerio "^0.22.0" - eval "^0.1.4" - url "^0.11.0" - webpack-sources "^1.4.3" + eval "^0.1.8" + p-map "^4.0.0" + webpack-sources "^3.2.2" "@svgr/babel-plugin-add-jsx-attribute@^6.0.0": version "6.0.0" @@ -1799,7 +2872,7 @@ deepmerge "^4.2.2" svgo "^2.5.0" -"@svgr/webpack@^6.0.0", "@svgr/webpack@^6.2.1": +"@svgr/webpack@^6.2.1": version "6.2.1" resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.2.1.tgz#ef5d51c1b6be4e7537fb9f76b3f2b2e22b63c58d" integrity sha512-h09ngMNd13hnePwgXa+Y5CgOjzlCvfWLHg+MBnydEedAnuLRzUHUJmGS3o2OsrhxTOOqEsPOFt5v/f6C5Qulcw== @@ -1871,11 +2944,16 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*", "@types/estree@^0.0.51": +"@types/estree@*": version "0.0.51" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== +"@types/estree@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" + integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== + "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": version "4.17.28" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" @@ -1919,6 +2997,25 @@ dependencies: "@types/node" "*" +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" + integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== + +"@types/istanbul-lib-report@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== + dependencies: + "@types/istanbul-lib-coverage" "*" + +"@types/istanbul-reports@^3.0.0": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" + integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== + dependencies: + "@types/istanbul-lib-report" "*" + "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" @@ -1931,6 +3028,11 @@ dependencies: "@types/unist" "*" +"@types/mime@*": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" + integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== + "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" @@ -1975,6 +3077,15 @@ "@types/react" "*" "@types/react-router" "*" +"@types/react-router-config@^5.0.6": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@types/react-router-config/-/react-router-config-5.0.7.tgz#36207a3fe08b271abee62b26993ee932d13cbb02" + integrity sha512-pFFVXUIydHlcJP6wJm7sDii5mD/bCmmAY0wQzq+M+uX7bqS95AQqHZWP1iNMKrWVQSuHIzj5qi9BvrtLX2/T4w== + dependencies: + "@types/history" "^4.7.11" + "@types/react" "*" + "@types/react-router" "^5.1.0" + "@types/react-router-dom@*": version "5.3.3" resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83" @@ -1992,6 +3103,14 @@ "@types/history" "^4.7.11" "@types/react" "*" +"@types/react-router@^5.1.0": + version "5.1.20" + resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.20.tgz#88eccaa122a82405ef3efbcaaa5dcdd9f021387c" + integrity sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q== + dependencies: + "@types/history" "^4.7.11" + "@types/react" "*" + "@types/react@*": version "17.0.39" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.39.tgz#d0f4cde092502a6db00a1cded6e6bf2abb7633ce" @@ -2033,6 +3152,14 @@ "@types/mime" "^1" "@types/node" "*" +"@types/serve-static@^1.13.10": + version "1.15.1" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d" + integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ== + dependencies: + "@types/mime" "*" + "@types/node" "*" + "@types/sockjs@^0.3.33": version "0.3.33" resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" @@ -2045,132 +3172,144 @@ resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== -"@types/ws@^8.2.2": - version "8.5.2" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.2.tgz#77e0c2e360e9579da930ffcfa53c5975ea3bdd26" - integrity sha512-VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw== +"@types/ws@^8.5.1": + version "8.5.4" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5" + integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg== dependencies: "@types/node" "*" -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== +"@types/yargs-parser@*": + version "21.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== + +"@types/yargs@^17.0.8": + version "17.0.24" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902" + integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw== dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@types/yargs-parser" "*" -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== +"@webassemblyjs/ast@1.11.5", "@webassemblyjs/ast@^1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.5.tgz#6e818036b94548c1fb53b754b5cae3c9b208281c" + integrity sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.5" + "@webassemblyjs/helper-wasm-bytecode" "1.11.5" + +"@webassemblyjs/floating-point-hex-parser@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz#e85dfdb01cad16b812ff166b96806c050555f1b4" + integrity sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ== -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== +"@webassemblyjs/helper-api-error@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz#1e82fa7958c681ddcf4eabef756ce09d49d442d1" + integrity sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA== -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== +"@webassemblyjs/helper-buffer@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.5.tgz#91381652ea95bb38bbfd270702351c0c89d69fba" + integrity sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg== -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== +"@webassemblyjs/helper-numbers@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz#23380c910d56764957292839006fecbe05e135a9" + integrity sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA== dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" + "@webassemblyjs/floating-point-hex-parser" "1.11.5" + "@webassemblyjs/helper-api-error" "1.11.5" "@xtuc/long" "4.2.2" -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== +"@webassemblyjs/helper-wasm-bytecode@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.5.tgz#e258a25251bc69a52ef817da3001863cc1c24b9f" + integrity sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA== -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== +"@webassemblyjs/helper-wasm-section@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.5.tgz#966e855a6fae04d5570ad4ec87fbcf29b42ba78e" + integrity sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA== dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/ast" "1.11.5" + "@webassemblyjs/helper-buffer" "1.11.5" + "@webassemblyjs/helper-wasm-bytecode" "1.11.5" + "@webassemblyjs/wasm-gen" "1.11.5" -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== +"@webassemblyjs/ieee754@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.5.tgz#b2db1b33ce9c91e34236194c2b5cba9b25ca9d60" + integrity sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg== dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== +"@webassemblyjs/leb128@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.5.tgz#482e44d26b6b949edf042a8525a66c649e38935a" + integrity sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ== dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" +"@webassemblyjs/utf8@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.5.tgz#83bef94856e399f3740e8df9f63bc47a987eae1a" + integrity sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ== + +"@webassemblyjs/wasm-edit@^1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.5.tgz#93ee10a08037657e21c70de31c47fdad6b522b2d" + integrity sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ== + dependencies: + "@webassemblyjs/ast" "1.11.5" + "@webassemblyjs/helper-buffer" "1.11.5" + "@webassemblyjs/helper-wasm-bytecode" "1.11.5" + "@webassemblyjs/helper-wasm-section" "1.11.5" + "@webassemblyjs/wasm-gen" "1.11.5" + "@webassemblyjs/wasm-opt" "1.11.5" + "@webassemblyjs/wasm-parser" "1.11.5" + "@webassemblyjs/wast-printer" "1.11.5" + +"@webassemblyjs/wasm-gen@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.5.tgz#ceb1c82b40bf0cf67a492c53381916756ef7f0b1" + integrity sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA== + dependencies: + "@webassemblyjs/ast" "1.11.5" + "@webassemblyjs/helper-wasm-bytecode" "1.11.5" + "@webassemblyjs/ieee754" "1.11.5" + "@webassemblyjs/leb128" "1.11.5" + "@webassemblyjs/utf8" "1.11.5" + +"@webassemblyjs/wasm-opt@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.5.tgz#b52bac29681fa62487e16d3bb7f0633d5e62ca0a" + integrity sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw== + dependencies: + "@webassemblyjs/ast" "1.11.5" + "@webassemblyjs/helper-buffer" "1.11.5" + "@webassemblyjs/wasm-gen" "1.11.5" + "@webassemblyjs/wasm-parser" "1.11.5" + +"@webassemblyjs/wasm-parser@1.11.5", "@webassemblyjs/wasm-parser@^1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.5.tgz#7ba0697ca74c860ea13e3ba226b29617046982e2" + integrity sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew== + dependencies: + "@webassemblyjs/ast" "1.11.5" + "@webassemblyjs/helper-api-error" "1.11.5" + "@webassemblyjs/helper-wasm-bytecode" "1.11.5" + "@webassemblyjs/ieee754" "1.11.5" + "@webassemblyjs/leb128" "1.11.5" + "@webassemblyjs/utf8" "1.11.5" + +"@webassemblyjs/wast-printer@1.11.5": + version "1.11.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.5.tgz#7a5e9689043f3eca82d544d7be7a8e6373a6fa98" + integrity sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA== + dependencies: + "@webassemblyjs/ast" "1.11.5" "@xtuc/long" "4.2.2" "@xtuc/ieee754@^1.2.0": @@ -2201,11 +3340,16 @@ acorn-walk@^8.0.0: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0: +acorn@^8.0.4, acorn@^8.5.0: version "8.7.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== +acorn@^8.7.1: + version "8.8.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" + integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== + address@^1.0.1, address@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" @@ -2258,14 +3402,14 @@ ajv@^8.0.0, ajv@^8.8.0: require-from-string "^2.0.2" uri-js "^4.2.2" -algoliasearch-helper@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.7.0.tgz#c0a0493df84d850360f664ad7a9d4fc78a94fd78" - integrity sha512-XJ3QfERBLfeVCyTVx80gon7r3/rgm/CE8Ha1H7cbablRe/X7SfYQ14g/eO+MhjVKIQp+gy9oC6G5ilmLwS1k6w== +algoliasearch-helper@^3.10.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.12.0.tgz#0fe39d49b0290e4aa5e1fe733bd24d857d258e94" + integrity sha512-/j1U3PEwdan0n6P/QqSnSpNSLC5+cEMvyljd5CnmNmUjDlGrys+vFEOwjVEnqELIiAGMHEA/Nl3CiKVFBUYqyQ== dependencies: "@algolia/events" "^4.0.1" -algoliasearch@^4.0.0, algoliasearch@^4.12.1: +algoliasearch@^4.0.0: version "4.12.2" resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.12.2.tgz#d7672a15b8fd1b261d9ae193535b68bcb189cfd2" integrity sha512-bn1P9+V415zeDQJtXn+1SwuwedEAv9/LJAxt8XwR6ygH/sMwaHSm2hpkz8wIbCBt/tKQ43TL672Kyxzv5PwGgQ== @@ -2285,6 +3429,26 @@ algoliasearch@^4.0.0, algoliasearch@^4.12.1: "@algolia/requester-node-http" "4.12.2" "@algolia/transporter" "4.12.2" +algoliasearch@^4.13.1: + version "4.17.0" + resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.17.0.tgz#46ed58b2b99509d041f11cd1ea83623edf84355f" + integrity sha512-JMRh2Mw6sEnVMiz6+APsi7lx9a2jiDFF+WUtANaUVCv6uSU9UOLdo5h9K3pdP6frRRybaM2fX8b1u0nqICS9aA== + dependencies: + "@algolia/cache-browser-local-storage" "4.17.0" + "@algolia/cache-common" "4.17.0" + "@algolia/cache-in-memory" "4.17.0" + "@algolia/client-account" "4.17.0" + "@algolia/client-analytics" "4.17.0" + "@algolia/client-common" "4.17.0" + "@algolia/client-personalization" "4.17.0" + "@algolia/client-search" "4.17.0" + "@algolia/logger-common" "4.17.0" + "@algolia/logger-console" "4.17.0" + "@algolia/requester-browser-xhr" "4.17.0" + "@algolia/requester-common" "4.17.0" + "@algolia/requester-node-http" "4.17.0" + "@algolia/transporter" "4.17.0" + ansi-align@^3.0.0, ansi-align@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" @@ -2356,7 +3520,7 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= -array-flatten@^2.1.0: +array-flatten@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== @@ -2366,36 +3530,24 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array-union@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" - integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw== - asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= -async@^2.6.2: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== - dependencies: - lodash "^4.17.14" - at-least-node@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -autoprefixer@^10.3.7, autoprefixer@^10.4.2: - version "10.4.2" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.2.tgz#25e1df09a31a9fba5c40b578936b90d35c9d4d3b" - integrity sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ== +autoprefixer@^10.4.12, autoprefixer@^10.4.7: + version "10.4.14" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.14.tgz#e28d49902f8e759dd25b153264e862df2705f79d" + integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ== dependencies: - browserslist "^4.19.1" - caniuse-lite "^1.0.30001297" - fraction.js "^4.1.2" + browserslist "^4.21.5" + caniuse-lite "^1.0.30001464" + fraction.js "^4.2.0" normalize-range "^0.1.2" picocolors "^1.0.0" postcss-value-parser "^4.2.0" @@ -2407,13 +3559,13 @@ axios@^0.25.0: dependencies: follow-redirects "^1.14.7" -babel-loader@^8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" - integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== +babel-loader@^8.2.5: + version "8.3.0" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8" + integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q== dependencies: find-cache-dir "^3.3.1" - loader-utils "^1.4.0" + loader-utils "^2.0.0" make-dir "^3.1.0" schema-utils "^2.6.5" @@ -2425,13 +3577,6 @@ babel-plugin-apply-mdx-type-prop@1.6.22: "@babel/helper-plugin-utils" "7.10.4" "@mdx-js/util" "1.6.22" -babel-plugin-dynamic-import-node@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" - integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ== - dependencies: - object.assign "^4.1.0" - babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" @@ -2455,6 +3600,15 @@ babel-plugin-polyfill-corejs2@^0.3.0: "@babel/helper-define-polyfill-provider" "^0.3.1" semver "^6.1.1" +babel-plugin-polyfill-corejs2@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122" + integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q== + dependencies: + "@babel/compat-data" "^7.17.7" + "@babel/helper-define-polyfill-provider" "^0.3.3" + semver "^6.1.1" + babel-plugin-polyfill-corejs3@^0.5.0: version "0.5.2" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72" @@ -2463,6 +3617,14 @@ babel-plugin-polyfill-corejs3@^0.5.0: "@babel/helper-define-polyfill-provider" "^0.3.1" core-js-compat "^3.21.0" +babel-plugin-polyfill-corejs3@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a" + integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.3.3" + core-js-compat "^3.25.1" + babel-plugin-polyfill-regenerator@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990" @@ -2470,6 +3632,13 @@ babel-plugin-polyfill-regenerator@^0.3.0: dependencies: "@babel/helper-define-polyfill-provider" "^0.3.1" +babel-plugin-polyfill-regenerator@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747" + integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.3.3" + bail@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" @@ -2500,40 +3669,35 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -bluebird@^3.7.1: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -body-parser@1.19.2: - version "1.19.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" - integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw== +body-parser@1.20.1: + version "1.20.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" + integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== dependencies: bytes "3.1.2" content-type "~1.0.4" debug "2.6.9" - depd "~1.1.2" - http-errors "1.8.1" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.9.7" - raw-body "2.4.3" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.1" type-is "~1.6.18" + unpipe "1.0.0" -bonjour@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" - integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= +bonjour-service@^1.0.11: + version "1.1.1" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135" + integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg== dependencies: - array-flatten "^2.1.0" - deep-equal "^1.0.1" + array-flatten "^2.1.2" dns-equal "^1.0.0" - dns-txt "^2.0.2" - multicast-dns "^6.0.1" - multicast-dns-service-types "^1.1.0" + fast-deep-equal "^3.1.3" + multicast-dns "^7.2.5" -boolbase@^1.0.0, boolbase@~1.0.0: +boolbase@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= @@ -2574,14 +3738,14 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^3.0.1, braces@~3.0.2: +braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== dependencies: fill-range "^7.0.1" -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.19.1: +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.19.1: version "4.20.0" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.0.tgz#35951e3541078c125d36df76056e94738a52ebe9" integrity sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ== @@ -2592,16 +3756,21 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4 node-releases "^2.0.2" picocolors "^1.0.0" +browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5: + version "4.21.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" + integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== + dependencies: + caniuse-lite "^1.0.30001449" + electron-to-chromium "^1.4.284" + node-releases "^2.0.8" + update-browserslist-db "^1.0.10" + buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -buffer-indexof@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" - integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== - bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -2625,7 +3794,7 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -call-bind@^1.0.0, call-bind@^1.0.2: +call-bind@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== @@ -2666,12 +3835,17 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001297, caniuse-lite@^1.0.30001313: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001313: version "1.0.30001313" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001313.tgz#a380b079db91621e1b7120895874e2fd62ed2e2f" integrity sha512-rI1UN0koZUiKINjysQDuRi2VeSCce3bYJNmDcj3PIKREiAmjakugBul1QSkg/fPrlULYl6oWfGg3PbgOSY9X4Q== -ccount@^1.0.0, ccount@^1.0.3: +caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464: + version "1.0.30001481" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912" + integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ== + +ccount@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043" integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg== @@ -2685,7 +3859,7 @@ chalk@^2.0.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.1.0, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -2708,51 +3882,30 @@ character-reference-invalid@^1.0.0: resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== -cheerio-select@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823" - integrity sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg== +cheerio-select@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4" + integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g== dependencies: - css-select "^4.1.3" - css-what "^5.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" - domutils "^2.7.0" - -cheerio@^0.22.0: - version "0.22.0" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" - integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= - dependencies: - css-select "~1.2.0" - dom-serializer "~0.1.0" - entities "~1.1.1" - htmlparser2 "^3.9.1" - lodash.assignin "^4.0.9" - lodash.bind "^4.1.4" - lodash.defaults "^4.0.1" - lodash.filter "^4.4.0" - lodash.flatten "^4.2.0" - lodash.foreach "^4.3.0" - lodash.map "^4.4.0" - lodash.merge "^4.4.0" - lodash.pick "^4.2.1" - lodash.reduce "^4.4.0" - lodash.reject "^4.4.0" - lodash.some "^4.4.0" - -cheerio@^1.0.0-rc.10: - version "1.0.0-rc.10" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e" - integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw== - dependencies: - cheerio-select "^1.5.0" - dom-serializer "^1.3.2" - domhandler "^4.2.0" - htmlparser2 "^6.1.0" - parse5 "^6.0.1" - parse5-htmlparser2-tree-adapter "^6.0.1" - tslib "^2.2.0" + boolbase "^1.0.0" + css-select "^5.1.0" + css-what "^6.1.0" + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.0.1" + +cheerio@^1.0.0-rc.12: + version "1.0.0-rc.12" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683" + integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q== + dependencies: + cheerio-select "^2.1.0" + dom-serializer "^2.0.0" + domhandler "^5.0.3" + domutils "^3.0.1" + htmlparser2 "^8.0.1" + parse5 "^7.0.0" + parse5-htmlparser2-tree-adapter "^7.0.0" "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.2, chokidar@^3.5.3: version "3.5.3" @@ -2779,13 +3932,25 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -clean-css@^5.2.2, clean-css@^5.2.4: +ci-info@^3.2.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== + +clean-css@^5.2.2: version "5.2.4" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.2.4.tgz#982b058f8581adb2ae062520808fb2429bd487a4" integrity sha512-nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg== dependencies: source-map "~0.6.0" +clean-css@^5.3.0: + version "5.3.2" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.2.tgz#70ecc7d4d4114921f5d298349ff86a31a9975224" + integrity sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww== + dependencies: + source-map "~0.6.0" + clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" @@ -2801,14 +3966,14 @@ cli-boxes@^3.0.0: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-3.0.0.tgz#71a10c716feeba005e4504f36329ef0b17cf3145" integrity sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g== -cli-table3@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8" - integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA== +cli-table3@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2" + integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg== dependencies: string-width "^4.2.0" optionalDependencies: - colors "1.4.0" + "@colors/colors" "1.5.0" cliui@^7.0.2: version "7.0.4" @@ -2840,6 +4005,11 @@ clsx@^1.1.1: resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== +clsx@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" + integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== + collapse-white-space@^1.0.2: version "1.0.6" resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" @@ -2879,11 +4049,6 @@ colorette@^2.0.10: resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== -colors@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" - integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== - combine-promises@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/combine-promises/-/combine-promises-1.1.0.tgz#72db90743c0ca7aab7d0d8d2052fd7b0f674de71" @@ -2956,10 +4121,10 @@ configstore@^5.0.1: write-file-atomic "^3.0.0" xdg-basedir "^4.0.0" -connect-history-api-fallback@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" - integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== +connect-history-api-fallback@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" + integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== consola@^2.15.3: version "2.15.3" @@ -2995,24 +4160,24 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" - integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== +cookie@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" + integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== copy-text-to-clipboard@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" integrity sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q== -copy-webpack-plugin@^10.2.4: - version "10.2.4" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz#6c854be3fdaae22025da34b9112ccf81c63308fe" - integrity sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg== +copy-webpack-plugin@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz#96d4dbdb5f73d02dd72d0528d1958721ab72e04a" + integrity sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ== dependencies: - fast-glob "^3.2.7" + fast-glob "^3.2.11" glob-parent "^6.0.1" - globby "^12.0.2" + globby "^13.1.1" normalize-path "^3.0.0" schema-utils "^4.0.0" serialize-javascript "^6.0.0" @@ -3025,21 +4190,33 @@ core-js-compat@^3.20.2, core-js-compat@^3.21.0: browserslist "^4.19.1" semver "7.0.0" -core-js-pure@^3.20.2: - version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.1.tgz#8c4d1e78839f5f46208de7230cebfb72bc3bdb51" - integrity sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ== +core-js-compat@^3.25.1: + version "3.30.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.30.1.tgz#961541e22db9c27fc48bfc13a3cafa8734171dfe" + integrity sha512-d690npR7MC6P0gq4npTl5n2VQeNAmUrJ90n+MHiKS7W2+xno4o3F5GDEuylSdi6EJ3VssibSGXOa1r3YXD3Mhw== + dependencies: + browserslist "^4.21.5" -core-js@^3.21.1: - version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94" - integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig== +core-js-pure@^3.25.1: + version "3.30.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.1.tgz#7d93dc89e7d47b8ef05d7e79f507b0e99ea77eec" + integrity sha512-nXBEVpmUnNRhz83cHd9JRQC52cTMcuXAmR56+9dSMpRdpeA4I1PX6yjmhd71Eyc/wXNsdBdUDIj1QTIeZpU5Tg== + +core-js@^3.23.3: + version "3.30.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.30.1.tgz#fc9c5adcc541d8e9fa3e381179433cbf795628ba" + integrity sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ== core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== +cosmiconfig-typescript-loader@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz#c4259ce474c9df0f32274ed162c0447c951ef073" + integrity sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q== + cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" @@ -3051,7 +4228,7 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" -cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: +cosmiconfig@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== @@ -3062,6 +4239,16 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: path-type "^4.0.0" yaml "^1.10.0" +cosmiconfig@^8.1.3: + version "8.1.3" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz#0e614a118fcc2d9e5afc2f87d53cd09931015689" + integrity sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw== + dependencies: + import-fresh "^3.2.1" + js-yaml "^4.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + cross-fetch@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" @@ -3083,35 +4270,33 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -css-declaration-sorter@^6.0.3: - version "6.1.4" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz#b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4" - integrity sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw== - dependencies: - timsort "^0.3.0" +css-declaration-sorter@^6.3.1: + version "6.4.0" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz#630618adc21724484b3e9505bce812def44000ad" + integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew== -css-loader@^6.6.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.0.tgz#c1200da1dfffe6643b18bda20fdd84cad3e36d39" - integrity sha512-S7HCfCiDHLA+VXKqdZwyRZgoO0R9BnKDnVIoHMq5grl3N86zAu7MB+FBWHr5xOJC8SmvpTLha/2NpfFkFEN/ig== +css-loader@^6.7.1: + version "6.7.3" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd" + integrity sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ== dependencies: icss-utils "^5.1.0" - postcss "^8.4.7" + postcss "^8.4.19" postcss-modules-extract-imports "^3.0.0" postcss-modules-local-by-default "^4.0.0" postcss-modules-scope "^3.0.0" postcss-modules-values "^4.0.0" postcss-value-parser "^4.2.0" - semver "^7.3.5" + semver "^7.3.8" -css-minimizer-webpack-plugin@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f" - integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q== +css-minimizer-webpack-plugin@^4.0.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-4.2.2.tgz#79f6199eb5adf1ff7ba57f105e3752d15211eb35" + integrity sha512-s3Of/4jKfw1Hj9CxEO1E5oXhQAxlayuHO2y/ML+C6I9sQ7FdzfEV6QgMLN3vI+qFsjJGIAFLKtQK7t8BOXAIyA== dependencies: - cssnano "^5.0.6" - jest-worker "^27.0.2" - postcss "^8.3.5" + cssnano "^5.1.8" + jest-worker "^29.1.2" + postcss "^8.4.17" schema-utils "^4.0.0" serialize-javascript "^6.0.0" source-map "^0.6.1" @@ -3127,15 +4312,16 @@ css-select@^4.1.3: domutils "^2.8.0" nth-check "^2.0.1" -css-select@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" - integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= +css-select@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6" + integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg== dependencies: - boolbase "~1.0.0" - css-what "2.1" - domutils "1.5.1" - nth-check "~1.0.1" + boolbase "^1.0.0" + css-what "^6.1.0" + domhandler "^5.0.2" + domutils "^3.0.1" + nth-check "^2.0.1" css-tree@^1.1.2, css-tree@^1.1.3: version "1.1.3" @@ -3145,79 +4331,79 @@ css-tree@^1.1.2, css-tree@^1.1.3: mdn-data "2.0.14" source-map "^0.6.1" -css-what@2.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" - integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== - -css-what@^5.0.1, css-what@^5.1.0: +css-what@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== +css-what@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-advanced@^5.1.12: - version "5.2.1" - resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.2.1.tgz#e96673c8fb2d4fba589b40c75167fe398bc9a5c0" - integrity sha512-M/qkiVwnKfGiolf20yDeOWPDlIqf9NItkQYUYDQluBTUITCFnNfuFrAeRln0P6tSyDeCUOgmqQWW++B4A3gNgQ== +cssnano-preset-advanced@^5.3.8: + version "5.3.10" + resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.3.10.tgz#25558a1fbf3a871fb6429ce71e41be7f5aca6eef" + integrity sha512-fnYJyCS9jgMU+cmHO1rPSPf9axbQyD7iUhLO5Df6O4G+fKIOMps+ZbU0PdGFejFBBZ3Pftf18fn1eG7MAPUSWQ== dependencies: - autoprefixer "^10.3.7" - cssnano-preset-default "^5.2.0" + autoprefixer "^10.4.12" + cssnano-preset-default "^5.2.14" postcss-discard-unused "^5.1.0" - postcss-merge-idents "^5.1.0" - postcss-reduce-idents "^5.1.0" + postcss-merge-idents "^5.1.1" + postcss-reduce-idents "^5.2.0" postcss-zindex "^5.1.0" -cssnano-preset-default@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.0.tgz#2579d38b9217746f2cf9f938954a91e00418ded6" - integrity sha512-3N5Vcptj2pqVKpHVqH6ezOJvqikR2PdLTbTrsrhF61FbLRQuujAqZ2sKN5rvcMsb7hFjrNnjZT8CGEkxoN/Pwg== +cssnano-preset-default@^5.2.14: + version "5.2.14" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz#309def4f7b7e16d71ab2438052093330d9ab45d8" + integrity sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A== dependencies: - css-declaration-sorter "^6.0.3" + css-declaration-sorter "^6.3.1" cssnano-utils "^3.1.0" postcss-calc "^8.2.3" - postcss-colormin "^5.3.0" - postcss-convert-values "^5.1.0" - postcss-discard-comments "^5.1.0" + postcss-colormin "^5.3.1" + postcss-convert-values "^5.1.3" + postcss-discard-comments "^5.1.2" postcss-discard-duplicates "^5.1.0" - postcss-discard-empty "^5.1.0" + postcss-discard-empty "^5.1.1" postcss-discard-overridden "^5.1.0" - postcss-merge-longhand "^5.1.0" - postcss-merge-rules "^5.1.0" + postcss-merge-longhand "^5.1.7" + postcss-merge-rules "^5.1.4" postcss-minify-font-values "^5.1.0" - postcss-minify-gradients "^5.1.0" - postcss-minify-params "^5.1.0" - postcss-minify-selectors "^5.2.0" + postcss-minify-gradients "^5.1.1" + postcss-minify-params "^5.1.4" + postcss-minify-selectors "^5.2.1" postcss-normalize-charset "^5.1.0" postcss-normalize-display-values "^5.1.0" - postcss-normalize-positions "^5.1.0" - postcss-normalize-repeat-style "^5.1.0" + postcss-normalize-positions "^5.1.1" + postcss-normalize-repeat-style "^5.1.1" postcss-normalize-string "^5.1.0" postcss-normalize-timing-functions "^5.1.0" - postcss-normalize-unicode "^5.1.0" + postcss-normalize-unicode "^5.1.1" postcss-normalize-url "^5.1.0" - postcss-normalize-whitespace "^5.1.0" - postcss-ordered-values "^5.1.0" - postcss-reduce-initial "^5.1.0" + postcss-normalize-whitespace "^5.1.1" + postcss-ordered-values "^5.1.3" + postcss-reduce-initial "^5.1.2" postcss-reduce-transforms "^5.1.0" postcss-svgo "^5.1.0" - postcss-unique-selectors "^5.1.0" + postcss-unique-selectors "^5.1.1" cssnano-utils@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== -cssnano@^5.0.17, cssnano@^5.0.6: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.0.tgz#cf977d660a5824d0d5542639ed1d4045afd84cbe" - integrity sha512-wWxave1wMlThGg4ueK98jFKaNqXnQd1nVZpSkQ9XvR+YymlzP1ofWqES1JkHtI250LksP9z5JH+oDcrKDJezAg== +cssnano@^5.1.12, cssnano@^5.1.8: + version "5.1.15" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.15.tgz#ded66b5480d5127fcb44dac12ea5a983755136bf" + integrity sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw== dependencies: - cssnano-preset-default "^5.2.0" + cssnano-preset-default "^5.2.14" lilconfig "^2.0.3" yaml "^1.10.2" @@ -3240,13 +4426,6 @@ debug@2.6.9, debug@^2.6.0: dependencies: ms "2.0.0" -debug@^3.1.1: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - debug@^4.1.0, debug@^4.1.1: version "4.3.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" @@ -3261,18 +4440,6 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" -deep-equal@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" - integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== - dependencies: - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - object-is "^1.0.1" - object-keys "^1.1.1" - regexp.prototype.flags "^1.2.0" - deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -3307,10 +4474,10 @@ define-properties@^1.1.3: dependencies: object-keys "^1.0.12" -del@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" - integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== +del@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a" + integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg== dependencies: globby "^11.0.1" graceful-fs "^4.2.4" @@ -3321,15 +4488,20 @@ del@^6.0.0: rimraf "^3.0.2" slash "^3.0.0" +depd@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +destroy@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== detab@2.0.4: version "2.0.4" @@ -3371,20 +4543,12 @@ dns-equal@^1.0.0: resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= -dns-packet@^1.3.1: - version "1.3.4" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" - integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== - dependencies: - ip "^1.1.0" - safe-buffer "^5.0.1" - -dns-txt@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" - integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= +dns-packet@^5.2.2: + version "5.6.0" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.0.tgz#2202c947845c7a63c23ece58f2f70ff6ab4c2f7d" + integrity sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ== dependencies: - buffer-indexof "^1.0.0" + "@leichtgewicht/ip-codec" "^2.0.1" docusaurus-plugin-sass@^0.2.2: version "0.2.2" @@ -3400,15 +4564,7 @@ dom-converter@^0.2.0: dependencies: utila "~0.4" -dom-serializer@0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" - integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== - dependencies: - domelementtype "^2.0.1" - entities "^2.0.0" - -dom-serializer@^1.0.1, dom-serializer@^1.3.2: +dom-serializer@^1.0.1: version "1.3.2" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== @@ -3417,30 +4573,24 @@ dom-serializer@^1.0.1, dom-serializer@^1.3.2: domhandler "^4.2.0" entities "^2.0.0" -dom-serializer@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" - integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA== +dom-serializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== dependencies: - domelementtype "^1.3.0" - entities "^1.1.1" - -domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" - integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== + domelementtype "^2.3.0" + domhandler "^5.0.2" + entities "^4.2.0" domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== -domhandler@^2.3.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" - integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== - dependencies: - domelementtype "1" +domelementtype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0: version "4.3.0" @@ -3449,23 +4599,14 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0: dependencies: domelementtype "^2.2.0" -domutils@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" - integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= - dependencies: - dom-serializer "0" - domelementtype "1" - -domutils@^1.5.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" - integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== +domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== dependencies: - dom-serializer "0" - domelementtype "1" + domelementtype "^2.3.0" -domutils@^2.5.2, domutils@^2.7.0, domutils@^2.8.0: +domutils@^2.5.2, domutils@^2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== @@ -3474,6 +4615,15 @@ domutils@^2.5.2, domutils@^2.7.0, domutils@^2.8.0: domelementtype "^2.2.0" domhandler "^4.2.0" +domutils@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" + integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== + dependencies: + dom-serializer "^2.0.0" + domelementtype "^2.3.0" + domhandler "^5.0.1" + dot-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" @@ -3509,6 +4659,11 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= +electron-to-chromium@^1.4.284: + version "1.4.371" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.371.tgz#393983ef087268a20c926a89be30e9f0bfc803b0" + integrity sha512-jlBzY4tFcJaiUjzhRTCWAqRvTO/fWzjA3Bls0mykzGZ7zvcMP7h05W6UcgzfT9Ca1SW2xyKDOFRyI0pQeRNZGw== + electron-to-chromium@^1.4.76: version "1.4.76" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.76.tgz#a0494baedaf51094b1c172999919becd9975a934" @@ -3546,19 +4701,14 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^5.9.2: - version "5.9.2" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9" - integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA== +enhanced-resolve@^5.13.0: + version "5.13.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz#26d1ecc448c02de997133217b5c1053f34a0a275" + integrity sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" -entities@^1.1.1, entities@~1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== - entities@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" @@ -3569,6 +4719,11 @@ entities@^3.0.1: resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== +entities@^4.2.0, entities@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== + error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -3576,10 +4731,10 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== +es-module-lexer@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.2.1.tgz#ba303831f63e6a394983fde2f97ad77b22324527" + integrity sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg== escalade@^3.1.1: version "3.1.1" @@ -3641,21 +4796,22 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -eta@^1.12.3: - version "1.12.3" - resolved "https://registry.yarnpkg.com/eta/-/eta-1.12.3.tgz#2982d08adfbef39f9fa50e2fbd42d7337e7338b1" - integrity sha512-qHixwbDLtekO/d51Yr4glcaUJCIjGVJyTzuqV4GPlgZo1YpgOKG+avQynErZIYrfM6JIJdtiG2Kox8tbb+DoGg== +eta@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/eta/-/eta-2.0.1.tgz#199e675359cb6e19d38f29e1f405e1ba0e79a6df" + integrity sha512-46E2qDPDm7QA+usjffUWz9KfXsxVZclPOuKsXs4ZWZdI/X1wpDF7AO424pt7fdYohCzWsIkXAhNGXSlwo5naAg== etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= -eval@^0.1.4: - version "0.1.6" - resolved "https://registry.yarnpkg.com/eval/-/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" - integrity sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ== +eval@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/eval/-/eval-0.1.8.tgz#2b903473b8cc1d1989b83a1e7923f883eb357f85" + integrity sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw== dependencies: + "@types/node" "*" require-like ">= 0.1.1" eventemitter3@^4.0.0: @@ -3683,38 +4839,39 @@ execa@^5.0.0: signal-exit "^3.0.3" strip-final-newline "^2.0.0" -express@^4.17.1: - version "4.17.3" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" - integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== +express@^4.17.3: + version "4.18.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" + integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.19.2" + body-parser "1.20.1" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.2" + cookie "0.5.0" cookie-signature "1.0.6" debug "2.6.9" - depd "~1.1.2" + depd "2.0.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "~1.1.2" + finalhandler "1.2.0" fresh "0.5.2" + http-errors "2.0.0" merge-descriptors "1.0.1" methods "~1.1.2" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" path-to-regexp "0.1.7" proxy-addr "~2.0.7" - qs "6.9.7" + qs "6.11.0" range-parser "~1.2.1" safe-buffer "5.2.1" - send "0.17.2" - serve-static "1.14.2" + send "0.18.0" + serve-static "1.15.0" setprototypeof "1.2.0" - statuses "~1.5.0" + statuses "2.0.1" type-is "~1.6.18" utils-merge "1.0.1" vary "~1.1.2" @@ -3736,7 +4893,18 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.2.7, fast-glob@^3.2.9: +fast-glob@^3.2.11: + version "3.2.12" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" + integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-glob@^3.2.9: version "3.2.11" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== @@ -3825,17 +4993,17 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== +finalhandler@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== dependencies: debug "2.6.9" encodeurl "~1.0.2" escape-html "~1.0.3" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" - statuses "~1.5.0" + statuses "2.0.1" unpipe "~1.0.0" find-cache-dir@^3.3.1: @@ -3907,7 +5075,7 @@ forwarded@0.2.0: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== -fraction.js@^4.1.2: +fraction.js@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== @@ -3917,10 +5085,10 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= -fs-extra@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8" - integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag== +fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -4063,7 +5231,7 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globby@^11.0.1, globby@^11.0.4: +globby@^11.0.1, globby@^11.0.4, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -4075,15 +5243,14 @@ globby@^11.0.1, globby@^11.0.4: merge2 "^1.4.1" slash "^3.0.0" -globby@^12.0.2: - version "12.2.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-12.2.0.tgz#2ab8046b4fba4ff6eede835b29f678f90e3d3c22" - integrity sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA== +globby@^13.1.1: + version "13.1.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.4.tgz#2f91c116066bcec152465ba36e5caa4a13c01317" + integrity sha512-iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g== dependencies: - array-union "^3.0.1" dir-glob "^3.0.1" - fast-glob "^3.2.7" - ignore "^5.1.9" + fast-glob "^3.2.11" + ignore "^5.2.0" merge2 "^1.4.1" slash "^4.0.0" @@ -4141,18 +5308,11 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-symbols@^1.0.1, has-symbols@^1.0.2: +has-symbols@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== - dependencies: - has-symbols "^1.0.2" - has-yarn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" @@ -4178,17 +5338,6 @@ hast-to-hyperscript@^9.0.0: unist-util-is "^4.0.0" web-namespaces "^1.0.0" -hast-util-from-parse5@^5.0.0: - version "5.0.3" - resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" - integrity sha512-gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA== - dependencies: - ccount "^1.0.3" - hastscript "^5.0.0" - property-information "^5.0.0" - web-namespaces "^1.1.2" - xtend "^4.0.1" - hast-util-from-parse5@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" @@ -4233,16 +5382,6 @@ hast-util-to-parse5@^6.0.0: xtend "^4.0.0" zwitch "^1.0.0" -hastscript@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" - integrity sha512-WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ== - dependencies: - comma-separated-tokens "^1.0.0" - hast-util-parse-selector "^2.0.0" - property-information "^5.0.0" - space-separated-tokens "^1.0.0" - hastscript@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" @@ -4306,10 +5445,10 @@ html-minifier-terser@^6.0.2, html-minifier-terser@^6.1.0: relateurl "^0.2.7" terser "^5.10.0" -html-tags@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" - integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg== +html-tags@^3.2.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce" + integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ== html-void-elements@^1.0.0: version "1.0.5" @@ -4327,18 +5466,6 @@ html-webpack-plugin@^5.5.0: pretty-error "^4.0.0" tapable "^2.0.0" -htmlparser2@^3.9.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" - integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== - dependencies: - domelementtype "^1.3.1" - domhandler "^2.3.0" - domutils "^1.5.1" - entities "^1.1.1" - inherits "^2.0.1" - readable-stream "^3.1.1" - htmlparser2@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" @@ -4349,6 +5476,16 @@ htmlparser2@^6.1.0: domutils "^2.5.2" entities "^2.0.0" +htmlparser2@^8.0.1: + version "8.0.2" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21" + integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.0.1" + entities "^4.4.0" + http-cache-semantics@^4.0.0: version "4.1.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" @@ -4359,15 +5496,15 @@ http-deceiver@^1.2.7: resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= -http-errors@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" - integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== dependencies: - depd "~1.1.2" + depd "2.0.0" inherits "2.0.4" setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" + statuses "2.0.1" toidentifier "1.0.1" http-errors@~1.6.2: @@ -4385,10 +5522,10 @@ http-parser-js@>=0.5.1: resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.6.tgz#2e02406ab2df8af8a7abfba62e0da01c62b95afd" integrity sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA== -http-proxy-middleware@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.3.tgz#5df04f69a89f530c2284cd71eeaa51ba52243289" - integrity sha512-1bloEwnrHMnCoO/Gcwbz7eSVvW50KPES01PecpagI+YLNLci4AcuKJrujW4Mc3sBLpFxMSlsLNHS5Nl/lvrTPA== +http-proxy-middleware@^2.0.3: + version "2.0.6" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" + integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== dependencies: "@types/http-proxy" "^1.17.8" http-proxy "^1.18.1" @@ -4422,7 +5559,7 @@ icss-utils@^5.0.0, icss-utils@^5.1.0: resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== -ignore@^5.1.9, ignore@^5.2.0: +ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -4467,10 +5604,10 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== -infima@0.2.0-alpha.37: - version "0.2.0-alpha.37" - resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.37.tgz#b87ff42d528d6d050098a560f0294fbdd12adb78" - integrity sha512-4GX7Baw+/lwS4PPW/UJNY89tWSvYG1DL6baKVdpK6mC593iRgMssxNtORMTFArLPJ/A/lzsGhRmx+z6MaMxj0Q== +infima@0.2.0-alpha.43: + version "0.2.0-alpha.43" + resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.43.tgz#f7aa1d7b30b6c08afef441c726bac6150228cbe0" + integrity sha512-2uw57LvUqW0rK/SWYnd/2rRfxNA5DDNOh33jxF7fy46VWoNhGxiUQyVZHbBMjQ33mQem0cjdDVwgWVAmlRfgyQ== inflight@^1.0.4: version "1.0.6" @@ -4517,11 +5654,6 @@ invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -ip@^1.1.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= - ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -4545,14 +5677,6 @@ is-alphanumerical@^1.0.0: is-alphabetical "^1.0.0" is-decimal "^1.0.0" -is-arguments@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -4584,13 +5708,6 @@ is-core-module@^2.8.1: dependencies: has "^1.0.3" -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - is-decimal@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" @@ -4683,14 +5800,6 @@ is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-regex@^1.0.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - is-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" @@ -4753,7 +5862,19 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -jest-worker@^27.0.2, jest-worker@^27.4.5: +jest-util@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f" + integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ== + dependencies: + "@jest/types" "^29.5.0" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" + +jest-worker@^27.4.5: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== @@ -4762,6 +5883,16 @@ jest-worker@^27.0.2, jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" +jest-worker@^29.1.2: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d" + integrity sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA== + dependencies: + "@types/node" "*" + jest-util "^29.5.0" + merge-stream "^2.0.0" + supports-color "^8.0.0" + joi@^17.6.0: version "17.6.0" resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2" @@ -4808,12 +5939,7 @@ json-buffer@3.0.0: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= -json-parse-better-errors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== - -json-parse-even-better-errors@^2.3.0: +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== @@ -4828,13 +5954,6 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json5@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" - integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== - dependencies: - minimist "^1.2.0" - json5@^2.1.2: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" @@ -4842,6 +5961,11 @@ json5@^2.1.2: dependencies: minimist "^1.2.5" +json5@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== + jsonfile@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" @@ -4868,11 +5992,16 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -klona@^2.0.4, klona@^2.0.5: +klona@^2.0.4: version "2.0.5" resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== +klona@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" + integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== + latest-version@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" @@ -4880,6 +6009,14 @@ latest-version@^5.1.0: dependencies: package-json "^6.3.0" +launch-editor@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7" + integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ== + dependencies: + picocolors "^1.0.0" + shell-quote "^1.7.3" + leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -4900,15 +6037,6 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== -loader-utils@^1.4.0: - version "1.4.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" - integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" - loader-utils@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" @@ -4945,16 +6073,6 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash.assignin@^4.0.9: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" - integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= - -lodash.bind@^4.1.4: - version "4.2.1" - resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" - integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU= - lodash.curry@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170" @@ -4965,72 +6083,22 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= -lodash.defaults@^4.0.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= - -lodash.filter@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" - integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= - -lodash.flatten@^4.2.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= - lodash.flow@^3.3.0: version "3.5.0" resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a" integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o= -lodash.foreach@^4.3.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" - integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= - -lodash.map@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" - integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= - lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= -lodash.merge@^4.4.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash.pick@^4.2.1: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" - integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= - -lodash.reduce@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" - integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs= - -lodash.reject@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" - integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU= - -lodash.some@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" - integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0= - lodash.uniq@4.5.0, lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: +lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5059,6 +6127,13 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -5161,6 +6236,14 @@ micromatch@^4.0.2, micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" +micromatch@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + dependencies: + braces "^3.0.2" + picomatch "^2.3.1" + mime-db@1.51.0: version "1.51.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" @@ -5205,18 +6288,10 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -mini-create-react-context@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" - integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ== - dependencies: - "@babel/runtime" "^7.12.1" - tiny-warning "^1.0.3" - -mini-css-extract-plugin@^2.5.3: - version "2.6.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.0.tgz#578aebc7fc14d32c0ad304c2c34f08af44673f5e" - integrity sha512-ndG8nxCEnAemsg4FSgS+yNyHKgkTB4nPKqCOgh65j3/30qqC5RaSQQXMm++Y6sb6E1zRSxPkztj9fqxhS1Eo6w== +mini-css-extract-plugin@^2.6.1: + version "2.7.5" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.5.tgz#afbb344977659ec0f1f6e050c7aea456b121cfc5" + integrity sha512-9HaR++0mlgom81s95vvNjxkg52n2b5s//3ZTI1EtzFb98awsLSivs2LMsVqnQ3ay0PVhqWcGNyDaTE961FOcjQ== dependencies: schema-utils "^4.0.0" @@ -5244,13 +6319,6 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== -mkdirp@^0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - mrmime@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.0.tgz#14d387f0585a5233d291baba339b063752a2398b" @@ -5266,22 +6334,17 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.1.1: +ms@2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multicast-dns-service-types@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" - integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= - -multicast-dns@^6.0.1: - version "6.2.3" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" - integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== +multicast-dns@^7.2.5: + version "7.2.5" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" + integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg== dependencies: - dns-packet "^1.3.1" + dns-packet "^5.2.2" thunky "^1.0.2" nanoid@^3.3.1: @@ -5289,6 +6352,11 @@ nanoid@^3.3.1: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== +nanoid@^3.3.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" + integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== + negotiator@0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -5321,7 +6389,7 @@ node-fetch@2.6.7: dependencies: whatwg-url "^5.0.0" -node-forge@^1.2.0: +node-forge@^1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== @@ -5331,6 +6399,11 @@ node-releases@^2.0.2: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg== +node-releases@^2.0.8: + version "2.0.10" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" + integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w== + normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" @@ -5370,25 +6443,15 @@ nth-check@^2.0.1: dependencies: boolbase "^1.0.0" -nth-check@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" - integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== - dependencies: - boolbase "~1.0.0" - object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -object-is@^1.0.1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" +object-inspect@^1.9.0: + version "1.12.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" + integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" @@ -5410,10 +6473,10 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= +on-finished@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== dependencies: ee-first "1.1.1" @@ -5562,23 +6625,26 @@ parse-numeric-range@^1.3.0: resolved "https://registry.yarnpkg.com/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz#7c63b61190d61e4d53a1197f0c83c47bb670ffa3" integrity sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ== -parse5-htmlparser2-tree-adapter@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" - integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== +parse5-htmlparser2-tree-adapter@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz#23c2cc233bcf09bb7beba8b8a69d46b08c62c2f1" + integrity sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g== dependencies: - parse5 "^6.0.1" + domhandler "^5.0.2" + parse5 "^7.0.0" -parse5@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== - -parse5@^6.0.0, parse5@^6.0.1: +parse5@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +parse5@^7.0.0: + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + dependencies: + entities "^4.4.0" + parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -5649,7 +6715,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -5668,15 +6734,6 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" -portfinder@^1.0.28: - version "1.0.28" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" - integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== - dependencies: - async "^2.6.2" - debug "^3.1.1" - mkdirp "^0.5.5" - postcss-calc@^8.2.3: version "8.2.4" resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5" @@ -5685,37 +6742,38 @@ postcss-calc@^8.2.3: postcss-selector-parser "^6.0.9" postcss-value-parser "^4.2.0" -postcss-colormin@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a" - integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg== +postcss-colormin@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.1.tgz#86c27c26ed6ba00d96c79e08f3ffb418d1d1988f" + integrity sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" caniuse-api "^3.0.0" colord "^2.9.1" postcss-value-parser "^4.2.0" -postcss-convert-values@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz#f8d3abe40b4ce4b1470702a0706343eac17e7c10" - integrity sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g== +postcss-convert-values@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393" + integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA== dependencies: + browserslist "^4.21.4" postcss-value-parser "^4.2.0" -postcss-discard-comments@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.0.tgz#87be4e0953bf599935837b940c701f8d4eca7d0b" - integrity sha512-L0IKF4jAshRyn03SkEO6ar/Ipz2oLywVbg2THf2EqqdNkBwmVMxuTR/RoAltOw4piiaLt3gCAdrbAqmTBInmhg== +postcss-discard-comments@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696" + integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ== postcss-discard-duplicates@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw== -postcss-discard-empty@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.0.tgz#7f51b16cd1b89f8180bbc7cee34d6cbabf2ef810" - integrity sha512-782T/buGgb3HOuHOJAHpdyKzAAKsv/BxWqsutnZ+QsiHEcDkY7v+6WWdturuBiSal6XMOO1p1aJvwXdqLD5vhA== +postcss-discard-empty@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c" + integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A== postcss-discard-overridden@^5.1.0: version "5.1.0" @@ -5729,37 +6787,38 @@ postcss-discard-unused@^5.1.0: dependencies: postcss-selector-parser "^6.0.5" -postcss-loader@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef" - integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q== +postcss-loader@^7.0.0: + version "7.2.4" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.2.4.tgz#2884f4ca172de633b2cf1f93dc852968f0632ba9" + integrity sha512-F88rpxxNspo5hatIc+orYwZDtHFaVFOSIVAx+fBfJC1GmhWbVmPWtmg2gXKE1OxJbneOSGn8PWdIwsZFcruS+w== dependencies: - cosmiconfig "^7.0.0" - klona "^2.0.5" - semver "^7.3.5" + cosmiconfig "^8.1.3" + cosmiconfig-typescript-loader "^4.3.0" + klona "^2.0.6" + semver "^7.3.8" -postcss-merge-idents@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-5.1.0.tgz#948e1183cd659cfb5f99c7389f5fcec83c8f9a00" - integrity sha512-l+awq6+uUiCILsHahWK5KE25495I4oCKlUrIA+EdBvklnVdWlBEsbkzq5+ouPKb8OAe4WwRBgFvaSq7f77FY+w== +postcss-merge-idents@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-5.1.1.tgz#7753817c2e0b75d0853b56f78a89771e15ca04a1" + integrity sha512-pCijL1TREiCoog5nQp7wUe+TUonA2tC2sQ54UGeMmryK3UFGIYKqDyjnqd6RcuI4znFn9hWSLNN8xKE/vWcUQw== dependencies: cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-merge-longhand@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.0.tgz#f716bffbf0bdfbde6ea78c36088e21559f8a0a95" - integrity sha512-Gr46srN2tsLD8fudKYoHO56RG0BLQ2nsBRnSZGY04eNBPwTeWa9KeHrbL3tOLAHyB2aliikycPH2TMJG1U+W6g== +postcss-merge-longhand@^5.1.7: + version "5.1.7" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz#24a1bdf402d9ef0e70f568f39bdc0344d568fb16" + integrity sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ== dependencies: postcss-value-parser "^4.2.0" - stylehacks "^5.1.0" + stylehacks "^5.1.1" -postcss-merge-rules@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.0.tgz#a2d5117eba09c8686a5471d97bd9afcf30d1b41f" - integrity sha512-NecukEJovQ0mG7h7xV8wbYAkXGTO3MPKnXvuiXzOKcxoOodfTTKYjeo8TMhAswlSkjcPIBlnKbSFcTuVSDaPyQ== +postcss-merge-rules@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz#2f26fa5cacb75b1402e213789f6766ae5e40313c" + integrity sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" caniuse-api "^3.0.0" cssnano-utils "^3.1.0" postcss-selector-parser "^6.0.5" @@ -5771,28 +6830,28 @@ postcss-minify-font-values@^5.1.0: dependencies: postcss-value-parser "^4.2.0" -postcss-minify-gradients@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.0.tgz#de0260a67a13b7b321a8adc3150725f2c6612377" - integrity sha512-J/TMLklkONn3LuL8wCwfwU8zKC1hpS6VcxFkNUNjmVt53uKqrrykR3ov11mdUYyqVMEx67slMce0tE14cE4DTg== +postcss-minify-gradients@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c" + integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw== dependencies: colord "^2.9.1" cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-minify-params@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.0.tgz#e0b1f4e05cfd396682f612856485907e4064f25e" - integrity sha512-q67dcts4Hct6x8+JmhBgctHkbvUsqGIg2IItenjE63iZXMbhjr7AlVZkNnKtIGt/1Wsv7p/7YzeSII6Q+KPXRg== +postcss-minify-params@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352" + integrity sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-minify-selectors@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c" - integrity sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA== +postcss-minify-selectors@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6" + integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg== dependencies: postcss-selector-parser "^6.0.5" @@ -5836,17 +6895,17 @@ postcss-normalize-display-values@^5.1.0: dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-positions@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz#902a7cb97cf0b9e8b1b654d4a43d451e48966458" - integrity sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ== +postcss-normalize-positions@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92" + integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-repeat-style@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz#f6d6fd5a54f51a741cc84a37f7459e60ef7a6398" - integrity sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw== +postcss-normalize-repeat-style@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2" + integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g== dependencies: postcss-value-parser "^4.2.0" @@ -5864,12 +6923,12 @@ postcss-normalize-timing-functions@^5.1.0: dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-unicode@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75" - integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ== +postcss-normalize-unicode@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030" + integrity sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" postcss-value-parser "^4.2.0" postcss-normalize-url@^5.1.0: @@ -5880,34 +6939,34 @@ postcss-normalize-url@^5.1.0: normalize-url "^6.0.1" postcss-value-parser "^4.2.0" -postcss-normalize-whitespace@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.0.tgz#aed8b4580c9ad6e8eac034177291187ea16a059c" - integrity sha512-7O1FanKaJkpWFyCghFzIkLhehujV/frGkdofGLwhg5upbLyGsSfiTcZAdSzoPsSUgyPCkBkNMeWR8yVgPdQybg== +postcss-normalize-whitespace@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa" + integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA== dependencies: postcss-value-parser "^4.2.0" -postcss-ordered-values@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.0.tgz#04ef429e0991b0292bc918b135cd4c038f7b889f" - integrity sha512-wU4Z4D4uOIH+BUKkYid36gGDJNQtkVJT7Twv8qH6UyfttbbJWyw4/xIPuVEkkCtQLAJ0EdsNSh8dlvqkXb49TA== +postcss-ordered-values@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38" + integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ== dependencies: cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-reduce-idents@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-5.1.0.tgz#386b65cf861a9045663bd349d572027ab138ca4a" - integrity sha512-2xDoPTzv98D/HFDrGTgVEBlcuS47wvua2oc4g2WoZdYPwzPWMWb2TCRruCyN7vbl+HAtVLGvEOMZIZb3wYgv7w== +postcss-reduce-idents@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-5.2.0.tgz#c89c11336c432ac4b28792f24778859a67dfba95" + integrity sha512-BTrLjICoSB6gxbc58D5mdBK8OhXRDqud/zodYfdSi52qvDHdMwk+9kB9xsM8yJThH/sZU5A6QVSmMmaN001gIg== dependencies: postcss-value-parser "^4.2.0" -postcss-reduce-initial@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6" - integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw== +postcss-reduce-initial@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz#798cd77b3e033eae7105c18c9d371d989e1382d6" + integrity sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" caniuse-api "^3.0.0" postcss-reduce-transforms@^5.1.0: @@ -5940,10 +6999,10 @@ postcss-svgo@^5.1.0: postcss-value-parser "^4.2.0" svgo "^2.7.0" -postcss-unique-selectors@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.0.tgz#70a945da1b0599d00f617222a44ba1d82a676694" - integrity sha512-LmUhgGobtpeVJJHuogzjLRwJlN7VH+BL5c9GKMVJSS/ejoyePZkXvNsYUtk//F6vKOGK86gfRS0xH7fXQSDtvA== +postcss-unique-selectors@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" + integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA== dependencies: postcss-selector-parser "^6.0.5" @@ -5957,7 +7016,7 @@ postcss-zindex@^5.1.0: resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-5.1.0.tgz#4a5c7e5ff1050bd4c01d95b1847dfdcc58a496ff" integrity sha512-fgFMf0OtVSBR1va1JNHYgMxYk73yhn/qb4uQDq1DLGYolz8gHCyr/sesEuGUaYs58E3ZJRcpoGuPVoB7Meiq9A== -postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.7: +postcss@^8.3.11: version "8.4.8" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.8.tgz#dad963a76e82c081a0657d3a2f3602ce10c2e032" integrity sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ== @@ -5966,6 +7025,15 @@ postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.7: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.19: + version "8.4.23" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.23.tgz#df0aee9ac7c5e53e1075c24a3613496f9e6552ab" + integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA== + dependencies: + nanoid "^3.3.6" + picocolors "^1.0.0" + source-map-js "^1.0.2" + prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -5984,15 +7052,20 @@ pretty-time@^1.1.0: resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA== -prism-react-renderer@^1.2.1, prism-react-renderer@^1.3.1: +prism-react-renderer@^1.2.1: version "1.3.1" resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.1.tgz#88fc9d0df6bed06ca2b9097421349f8c2f24e30d" integrity sha512-xUeDMEz074d0zc5y6rxiMp/dlC7C+5IDDlaEUlcBOFE2wddz7hz5PNupb087mPwTt7T9BrFmewObfCBuf/LKwQ== -prismjs@^1.27.0: - version "1.27.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057" - integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA== +prism-react-renderer@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.5.tgz#786bb69aa6f73c32ba1ee813fbe17a0115435085" + integrity sha512-IJ+MSwBWKG+SM3b2SUfdrhC+gu01QkV2KmRQgREThBfSQRoufqRfxfHUxpG1WcaFjP+kojcFyO9Qqtpgt3qLCg== + +prismjs@^1.28.0: + version "1.29.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12" + integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q== process-nextick-args@~2.0.0: version "2.0.1" @@ -6046,11 +7119,6 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= - punycode@^1.3.2: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" @@ -6073,20 +7141,12 @@ pure-color@^1.2.0: resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e" integrity sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4= -qs@6.9.7: - version "6.9.7" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" - integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== - -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= - -querystring@0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" - integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== +qs@6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" queue-microtask@^1.2.2: version "1.2.3" @@ -6117,13 +7177,13 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" - integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g== +raw-body@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" + integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== dependencies: bytes "3.1.2" - http-errors "1.8.1" + http-errors "2.0.0" iconv-lite "0.4.24" unpipe "1.0.0" @@ -6147,10 +7207,10 @@ react-base16-styling@^0.6.0: lodash.flow "^3.3.0" pure-color "^1.2.0" -react-dev-utils@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.0.tgz#4eab12cdb95692a077616770b5988f0adf806526" - integrity sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ== +react-dev-utils@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73" + integrity sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ== dependencies: "@babel/code-frame" "^7.16.0" address "^1.1.2" @@ -6171,7 +7231,7 @@ react-dev-utils@^12.0.0: open "^8.4.0" pkg-up "^3.1.0" prompts "^2.4.2" - react-error-overlay "^6.0.10" + react-error-overlay "^6.0.11" recursive-readdir "^2.2.2" shell-quote "^1.7.3" strip-ansi "^6.0.1" @@ -6186,17 +7246,17 @@ react-dom@^17.0.1: object-assign "^4.1.1" scheduler "^0.20.2" -react-error-overlay@^6.0.10: - version "6.0.10" - resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.10.tgz#0fe26db4fa85d9dbb8624729580e90e7159a59a6" - integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA== +react-error-overlay@^6.0.11: + version "6.0.11" + resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb" + integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg== react-fast-compare@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== -react-helmet-async@*, react-helmet-async@^1.2.3: +react-helmet-async@*: version "1.2.3" resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.2.3.tgz#57326a69304ea3293036eafb49475e9ba454cb37" integrity sha512-mCk2silF53Tq/YaYdkl2sB+/tDoPnaxN7dFS/6ZLJb/rhUY2EWGI5Xj2b4jHppScMqY45MbgPSwTxDchKpZ5Kw== @@ -6207,6 +7267,17 @@ react-helmet-async@*, react-helmet-async@^1.2.3: react-fast-compare "^3.2.0" shallowequal "^1.1.0" +react-helmet-async@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.3.0.tgz#7bd5bf8c5c69ea9f02f6083f14ce33ef545c222e" + integrity sha512-9jZ57/dAn9t3q6hneQS0wukqC2ENOBgMNVEhb/ZG9ZSxUetzVIw4iAmEU38IaVg3QGYauQPhSeUTuIUtFglWpg== + dependencies: + "@babel/runtime" "^7.12.5" + invariant "^2.2.4" + prop-types "^15.7.2" + react-fast-compare "^3.2.0" + shallowequal "^1.1.0" + react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -6241,29 +7312,28 @@ react-router-config@^5.1.1: dependencies: "@babel/runtime" "^7.1.2" -react-router-dom@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" - integrity sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ== +react-router-dom@^5.3.3: + version "5.3.4" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6" + integrity sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ== dependencies: "@babel/runtime" "^7.12.13" history "^4.9.0" loose-envify "^1.3.1" prop-types "^15.6.2" - react-router "5.2.1" + react-router "5.3.4" tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-router@5.2.1, react-router@^5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" - integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ== +react-router@5.3.4, react-router@^5.3.3: + version "5.3.4" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.4.tgz#8ca252d70fcc37841e31473c7a151cf777887bb5" + integrity sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA== dependencies: "@babel/runtime" "^7.12.13" history "^4.9.0" hoist-non-react-statics "^3.1.0" loose-envify "^1.3.1" - mini-create-react-context "^0.4.0" path-to-regexp "^1.7.0" prop-types "^15.6.2" react-is "^16.6.0" @@ -6300,7 +7370,7 @@ readable-stream@^2.0.1: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.0.6, readable-stream@^3.1.1: +readable-stream@^3.0.6: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -6342,11 +7412,23 @@ regenerate-unicode-properties@^10.0.1: dependencies: regenerate "^1.4.2" +regenerate-unicode-properties@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c" + integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ== + dependencies: + regenerate "^1.4.2" + regenerate@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== +regenerator-runtime@^0.13.11: + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== + regenerator-runtime@^0.13.4: version "0.13.9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" @@ -6359,13 +7441,12 @@ regenerator-transform@^0.14.2: dependencies: "@babel/runtime" "^7.8.4" -regexp.prototype.flags@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" - integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== +regenerator-transform@^0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56" + integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" + "@babel/runtime" "^7.8.4" regexpu-core@^5.0.1: version "5.0.1" @@ -6379,6 +7460,18 @@ regexpu-core@^5.0.1: unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.0.0" +regexpu-core@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" + integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ== + dependencies: + "@babel/regjsgen" "^0.8.0" + regenerate "^1.4.2" + regenerate-unicode-properties "^10.1.0" + regjsparser "^0.9.1" + unicode-match-property-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.1.0" + registry-auth-token@^4.0.0: version "4.2.1" resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" @@ -6405,30 +7498,19 @@ regjsparser@^0.8.2: dependencies: jsesc "~0.5.0" -rehype-parse@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" - integrity sha512-0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug== +regjsparser@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" + integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ== dependencies: - hast-util-from-parse5 "^5.0.0" - parse5 "^5.0.0" - xtend "^4.0.0" + jsesc "~0.5.0" relateurl@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= -remark-admonitions@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/remark-admonitions/-/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" - integrity sha512-Ji6p68VDvD+H1oS95Fdx9Ar5WA2wcDA4kwrrhVU7fGctC6+d3uiMICu7w7/2Xld+lnU7/gi+432+rRbup5S8ow== - dependencies: - rehype-parse "^6.0.2" - unified "^8.4.2" - unist-util-visit "^2.0.1" - -remark-emoji@^2.1.0: +remark-emoji@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/remark-emoji/-/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" integrity sha512-P3cj9s5ggsUvWw5fS2uzCHJMGuXYRb0NnZqYlNecewXt8QBU9n5vW3DUUKOhepS8F9CwdMx9B8a3i7pqFWAI5w== @@ -6578,7 +7660,7 @@ rtl-detect@^1.0.4: resolved "https://registry.yarnpkg.com/rtl-detect/-/rtl-detect-1.0.4.tgz#40ae0ea7302a150b96bc75af7d749607392ecac6" integrity sha512-EBR4I2VDSSYr7PkBmFy04uhycIpDKp+21p/jARYXlCSjQksTBQcJ0HFUPOO79EPPH5JS6VAhiIQbycf0O3JAxQ== -rtlcss@^3.3.0: +rtlcss@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-3.5.0.tgz#c9eb91269827a102bac7ae3115dd5d049de636c3" integrity sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A== @@ -6607,7 +7689,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -6668,7 +7750,7 @@ schema-utils@^2.6.5: ajv "^6.12.4" ajv-keywords "^3.5.2" -schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: +schema-utils@^3.0.0, schema-utils@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== @@ -6677,6 +7759,15 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" +schema-utils@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.2.tgz#36c10abca6f7577aeae136c804b0c741edeadc99" + integrity sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + schema-utils@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" @@ -6700,12 +7791,12 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selfsigned@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b" - integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ== +selfsigned@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" + integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== dependencies: - node-forge "^1.2.0" + node-forge "^1" semver-diff@^3.1.1: version "3.1.1" @@ -6729,31 +7820,38 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: +semver@^7.3.2, semver@^7.3.4: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" -send@0.17.2: - version "0.17.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" - integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== +semver@^7.3.7, semver@^7.3.8: + version "7.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" + integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== + dependencies: + lru-cache "^6.0.0" + +send@0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" + integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== dependencies: debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" + depd "2.0.0" + destroy "1.2.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" - http-errors "1.8.1" + http-errors "2.0.0" mime "1.6.0" ms "2.1.3" - on-finished "~2.3.0" + on-finished "2.4.1" range-parser "~1.2.1" - statuses "~1.5.0" + statuses "2.0.1" serialize-javascript@^6.0.0: version "6.0.0" @@ -6762,6 +7860,13 @@ serialize-javascript@^6.0.0: dependencies: randombytes "^2.1.0" +serialize-javascript@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" + integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== + dependencies: + randombytes "^2.1.0" + serve-handler@^6.1.3: version "6.1.3" resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.3.tgz#1bf8c5ae138712af55c758477533b9117f6435e8" @@ -6789,15 +7894,15 @@ serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.14.2: - version "1.14.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" - integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== +serve-static@1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.17.2" + send "0.18.0" setimmediate@^1.0.5: version "1.0.5" @@ -6852,6 +7957,15 @@ shelljs@^0.8.5: interpret "^1.0.0" rechoir "^0.6.2" +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" @@ -6891,7 +8005,7 @@ slash@^4.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== -sockjs@^0.3.21: +sockjs@^0.3.24: version "0.3.24" resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== @@ -6905,11 +8019,6 @@ sort-css-media-queries@2.0.4: resolved "https://registry.yarnpkg.com/sort-css-media-queries/-/sort-css-media-queries-2.0.4.tgz#b2badfa519cb4a938acbc6d3aaa913d4949dc908" integrity sha512-PAIsEK/XupCQwitjv7XxoMvYhT7EAfyzI3hsy/MyDgTvc+Ft55ctdkctJLOy6cQejaIC+zjpUL4djFVm2ivOOw== -source-list-map@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== - "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" @@ -6928,7 +8037,7 @@ source-map@^0.5.0: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== @@ -6976,7 +8085,12 @@ state-toggle@^1.0.0: resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ== -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + +"statuses@>= 1.4.0 < 2": version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= @@ -7034,7 +8148,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.0, strip-ansi@^7.0.1: +strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== @@ -7068,12 +8182,12 @@ style-to-object@0.3.0, style-to-object@^0.3.0: dependencies: inline-style-parser "0.1.1" -stylehacks@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520" - integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q== +stylehacks@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9" + integrity sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" postcss-selector-parser "^6.0.4" supports-color@^5.3.0: @@ -7130,18 +8244,18 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54" - integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g== +terser-webpack-plugin@^5.3.3, terser-webpack-plugin@^5.3.7: + version "5.3.7" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz#ef760632d24991760f339fe9290deb936ad1ffc7" + integrity sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw== dependencies: + "@jridgewell/trace-mapping" "^0.3.17" jest-worker "^27.4.5" schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - terser "^5.7.2" + serialize-javascript "^6.0.1" + terser "^5.16.5" -terser@^5.10.0, terser@^5.7.2: +terser@^5.10.0: version "5.14.2" resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== @@ -7151,6 +8265,16 @@ terser@^5.10.0, terser@^5.7.2: commander "^2.20.0" source-map-support "~0.5.20" +terser@^5.16.5: + version "5.17.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.1.tgz#948f10830454761e2eeedc6debe45c532c83fd69" + integrity sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw== + dependencies: + "@jridgewell/source-map" "^0.3.2" + acorn "^8.5.0" + commander "^2.20.0" + source-map-support "~0.5.20" + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -7161,17 +8285,12 @@ thunky@^1.0.2: resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== -timsort@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" - integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= - tiny-invariant@^1.0.2: version "1.2.0" resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg== -tiny-warning@^1.0.0, tiny-warning@^1.0.3: +tiny-warning@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== @@ -7223,11 +8342,16 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== -tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1: +tslib@^2.0.3, tslib@^2.1.0: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +tslib@^2.4.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== + type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" @@ -7284,6 +8408,11 @@ unicode-match-property-value-ecmascript@^2.0.0: resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== +unicode-match-property-value-ecmascript@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0" + integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA== + unicode-property-aliases-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" @@ -7301,13 +8430,14 @@ unified@9.2.0: trough "^1.0.0" vfile "^4.0.0" -unified@^8.4.2: - version "8.4.2" - resolved "https://registry.yarnpkg.com/unified/-/unified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" - integrity sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA== +unified@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.2.tgz#67649a1abfc3ab85d2969502902775eb03146975" + integrity sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ== dependencies: bail "^1.0.0" extend "^3.0.0" + is-buffer "^2.0.0" is-plain-obj "^2.0.0" trough "^1.0.0" vfile "^4.0.0" @@ -7368,7 +8498,7 @@ unist-util-visit-parents@^3.0.0: "@types/unist" "^2.0.0" unist-util-is "^4.0.0" -unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3: +unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== @@ -7387,6 +8517,14 @@ unpipe@1.0.0, unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= +update-browserslist-db@^1.0.10: + version "1.0.11" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" + integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + update-notifier@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" @@ -7430,14 +8568,6 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= - dependencies: - punycode "1.3.2" - querystring "0.2.0" - use-composed-ref@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.2.1.tgz#9bdcb5ccd894289105da2325e1210079f56bf849" @@ -7455,6 +8585,11 @@ use-latest@^1.0.0: dependencies: use-isomorphic-layout-effect "^1.0.0" +use-sync-external-store@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" + integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== + util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -7524,10 +8659,10 @@ wait-on@^6.0.1: minimist "^1.2.5" rxjs "^7.5.4" -watchpack@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" - integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== +watchpack@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" + integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" @@ -7539,7 +8674,7 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -web-namespaces@^1.0.0, web-namespaces@^1.1.2: +web-namespaces@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw== @@ -7575,41 +8710,41 @@ webpack-dev-middleware@^5.3.1: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@^4.7.4: - version "4.7.4" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz#d0ef7da78224578384e795ac228d8efb63d5f945" - integrity sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A== +webpack-dev-server@^4.9.3: + version "4.13.3" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.13.3.tgz#9feb740b8b56b886260bae1360286818a221bae8" + integrity sha512-KqqzrzMRSRy5ePz10VhjyL27K2dxqwXQLP5rAKwRJBPUahe7Z2bBWzHw37jeb8GCPKxZRO79ZdQUAPesMh/Nug== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" "@types/express" "^4.17.13" "@types/serve-index" "^1.9.1" + "@types/serve-static" "^1.13.10" "@types/sockjs" "^0.3.33" - "@types/ws" "^8.2.2" + "@types/ws" "^8.5.1" ansi-html-community "^0.0.8" - bonjour "^3.5.0" + bonjour-service "^1.0.11" chokidar "^3.5.3" colorette "^2.0.10" compression "^1.7.4" - connect-history-api-fallback "^1.6.0" + connect-history-api-fallback "^2.0.0" default-gateway "^6.0.3" - del "^6.0.0" - express "^4.17.1" + express "^4.17.3" graceful-fs "^4.2.6" html-entities "^2.3.2" - http-proxy-middleware "^2.0.0" + http-proxy-middleware "^2.0.3" ipaddr.js "^2.0.1" + launch-editor "^2.6.0" open "^8.0.9" p-retry "^4.5.0" - portfinder "^1.0.28" + rimraf "^3.0.2" schema-utils "^4.0.0" - selfsigned "^2.0.0" + selfsigned "^2.1.1" serve-index "^1.9.1" - sockjs "^0.3.21" + sockjs "^0.3.24" spdy "^4.0.2" - strip-ansi "^7.0.0" webpack-dev-middleware "^5.3.1" - ws "^8.4.2" + ws "^8.13.0" webpack-merge@^5.8.0: version "5.8.0" @@ -7619,47 +8754,39 @@ webpack-merge@^5.8.0: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - -webpack-sources@^3.2.3: +webpack-sources@^3.2.2, webpack-sources@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5.69.1: - version "5.70.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.70.0.tgz#3461e6287a72b5e6e2f4872700bc8de0d7500e6d" - integrity sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw== +webpack@^5.73.0: + version "5.80.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.80.0.tgz#3e660b4ab572be38c5e954bdaae7e2bf76010fdc" + integrity sha512-OIMiq37XK1rWO8mH9ssfFKZsXg4n6klTEDL7S8/HqbAOBBaiy8ABvXvz0dDCXeEF9gqwxSvVk611zFPjS8hJxA== dependencies: "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.4.1" + "@types/estree" "^1.0.0" + "@webassemblyjs/ast" "^1.11.5" + "@webassemblyjs/wasm-edit" "^1.11.5" + "@webassemblyjs/wasm-parser" "^1.11.5" + acorn "^8.7.1" acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.9.2" - es-module-lexer "^0.9.0" + enhanced-resolve "^5.13.0" + es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" graceful-fs "^4.2.9" - json-parse-better-errors "^1.0.2" + json-parse-even-better-errors "^2.3.1" loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" - schema-utils "^3.1.0" + schema-utils "^3.1.2" tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.3.1" + terser-webpack-plugin "^5.3.7" + watchpack "^2.4.0" webpack-sources "^3.2.3" webpackbar@^5.0.2: @@ -7765,10 +8892,10 @@ ws@^7.3.1: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== -ws@^8.4.2: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== +ws@^8.13.0: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== xdg-basedir@^4.0.0: version "4.0.0" @@ -7792,6 +8919,11 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" From c8fecfe9762eb153f4f1a64da1612294922cb0b1 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Thu, 4 May 2023 11:43:17 +0800 Subject: [PATCH 033/233] Upgrade jetty version to 9.4.51.v20230217 (#3937) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Motivation #### [CVE-2023-26048](https://www.cve.org/CVERecord?id=CVE-2023-26048) Detailed paths Introduced through: org.apache.bookkeeper:bookkeeper-dist-all@4.16.0-SNAPSHOT › org.apache.bookkeeper.stats:prometheus-metrics-provider@4.16.0-SNAPSHOT › org.eclipse.jetty:jetty-servlet@9.4.48.v20220622 › org.eclipse.jetty:jetty-security@9.4.48.v20220622 › org.eclipse.jetty:jetty-server@9.4.48.v20220622 Fix: No remediation path available. ### Changes Upgrade jetty version to 9.4.51.v20230217 to resolve this CVE. (cherry picked from commit fffcca08bd1829b968b66439029b8e4f57f1e49e) --- .../src/main/resources/LICENSE-all.bin.txt | 14 +++++++------- .../src/main/resources/LICENSE-server.bin.txt | 14 +++++++------- .../src/main/resources/NOTICE-all.bin.txt | 16 ++++++++-------- .../src/main/resources/NOTICE-server.bin.txt | 16 ++++++++-------- pom.xml | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 0fce3d3d325..6683dc42203 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -263,13 +263,13 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.8.1.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.8.1.jar [21] - lib/org.apache.zookeeper-zookeeper-3.8.1-tests.jar [21] -- lib/org.eclipse.jetty-jetty-http-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-io-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-security-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-server-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-servlet-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-util-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.48.v20220622.jar [22] +- lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-server-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-servlet-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.51.v20230217.jar [22] - lib/org.rocksdb-rocksdbjni-7.9.2.jar [23] - lib/com.beust-jcommander-1.82.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index 51e2d3d5c81..6f5c9f9d604 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -263,13 +263,13 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.8.1.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.8.1.jar [21] - lib/org.apache.zookeeper-zookeeper-3.8.1-tests.jar [21] -- lib/org.eclipse.jetty-jetty-http-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-io-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-security-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-server-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-servlet-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-util-9.4.48.v20220622.jar [22] -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.48.v20220622.jar [22] +- lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-server-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-servlet-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.51.v20230217.jar [22] - lib/org.rocksdb-rocksdbjni-7.9.2.jar [23] - lib/com.beust-jcommander-1.82.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index 80fac92bbc8..d2625bfe6f5 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -92,13 +92,13 @@ SoundCloud Ltd. (http://soundcloud.com/). This product includes software developed as part of the Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). ------------------------------------------------------------------------------------ -- lib/org.eclipse.jetty-jetty-http-9.4.48.v20220622.jar -- lib/org.eclipse.jetty-jetty-io-9.4.48.v20220622.jar -- lib/org.eclipse.jetty-jetty-security-9.4.48.v20220622jar -- lib/org.eclipse.jetty-jetty-server-9.4.48.v20220622.jar -- lib/org.eclipse.jetty-jetty-servlet-9.4.48.v20220622.jar -- lib/org.eclipse.jetty-jetty-util-9.4.48.v20220622.jar -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.48.v20220622.jar +- lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-server-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-servlet-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.51.v20230217.jar ============================================================== Jetty Web Container @@ -120,7 +120,7 @@ Jetty is dual licensed under both Jetty may be distributed under either license. -lib/org.eclipse.jetty-jetty-util-9.4.48.v20220622.jar bundles UnixCrypt +lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar bundles UnixCrypt The UnixCrypt.java code implements the one way cryptography used by Unix systems for simple password protection. Copyright 1996 Aki Yoshida, diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt index 9881716d7cd..961e8c798f8 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -74,13 +74,13 @@ SoundCloud Ltd. (http://soundcloud.com/). This product includes software developed as part of the Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). ------------------------------------------------------------------------------------ -- lib/org.eclipse.jetty-jetty-http-9.4.48.v20220622.jar -- lib/org.eclipse.jetty-jetty-io-9.4.48.v20220622.jar -- lib/org.eclipse.jetty-jetty-security-9.4.48.v20220622.jar -- lib/org.eclipse.jetty-jetty-server-9.4.48.v20220622.jar -- lib/org.eclipse.jetty-jetty-servlet-9.4.48.v20220622.jar -- lib/org.eclipse.jetty-jetty-util-9.4.48.v20220622.jar -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.48.v20220622.jar +- lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-server-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-servlet-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.51.v20230217.jar ============================================================== Jetty Web Container @@ -102,7 +102,7 @@ Jetty is dual licensed under both Jetty may be distributed under either license. -lib/org.eclipse.jetty-jetty-util-9.4.48.v20220622.jar bundles UnixCrypt +lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar bundles UnixCrypt The UnixCrypt.java code implements the one way cryptography used by Unix systems for simple password protection. Copyright 1996 Aki Yoshida, diff --git a/pom.xml b/pom.xml index b04d8e1acc4..4086dec3177 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ 2.1.10 2.13.4.20221013 1.82 - 9.4.48.v20220622 + 9.4.51.v20230217 1.19 2.8.2 1.14.3 From 8e8ea7a269f2fc6479f586f59ecd04f27740b18c Mon Sep 17 00:00:00 2001 From: wenbingshen Date: Wed, 10 May 2023 11:05:27 +0800 Subject: [PATCH 034/233] drop invalid entryFormat arg from shell command (#3938) (cherry picked from commit 551b2d5117672aecb3f41def6d98e7055f00bb91) --- bin/bookkeeper | 4 +--- conf/bkenv.sh | 3 --- site3/website/docs/reference/cli.md | 1 - tests/docker-images/statestore-image/bin/bookkeeper | 3 +-- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/bin/bookkeeper b/bin/bookkeeper index cffc267cc72..7ad73b655bb 100755 --- a/bin/bookkeeper +++ b/bin/bookkeeper @@ -87,7 +87,6 @@ Environment variables: BOOKIE_ZK_CONF Configuration file for zookeeper (default: $DEFAULT_ZK_CONF) BOOKIE_EXTRA_OPTS Extra options to be passed to the jvm BOOKIE_EXTRA_CLASSPATH Add extra paths to the bookkeeper classpath - ENTRY_FORMATTER_CLASS Entry formatter class to format entries. BOOKIE_PID_DIR Folder where the Bookie server PID file should be stored BOOKIE_STOP_TIMEOUT Wait time before forcefully kill the Bookie server instance, if the stop is not successful @@ -173,8 +172,7 @@ elif [ $COMMAND == "zookeeper" ]; then BOOKIE_LOG_FILE=${BOOKIE_LOG_FILE:-"zookeeper.log"} exec "${JAVA}" $OPTS -Dbookkeeper.log.file=$BOOKIE_LOG_FILE org.apache.zookeeper.server.quorum.QuorumPeerMain $BOOKIE_ZK_CONF $@ elif [ ${COMMAND} == "shell" ]; then - ENTRY_FORMATTER_ARG="-DentryFormatterClass=${ENTRY_FORMATTER_CLASS:-org.apache.bookkeeper.util.StringEntryFormatter}" - exec "${JAVA}" ${OPTS} ${ENTRY_FORMATTER_ARG} org.apache.bookkeeper.bookie.BookieShell -conf ${BOOKIE_CONF} $@ + exec "${JAVA}" ${OPTS} org.apache.bookkeeper.bookie.BookieShell -conf ${BOOKIE_CONF} $@ elif [ ${COMMAND} == "help" ]; then bookkeeper_help; else diff --git a/conf/bkenv.sh b/conf/bkenv.sh index 570e0c6f4a1..d6446f1d107 100644 --- a/conf/bkenv.sh +++ b/conf/bkenv.sh @@ -43,9 +43,6 @@ # Wait time before forcefully kill the Bookie server instance, if the stop is not successful # BOOKIE_STOP_TIMEOUT= -# Entry formatter class to format entries. -# ENTRY_FORMATTER_CLASS= - # this default config dir should match the 'localBookiesConfigDirectory' config value in the conf file of LocalBookKeeper # LOCALBOOKIES_CONFIG_DIR=/tmp/localbookies-config diff --git a/site3/website/docs/reference/cli.md b/site3/website/docs/reference/cli.md index 02b8486c44f..de003619ef5 100644 --- a/site3/website/docs/reference/cli.md +++ b/site3/website/docs/reference/cli.md @@ -14,7 +14,6 @@ Manages bookies. | `BOOKIE_LOG_CONF` | The Log4j configuration file. | `${bookkeeperHome}/bookkeeper-server/conf/log4j2.xml` | | `BOOKIE_CONF` | The configuration file for the bookie. | `${bookkeeperHome}/bookkeeper-server/conf/bk_server.conf` | | `BOOKIE_EXTRA_CLASSPATH` | Extra paths to add to BookKeeper's [classpath](https://en.wikipedia.org/wiki/Classpath_(Java)). | | -| `ENTRY_FORMATTER_CLASS` | The entry formatter class used to format entries. | | | `BOOKIE_PID_DIR` | The directory where the bookie server PID file is stored. | | | `BOOKIE_STOP_TIMEOUT` | The wait time before forcefully killing the bookie server instance if stopping it is not successful. | | diff --git a/tests/docker-images/statestore-image/bin/bookkeeper b/tests/docker-images/statestore-image/bin/bookkeeper index 5cbedc47b06..8135263024a 100755 --- a/tests/docker-images/statestore-image/bin/bookkeeper +++ b/tests/docker-images/statestore-image/bin/bookkeeper @@ -112,8 +112,7 @@ elif [ $COMMAND == "zookeeper" ]; then BOOKIE_LOG_FILE=${BOOKIE_LOG_FILE:-"zookeeper.log"} exec $JAVA $OPTS -Dbookkeeper.log.file=$BOOKIE_LOG_FILE -Dzookeeper.4lw.commands.whitelist='*' org.apache.zookeeper.server.quorum.QuorumPeerMain $BOOKIE_ZK_CONF $@ elif [ ${COMMAND} == "shell" ]; then - ENTRY_FORMATTER_ARG="-DentryFormatterClass=${ENTRY_FORMATTER_CLASS:-org.apache.bookkeeper.util.StringEntryFormatter}" - exec ${JAVA} ${OPTS} ${ENTRY_FORMATTER_ARG} org.apache.bookkeeper.bookie.BookieShell -conf ${BOOKIE_CONF} $@ + exec ${JAVA} ${OPTS} org.apache.bookkeeper.bookie.BookieShell -conf ${BOOKIE_CONF} $@ else exec ${JAVA} ${OPTS} ${COMMAND} $@ fi From 6ade69fce63d2e24358f0373ce1dfa9e4592ae74 Mon Sep 17 00:00:00 2001 From: wenbingshen Date: Thu, 27 Apr 2023 13:38:50 +0800 Subject: [PATCH 035/233] fix wrong update checkAllLedgersTime when ledgerReplication disabled (#3939) ### Motivation When ledgerReplication disabled, we don't need to register `checkAllLedgersTime` failedEvent because we already skipped the check and didn't encounter any exception. ```java Stopwatch stopwatch = Stopwatch.createStarted(); boolean checkSuccess = false; try { if (!isLedgerReplicationEnabled()) { LOG.info("Ledger replication disabled, skipping checkAllLedgers"); checkSuccess = true; <= here return; } LOG.info("Starting checkAllLedgers"); checkAllLedgers(); ...... checkSuccess = true; } catch (InterruptedException ie) { ...... } finally { if (!checkSuccess) { long checkAllLedgersDuration = stopwatch.stop().elapsed(TimeUnit.MILLISECONDS); auditorStats.getCheckAllLedgersTime() .registerFailedEvent(checkAllLedgersDuration, TimeUnit.MILLISECONDS); } } ``` (cherry picked from commit c765aea600fde1a8ac7cb8a53a1157a372026894) --- .../bookkeeper/replication/AuditorCheckAllLedgersTask.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java index f6b7a6f36ed..580fa605383 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java @@ -102,6 +102,7 @@ protected void runTask() { try { if (!isLedgerReplicationEnabled()) { LOG.info("Ledger replication disabled, skipping checkAllLedgers"); + checkSuccess = true; return; } From 6cbccfd8b88907602f2ef1bf2a7e908115fc5168 Mon Sep 17 00:00:00 2001 From: wenbingshen Date: Wed, 10 May 2023 10:34:01 +0800 Subject: [PATCH 036/233] When the executor has been shut down, do not schedule task (#3946) (cherry picked from commit 1fead36861a62fa052330edc5b3026ce3626f6b1) --- .../bookkeeper/replication/Auditor.java | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java index 739a5ff7d75..ceac7c56f86 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java @@ -391,27 +391,18 @@ public void start() { try { watchBookieChanges(); knownBookies = getAvailableBookies(); - } catch (BKException bke) { - LOG.error("Couldn't get bookie list, so exiting", bke); - submitShutdownTask(); - } - - try { this.ledgerUnderreplicationManager .notifyLostBookieRecoveryDelayChanged(new LostBookieRecoveryDelayChangedCb()); - } catch (UnavailableException ue) { - LOG.error("Exception while registering for LostBookieRecoveryDelay change notification, so exiting", - ue); - submitShutdownTask(); - } - - try { this.ledgerUnderreplicationManager.notifyUnderReplicationLedgerChanged( new UnderReplicatedLedgersChangedCb()); + } catch (BKException bke) { + LOG.error("Couldn't get bookie list, so exiting", bke); + submitShutdownTask(); + return; } catch (UnavailableException ue) { - LOG.error("Exception while registering for under-replicated ledgers change notification, so exiting", - ue); + LOG.error("Exception while registering for change notification, so exiting", ue); submitShutdownTask(); + return; } scheduleBookieCheckTask(); From c8d98333f93692ebf3ec6b78384c6ec19e605ba1 Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Fri, 19 May 2023 09:40:49 +0800 Subject: [PATCH 037/233] Fix npe when iterate pendingLedgersUpdates and pendingDeletedLedgers. (#3955) Descriptions of the changes in this PR: Fixes #3954 2023-05-12T16:58:26,212 - INFO - [db-storage-cleanup-5-1:EntryLocationIndex@244] - Deleted indexes from 10 ledgers in 0.006 seconds 2023-05-12T16:58:26,203 - ERROR - [SyncThread-7-1:SyncThread@111] - Exception in SyncThread java.lang.NullPointerException: null at org.apache.bookkeeper.bookie.storage.ldb.LedgerMetadataIndex.flush(LedgerMetadataIndex.java:303) ~[classes/:?] (cherry picked from commit a122b6b9ec21fe92e389fae42236b7daef84cb52) --- .../bookie/storage/ldb/LedgerMetadataIndex.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java index 989969c483a..c93bc0b7db3 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java @@ -298,8 +298,8 @@ public void flush() throws IOException { LongWrapper key = LongWrapper.get(); int updatedLedgers = 0; - while (!pendingLedgersUpdates.isEmpty()) { - Entry entry = pendingLedgersUpdates.poll(); + Entry entry; + while ((entry = pendingLedgersUpdates.poll()) != null) { key.set(entry.getKey()); byte[] value = entry.getValue().toByteArray(); ledgersDb.put(key.array, value); @@ -318,8 +318,8 @@ public void removeDeletedLedgers() throws IOException { LongWrapper key = LongWrapper.get(); int deletedLedgers = 0; - while (!pendingDeletedLedgers.isEmpty()) { - long ledgerId = pendingDeletedLedgers.poll(); + Long ledgerId; + while ((ledgerId = pendingDeletedLedgers.poll()) != null) { key.set(ledgerId); ledgersDb.delete(key.array); } From 2aede4b5ca6f182ef40267c707bfb4ca8474b44a Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Mon, 22 May 2023 12:21:46 -0700 Subject: [PATCH 038/233] Avoid compaction to trigger extra flushes DbLedgerStorage (#3959) * Avoid compaction to trigger extra flushes DbLedgerStorage * Expanded comment * Fixed test * Fixed direct io test (cherry picked from commit c924cfeb509c4e65e33a82ae88ad423017edb669) --- .../ldb/SingleDirectoryDbLedgerStorage.java | 25 +++++++++++++++++-- .../storage/ldb/DbLedgerStorageTest.java | 2 ++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java index dd673f319a0..69e2724c476 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java @@ -931,9 +931,30 @@ public Iterable getActiveLedgersInRange(long firstLedgerId, long lastLedge @Override public void updateEntriesLocations(Iterable locations) throws IOException { - // Trigger a flush to have all the entries being compacted in the db storage - flush(); + // Before updating the DB with the new location for the compacted entries, we need to + // make sure that there is no ongoing flush() operation. + // If there were a flush, we could have the following situation, which is highly + // unlikely though possible: + // 1. Flush operation has written the write-cache content into entry-log files + // 2. The DB location index is not yet updated + // 3. Compaction is triggered and starts compacting some of the recent files + // 4. Compaction will write the "new location" into the DB + // 5. The pending flush() will overwrite the DB with the "old location", pointing + // to a file that no longer exists + // + // To avoid this race condition, we need that all the entries that are potentially + // included in the compaction round to have all the indexes already flushed into + // the DB. + // The easiest lightweight way to achieve this is to wait for any pending + // flush operation to be completed before updating the index with the compacted + // entries, by blocking on the flushMutex. + flushMutex.lock(); + flushMutex.unlock(); + // We don't need to keep the flush mutex locked here while updating the DB. + // It's fine to have a concurrent flush operation at this point, because we + // know that none of the entries being flushed was included in the compaction + // round that we are dealing with. entryLocationIndex.updateLocations(locations); } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java index 4efdf06edb2..2a7e8e2869b 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java @@ -225,6 +225,7 @@ public void testBookieCompaction() throws Exception { entry3.writeBytes("entry-3".getBytes()); storage.addEntry(entry3); + // Simulate bookie compaction SingleDirectoryDbLedgerStorage singleDirStorage = ((DbLedgerStorage) storage).getLedgerStorageList().get(0); EntryLogger entryLogger = singleDirStorage.getEntryLogger(); @@ -236,6 +237,7 @@ public void testBookieCompaction() throws Exception { long location = entryLogger.addEntry(4L, newEntry3); newEntry3.resetReaderIndex(); + storage.flush(); List locations = Lists.newArrayList(new EntryLocation(4, 3, location)); singleDirStorage.updateEntriesLocations(locations); From 02074ad7a31954b9d77f197eb773378318909069 Mon Sep 17 00:00:00 2001 From: wenbingshen Date: Mon, 19 Jun 2023 11:12:19 +0800 Subject: [PATCH 039/233] Reduce unnecessary creation of ReplicationEnableCb objects (#3960) ### Motivation Create `ReplicationEnableCb` when the if condition is true. (cherry picked from commit 945df0ce3978f1dc64b4ffe7e44bc2f659866f9b) --- .../apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java | 2 +- .../main/java/org/apache/bookkeeper/replication/Auditor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java index 8587ac0ca0f..a8c30c43270 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java @@ -620,8 +620,8 @@ public void process(WatchedEvent e) { private void waitIfLedgerReplicationDisabled() throws UnavailableException, InterruptedException { - ReplicationEnableCb cb = new ReplicationEnableCb(); if (!this.isLedgerReplicationEnabled()) { + ReplicationEnableCb cb = new ReplicationEnableCb(); this.notifyLedgerReplicationEnabled(cb); cb.await(); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java index ceac7c56f86..220d52d8e55 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java @@ -586,8 +586,8 @@ public void operationComplete(int rc, Void result) { private void waitIfLedgerReplicationDisabled() throws UnavailableException, InterruptedException { - ReplicationEnableCb cb = new ReplicationEnableCb(); if (!ledgerUnderreplicationManager.isLedgerReplicationEnabled()) { + ReplicationEnableCb cb = new ReplicationEnableCb(); LOG.info("LedgerReplication is disabled externally through Zookeeper, " + "since DISABLE_NODE ZNode is created, so waiting untill it is enabled"); ledgerUnderreplicationManager.notifyLedgerReplicationEnabled(cb); From ab90a14b725a69261fb5912c5da458de75a67d46 Mon Sep 17 00:00:00 2001 From: wenbingshen Date: Wed, 31 May 2023 12:10:13 +0800 Subject: [PATCH 040/233] clear channel when channelInactive (#3966) ### Motivation I am stopping a pulsar broker, and I observed a lot of the following logs in the broker log: ``` 17:48:35.894 [shutdown-thread-43-1] INFO org.apache.bookkeeper.proto.PerChannelBookieClient - Closing the per channel bookie client for 10.184.xx.xx:3181 17:48:35.894 [shutdown-thread-43-1] ERROR io.netty.util.concurrent.DefaultPromise.rejectedExecution - Failed to submit a listener notification task. Event loop shut down? java.util.concurrent.RejectedExecutionException: event executor terminated at io.netty.util.concurrent.SingleThreadEventExecutor.reject(SingleThreadEventExecutor.java:923) ~[io.netty-netty-common-4.1.66.Final.jar:4.1.66.Final] at io.netty.util.concurrent.SingleThreadEventExecutor.offerTask(SingleThreadEventExecutor.java:350) ~[io.netty-netty-common-4.1.66.Final.jar:4.1.66.Final] at io.netty.util.concurrent.SingleThreadEventExecutor.addTask(SingleThreadEventExecutor.java:343) ~[io.netty-netty-common-4.1.66.Final.jar:4.1.66.Final] at io.netty.util.concurrent.SingleThreadEventExecutor.execute(SingleThreadEventExecutor.java:825) ~[io.netty-netty-common-4.1.66.Final.jar:4.1.66.Final] at io.netty.util.concurrent.SingleThreadEventExecutor.execute(SingleThreadEventExecutor.java:815) ~[io.netty-netty-common-4.1.66.Final.jar:4.1.66.Final] at io.netty.util.concurrent.DefaultPromise.safeExecute(DefaultPromise.java:842) ~[io.netty-netty-common-4.1.66.Final.jar:4.1.66.Final] at io.netty.util.concurrent.DefaultPromise.notifyListeners(DefaultPromise.java:499) ~[io.netty-netty-common-4.1.66.Final.jar:4.1.66.Final] at io.netty.util.concurrent.DefaultPromise.addListener(DefaultPromise.java:184) ~[io.netty-netty-common-4.1.66.Final.jar:4.1.66.Final] at io.netty.channel.DefaultChannelPromise.addListener(DefaultChannelPromise.java:95) ~[io.netty-netty-transport-4.1.66.Final.jar:4.1.66.Final] at io.netty.channel.DefaultChannelPromise.addListener(DefaultChannelPromise.java:30) ~[io.netty-netty-transport-4.1.66.Final.jar:4.1.66.Final] at org.apache.bookkeeper.proto.PerChannelBookieClient.closeChannel(PerChannelBookieClient.java:1090) ~[org.apache.bookkeeper-bookkeeper-server-4.14.2.jar:4.14.2] at org.apache.bookkeeper.proto.PerChannelBookieClient.closeInternal(PerChannelBookieClient.java:1079) ~[org.apache.bookkeeper-bookkeeper-server-4.14.2.jar:4.14.2] at org.apache.bookkeeper.proto.PerChannelBookieClient.close(PerChannelBookieClient.java:1063) ~[org.apache.bookkeeper-bookkeeper-server-4.14.2.jar:4.14.2] at org.apache.bookkeeper.proto.DefaultPerChannelBookieClientPool.close(DefaultPerChannelBookieClientPool.java:157) ~[org.apache.bookkeeper-bookkeeper-server-4.14.2.jar:4.14.2] at org.apache.bookkeeper.proto.BookieClientImpl.close(BookieClientImpl.java:587) ~[org.apache.bookkeeper-bookkeeper-server-4.14.2.jar:4.14.2] at org.apache.bookkeeper.client.BookKeeper.close(BookKeeper.java:1435) ~[org.apache.bookkeeper-bookkeeper-server-4.14.2.jar:4.14.2] at org.apache.pulsar.broker.ManagedLedgerClientFactory.close(ManagedLedgerClientFactory.java:142) ~[org.apache.pulsar-pulsar-broker-2.8.1.jar:2.8.1] at org.apache.pulsar.broker.PulsarService.closeAsync(PulsarService.java:417) ~[org.apache.pulsar-pulsar-broker-2.8.1.jar:2.8.1] at org.apache.pulsar.broker.MessagingServiceShutdownHook.lambda$run$1(MessagingServiceShutdownHook.java:62) ~[org.apache.pulsar-pulsar-broker-2.8.1.jar:2.8.1] at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) [?:1.8.0_131] at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) [?:1.8.0_131] at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) [io.netty-netty-common-4.1.66.Final.jar:4.1.66.Final] at java.lang.Thread.run(Thread.java:748) [?:1.8.0_131] ``` When I stopped the broker, there were more than 30,000 lines in such a log, which seriously polluted my normal log of the broker. image According to my next investigation, 1. When the broker stops, it will close the ManagedLedgerClientFactory. It will close all bookkeeper connections https://github.com/apache/bookkeeper/blob/master/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/DefaultPerChannelBookieClientPool.java#L154 ```java @Override public void close(boolean wait) { for (int i = 0; i < clients.length; i++) { clients[i].close(wait); if (clients != clientsV3Enforced) { clientsV3Enforced[i].close(wait); } } } private void closeInternal(boolean permanent, boolean wait) { Channel toClose = null; synchronized (this) { if (permanent) { state = ConnectionState.CLOSED; } else if (state != ConnectionState.CLOSED) { state = ConnectionState.DISCONNECTED; } toClose = channel; channel = null; makeWritable(); } if (toClose != null) { <== a. toClose not null ChannelFuture cf = closeChannel(toClose); if (wait) { cf.awaitUninterruptibly(); } } } private ChannelFuture closeChannel(Channel c) { if (LOG.isDebugEnabled()) { LOG.debug("Closing channel {}", c); } return c.close().addListener(x -> makeWritable()); <== b. here if channel is already inactive, add the listener will throw exception } ``` 2. When the bookie server first disconnects the client, the client will trigger channelInactive ```java public void channelInactive(ChannelHandlerContext ctx) throws Exception { LOG.info("Disconnected from bookie channel {}", ctx.channel()); if (ctx.channel() != null) { closeChannel(ctx.channel()); <== c. here channel is closed if (ctx.channel().pipeline().get(SslHandler.class) != null) { activeTlsChannelCounter.dec(); } else { activeNonTlsChannelCounter.dec(); } } errorOutOutstandingEntries(BKException.Code.BookieHandleNotAvailableException); errorOutPendingOps(BKException.Code.BookieHandleNotAvailableException); synchronized (this) { if (this.channel == ctx.channel() && state != ConnectionState.CLOSED) { state = ConnectionState.DISCONNECTED; } } // we don't want to reconnect right away. If someone sends a request to // this address, we will reconnect. } ``` If step c happens before b, then b throws the above exception. step c image image step a and b image So when channelInactive, we should reset the channel to null after closed the channel. Here, when the channel is null, we will reconnect after getting the client, which is consistent with the current behavior. ![image](https://github.com/apache/bookkeeper/assets/35599757/d1178697-27bd-44a5-acd1-33ccec99e7a4) (cherry picked from commit 808b909edf597254aea212c287fe17fb6d808198) --- .../java/org/apache/bookkeeper/proto/PerChannelBookieClient.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java index f84343a71b4..b4cf194e247 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java @@ -1263,6 +1263,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception { if (this.channel == ctx.channel() && state != ConnectionState.CLOSED) { state = ConnectionState.DISCONNECTED; + channel = null; } } From 59ef60a9a39a7490edeaacd5cd43b965fc7dd3aa Mon Sep 17 00:00:00 2001 From: wenbingshen Date: Wed, 31 May 2023 12:04:54 +0800 Subject: [PATCH 041/233] check indexBaseDir specified with ledgerBaseDir (#3967) ### Motivation I deployed the pulsar-3.0.0 version, and I observed the log of bookkeeper-4.16.1 as follows, I did not config special indexDirectories, but the printed log told me that indexDirectories was specified, which is wrong. ``` 2023-05-23T19:52:45,192+0800 [main] INFO org.apache.bookkeeper.bookie.storage.ldb.SingleDirectoryDbLedgerStorage - indexDir is specified, creating single directory db ledger storage on /data0/pulsar/data/ledgers/current 2023-05-23T19:52:45,322+0800 [main] INFO org.apache.bookkeeper.bookie.storage.ldb.KeyValueStorageRocksDB - Searching for a RocksDB configuration file in /usr/local/pulsar/apache-pulsar-3.0.0/conf/ledger_metadata_rocksdb.conf 2023-05-23T19:52:45,322+0800 [main] INFO org.apache.bookkeeper.bookie.storage.ldb.KeyValueStorageRocksDB - Found a RocksDB configuration file and using it to initialize the RocksDB 2023-05-23T19:52:45,337+0800 [main] INFO org.apache.bookkeeper.bookie.storage.ldb.KeyValueStorageRocksDB - Searching for a RocksDB configuration file in /usr/local/pulsar/apache-pulsar-3.0.0/conf/entry_location_rocksdb.conf 2023-05-23T19:52:45,337+0800 [main] INFO org.apache.bookkeeper.bookie.storage.ldb.KeyValueStorageRocksDB - Found a RocksDB configuration file and using it to initialize the RocksDB ``` here ledgerDirsManager == indexDirsManager, so ledgerDir is always equals indexDir. https://github.com/apache/bookkeeper/blob/master/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java#L181 ```java for (int i = 0; i < ledgerDirsManager.getAllLedgerDirs().size(); i++) { File ledgerDir = ledgerDirsManager.getAllLedgerDirs().get(i); File indexDir = indexDirsManager.getAllLedgerDirs().get(i); // Create a ledger dirs manager for the single directory File[] lDirs = new File[1]; // Remove the `/current` suffix which will be appended again by LedgersDirManager lDirs[0] = ledgerDir.getParentFile(); LedgerDirsManager ldm = new LedgerDirsManager(conf, lDirs, ledgerDirsManager.getDiskChecker(), NullStatsLogger.INSTANCE); // Create a index dirs manager for the single directory File[] iDirs = new File[1]; // Remove the `/current` suffix which will be appended again by LedgersDirManager iDirs[0] = indexDir.getParentFile(); LedgerDirsManager idm = new LedgerDirsManager(conf, iDirs, indexDirsManager.getDiskChecker(), NullStatsLogger.INSTANCE); ...... ledgerStorageList.add(newSingleDirectoryDbLedgerStorage(conf, ledgerManager, ldm, idm, entrylogger, statsLogger, perDirectoryWriteCacheSize, perDirectoryReadCacheSize, readAheadCacheBatchSize, readAheadCacheBatchBytesSize)); ...... } ``` (cherry picked from commit e93a7f1f9b2cfaa171e46a21b8e347c9fd3b0921) --- .../storage/ldb/SingleDirectoryDbLedgerStorage.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java index 69e2724c476..a140db7010c 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java @@ -154,13 +154,15 @@ public SingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager le String ledgerBaseDir = ledgerDirsManager.getAllLedgerDirs().get(0).getPath(); // indexBaseDir default use ledgerBaseDir String indexBaseDir = ledgerBaseDir; - if (CollectionUtils.isEmpty(indexDirsManager.getAllLedgerDirs())) { - log.info("indexDir is not specified, use default, creating single directory db ledger storage on {}", + if (CollectionUtils.isEmpty(indexDirsManager.getAllLedgerDirs()) + || ledgerBaseDir.equals(indexDirsManager.getAllLedgerDirs().get(0).getPath())) { + log.info("indexDir is equals ledgerBaseDir, creating single directory db ledger storage on {}", indexBaseDir); } else { // if indexDir is specified, set new value indexBaseDir = indexDirsManager.getAllLedgerDirs().get(0).getPath(); - log.info("indexDir is specified, creating single directory db ledger storage on {}", indexBaseDir); + log.info("indexDir is specified a separate dir, creating single directory db ledger storage on {}", + indexBaseDir); } StatsLogger ledgerIndexDirStatsLogger = statsLogger From 2d4694d514c9212a11e93a2db4d7e2d8e26c09f0 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 31 May 2023 14:43:20 +0300 Subject: [PATCH 042/233] Upgrade Netty to 4.1.93.Final (#3975) - Upgrade Netty to 4.1.93.Final and io_uring transport to 0.0.21.Final - includes netty-tcnative 2.0.61.Final Highlights: - Upgrade to latest netty-tcnative to fix memory leak in 4.1.93.Final https://github.com/netty/netty/pull/13375 - native SSL implementation fixes in 4.1.91.Final https://twitter.com/normanmaurer/status/1642884593522032640 - performance improvements in 4.1.90.Final and 4.1.92.Final https://twitter.com/normanmaurer/status/1635671472566837248 https://twitter.com/normanmaurer/status/1650816576885538816 Release notes: https://netty.io/news/2023/03/14/4-1-90-Final.html https://netty.io/news/2023/04/03/4-1-91-Final.html https://netty.io/news/2023/04/25/4-1-92-Final.html https://netty.io/news/2023/05/25/4-1-93-Final.html (cherry picked from commit f8d81f7eb861235d5516f7781f6eac70702b3c69) --- bookkeeper-dist/src/assemble/bin-all.xml | 2 +- bookkeeper-dist/src/assemble/bin-server.xml | 2 +- bookkeeper-dist/src/assemble/bkctl.xml | 2 +- .../src/main/resources/LICENSE-all.bin.txt | 164 +++++++++--------- .../src/main/resources/LICENSE-bkctl.bin.txt | 160 ++++++++--------- .../src/main/resources/LICENSE-server.bin.txt | 164 +++++++++--------- .../src/main/resources/NOTICE-all.bin.txt | 48 ++--- .../src/main/resources/NOTICE-bkctl.bin.txt | 44 ++--- .../src/main/resources/NOTICE-server.bin.txt | 48 ++--- .../LICENSE.aalto-xml.txt | 0 .../LICENSE.base64.txt | 0 .../LICENSE.bouncycastle.txt | 0 .../LICENSE.caliper.txt | 0 .../LICENSE.commons-lang.txt | 0 .../LICENSE.commons-logging.txt | 0 .../LICENSE.compress-lzf.txt | 0 .../LICENSE.dnsinfo.txt | 0 .../LICENSE.harmony.txt | 0 .../LICENSE.hpack.txt | 0 .../LICENSE.hyper-hpack.txt | 0 .../LICENSE.jboss-marshalling.txt | 0 .../LICENSE.jbzip2.txt | 0 .../LICENSE.jctools.txt | 0 .../LICENSE.jfastlz.txt | 0 .../LICENSE.jsr166y.txt | 0 .../LICENSE.jzlib.txt | 0 .../LICENSE.libdivsufsort.txt | 0 .../LICENSE.log4j.txt | 0 .../LICENSE.lz4.txt | 0 .../LICENSE.lzma-java.txt | 0 .../LICENSE.mvn-wrapper.txt | 0 .../LICENSE.nghttp2-hpack.txt | 0 .../LICENSE.protobuf.txt | 0 .../LICENSE.slf4j.txt | 0 .../LICENSE.snappy.txt | 0 .../LICENSE.webbit.txt | 0 .../NOTICE.harmony.txt | 0 pom.xml | 6 +- 38 files changed, 320 insertions(+), 320 deletions(-) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.aalto-xml.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.base64.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.bouncycastle.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.caliper.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.commons-lang.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.commons-logging.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.compress-lzf.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.dnsinfo.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.harmony.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.hpack.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.hyper-hpack.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.jboss-marshalling.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.jbzip2.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.jctools.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.jfastlz.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.jsr166y.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.jzlib.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.libdivsufsort.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.log4j.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.lz4.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.lzma-java.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.mvn-wrapper.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.nghttp2-hpack.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.protobuf.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.slf4j.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.snappy.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/LICENSE.webbit.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.89.Final => netty-4.1.93.Final}/NOTICE.harmony.txt (100%) diff --git a/bookkeeper-dist/src/assemble/bin-all.xml b/bookkeeper-dist/src/assemble/bin-all.xml index 2e9ba7daee1..736233730b7 100644 --- a/bookkeeper-dist/src/assemble/bin-all.xml +++ b/bookkeeper-dist/src/assemble/bin-all.xml @@ -64,7 +64,7 @@ javax.servlet-api-4.0.0/CDDL+GPL-1.1 bouncycastle-1.0.2.3/LICENSE.html jsr-305/LICENSE - netty-4.1.89.Final/* + netty-4.1.93.Final/* paranamer-2.8/LICENSE.txt protobuf-3.14.0/LICENSE protobuf-3.12.0/LICENSE diff --git a/bookkeeper-dist/src/assemble/bin-server.xml b/bookkeeper-dist/src/assemble/bin-server.xml index 17867eeaa63..aed894675d2 100644 --- a/bookkeeper-dist/src/assemble/bin-server.xml +++ b/bookkeeper-dist/src/assemble/bin-server.xml @@ -52,7 +52,7 @@ 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.89.Final/* + netty-4.1.93.Final/* bouncycastle-1.0.2.3/LICENSE.html protobuf-3.14.0/LICENSE protobuf-3.12.0/LICENSE diff --git a/bookkeeper-dist/src/assemble/bkctl.xml b/bookkeeper-dist/src/assemble/bkctl.xml index 1fdfcbca63a..f9fda8bccb1 100644 --- a/bookkeeper-dist/src/assemble/bkctl.xml +++ b/bookkeeper-dist/src/assemble/bkctl.xml @@ -69,7 +69,7 @@ checker-qual-3.5.0/LICENSE google-auth-library-credentials-0.20.0/LICENSE - netty-4.1.89.Final/* + netty-4.1.93.Final/* bouncycastle-1.0.2.3/LICENSE.html protobuf-3.14.0/LICENSE protobuf-3.12.0/LICENSE diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 6683dc42203..d97eca62482 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -217,31 +217,31 @@ 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.89.Final.jar [11] -- lib/io.netty-netty-codec-4.1.89.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.89.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.89.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.89.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.89.Final.jar [11] -- lib/io.netty-netty-common-4.1.89.Final.jar [11] -- lib/io.netty-netty-handler-4.1.89.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.89.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.89.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.89.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.56.Final.jar [11] -- lib/io.netty-netty-transport-4.1.89.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.89.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.18.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.89.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.93.Final.jar [11] +- lib/io.netty-netty-common-4.1.93.Final.jar [11] +- lib/io.netty-netty-handler-4.1.93.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.93.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.93.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar [11] +- lib/io.netty-netty-transport-4.1.93.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.21.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.93.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] @@ -332,7 +332,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.89.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.93.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 @@ -373,229 +373,229 @@ Apache Software License, Version 2. [53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.89.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.93.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.89.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.jsr166y.txt (Public Domain) + * deps/netty-4.1.93.Final/LICENSE.jsr166y.txt (Public Domain) * HOMEPAGE: * 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.89.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.base64.txt (Public Domain) + * deps/netty-4.1.93.Final/LICENSE.base64.txt (Public Domain) * HOMEPAGE: * http://iharder.sourceforge.net/current/java/base64/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.webbit.txt (BSD License) + * deps/netty-4.1.93.Final/LICENSE.webbit.txt (BSD License) * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.slf4j.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.slf4j.txt (MIT License) * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: - * deps/netty-4.1.89.Final/NOTICE.harmony.txt + * deps/netty-4.1.93.Final/NOTICE.harmony.txt * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.harmony.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.harmony.txt (Apache License 2.0) * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.jbzip2.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.jbzip2.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jbzip2/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.93.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: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.libdivsufsort.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.libdivsufsort.txt (MIT License) * HOMEPAGE: * https://github.com/y-256/libdivsufsort -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.jctools.txt (ASL2 License) + * deps/netty-4.1.93.Final/LICENSE.jctools.txt (ASL2 License) * HOMEPAGE: * https://github.com/JCTools/JCTools -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.jzlib.txt (BSD style License) + * deps/netty-4.1.93.Final/LICENSE.jzlib.txt (BSD style License) * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.compress-lzf.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.compress-lzf.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/ning/compress -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.lz4.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.lz4.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jpountz/lz4-java -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.lzma-java.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.lzma-java.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.jfastlz.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.jfastlz.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jfastlz/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.protobuf.txt (New BSD License) + * deps/netty-4.1.93.Final/LICENSE.protobuf.txt (New BSD License) * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.93.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: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.bouncycastle.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.bouncycastle.txt (MIT License) * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.snappy.txt (New BSD License) + * deps/netty-4.1.93.Final/LICENSE.snappy.txt (New BSD License) * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.jboss-marshalling.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.jboss-marshalling.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.caliper.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.caliper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.commons-logging.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.commons-logging.txt (Apache License 2.0) * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.log4j.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.log4j.txt (Apache License 2.0) * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.aalto-xml.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.aalto-xml.txt (Apache License 2.0) * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.hpack.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.hpack.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/twitter/hpack -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.hyper-hpack.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.hyper-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/python-hyper/hpack/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.nghttp2-hpack.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.nghttp2-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/nghttp2/nghttp2/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.commons-lang.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.commons-lang.txt (Apache License 2.0) * HOMEPAGE: * https://commons.apache.org/proper/commons-lang/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.mvn-wrapper.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.mvn-wrapper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/takari/maven-wrapper -lib/io.netty-netty-codec-4.1.89.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.93.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/). * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.dnsinfo.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.dnsinfo.txt (Apache License 2.0) * HOMEPAGE: * http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index e8ac8cc2c4f..b8f1f292310 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -217,29 +217,29 @@ 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.89.Final.jar [11] -- lib/io.netty-netty-codec-4.1.89.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.89.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.89.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.89.Final.jar [11] -- lib/io.netty-netty-common-4.1.89.Final.jar [11] -- lib/io.netty-netty-handler-4.1.89.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.89.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.89.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.56.Final.jar [11] -- lib/io.netty-netty-transport-4.1.89.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.89.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.18.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.89.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.93.Final.jar [11] +- lib/io.netty-netty-common-4.1.93.Final.jar [11] +- lib/io.netty-netty-handler-4.1.93.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.93.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar [11] +- lib/io.netty-netty-transport-4.1.93.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.21.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.93.Final.jar [11] - lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16] @@ -303,7 +303,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.89.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.93.Final [16] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.18.0 [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 @@ -335,229 +335,229 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.89.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.93.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.89.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.jsr166y.txt (Public Domain) + * deps/netty-4.1.93.Final/LICENSE.jsr166y.txt (Public Domain) * HOMEPAGE: * 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.89.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.base64.txt (Public Domain) + * deps/netty-4.1.93.Final/LICENSE.base64.txt (Public Domain) * HOMEPAGE: * http://iharder.sourceforge.net/current/java/base64/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.webbit.txt (BSD License) + * deps/netty-4.1.93.Final/LICENSE.webbit.txt (BSD License) * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.slf4j.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.slf4j.txt (MIT License) * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: - * deps/netty-4.1.89.Final/NOTICE.harmony.txt + * deps/netty-4.1.93.Final/NOTICE.harmony.txt * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.harmony.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.harmony.txt (Apache License 2.0) * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.jbzip2.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.jbzip2.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jbzip2/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.93.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: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.libdivsufsort.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.libdivsufsort.txt (MIT License) * HOMEPAGE: * https://github.com/y-256/libdivsufsort -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.jctools.txt (ASL2 License) + * deps/netty-4.1.93.Final/LICENSE.jctools.txt (ASL2 License) * HOMEPAGE: * https://github.com/JCTools/JCTools -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.jzlib.txt (BSD style License) + * deps/netty-4.1.93.Final/LICENSE.jzlib.txt (BSD style License) * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.compress-lzf.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.compress-lzf.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/ning/compress -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.lz4.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.lz4.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jpountz/lz4-java -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.lzma-java.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.lzma-java.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.jfastlz.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.jfastlz.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jfastlz/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.protobuf.txt (New BSD License) + * deps/netty-4.1.93.Final/LICENSE.protobuf.txt (New BSD License) * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.93.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: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.bouncycastle.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.bouncycastle.txt (MIT License) * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.snappy.txt (New BSD License) + * deps/netty-4.1.93.Final/LICENSE.snappy.txt (New BSD License) * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.jboss-marshalling.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.jboss-marshalling.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.caliper.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.caliper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.commons-logging.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.commons-logging.txt (Apache License 2.0) * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.log4j.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.log4j.txt (Apache License 2.0) * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.aalto-xml.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.aalto-xml.txt (Apache License 2.0) * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.hpack.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.hpack.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/twitter/hpack -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.hyper-hpack.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.hyper-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/python-hyper/hpack/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.nghttp2-hpack.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.nghttp2-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/nghttp2/nghttp2/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.commons-lang.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.commons-lang.txt (Apache License 2.0) * HOMEPAGE: * https://commons.apache.org/proper/commons-lang/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.mvn-wrapper.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.mvn-wrapper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/takari/maven-wrapper -lib/io.netty-netty-codec-4.1.89.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.93.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/). * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.dnsinfo.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.dnsinfo.txt (Apache License 2.0) * HOMEPAGE: * http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index 6f5c9f9d604..7383286d0c4 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -217,31 +217,31 @@ 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.89.Final.jar [11] -- lib/io.netty-netty-codec-4.1.89.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.89.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.89.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.89.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.89.Final.jar [11] -- lib/io.netty-netty-common-4.1.89.Final.jar [11] -- lib/io.netty-netty-handler-4.1.89.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.89.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.89.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.89.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.56.Final.jar [11] -- lib/io.netty-netty-transport-4.1.89.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.89.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.18.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.89.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.93.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.93.Final.jar [11] +- lib/io.netty-netty-common-4.1.93.Final.jar [11] +- lib/io.netty-netty-handler-4.1.93.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.93.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.93.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar [11] +- lib/io.netty-netty-transport-4.1.93.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.21.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.93.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] @@ -328,7 +328,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.89.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.93.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 @@ -368,229 +368,229 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.89.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.93.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.89.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.jsr166y.txt (Public Domain) + * deps/netty-4.1.93.Final/LICENSE.jsr166y.txt (Public Domain) * HOMEPAGE: * 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.89.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.base64.txt (Public Domain) + * deps/netty-4.1.93.Final/LICENSE.base64.txt (Public Domain) * HOMEPAGE: * http://iharder.sourceforge.net/current/java/base64/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.webbit.txt (BSD License) + * deps/netty-4.1.93.Final/LICENSE.webbit.txt (BSD License) * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.slf4j.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.slf4j.txt (MIT License) * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: - * deps/netty-4.1.89.Final/NOTICE.harmony.txt + * deps/netty-4.1.93.Final/NOTICE.harmony.txt * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.harmony.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.harmony.txt (Apache License 2.0) * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.jbzip2.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.jbzip2.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jbzip2/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.93.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: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.libdivsufsort.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.libdivsufsort.txt (MIT License) * HOMEPAGE: * https://github.com/y-256/libdivsufsort -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.jctools.txt (ASL2 License) + * deps/netty-4.1.93.Final/LICENSE.jctools.txt (ASL2 License) * HOMEPAGE: * https://github.com/JCTools/JCTools -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.jzlib.txt (BSD style License) + * deps/netty-4.1.93.Final/LICENSE.jzlib.txt (BSD style License) * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.compress-lzf.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.compress-lzf.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/ning/compress -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.lz4.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.lz4.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jpountz/lz4-java -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.lzma-java.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.lzma-java.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.jfastlz.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.jfastlz.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jfastlz/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.protobuf.txt (New BSD License) + * deps/netty-4.1.93.Final/LICENSE.protobuf.txt (New BSD License) * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.93.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: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.bouncycastle.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.bouncycastle.txt (MIT License) * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.snappy.txt (New BSD License) + * deps/netty-4.1.93.Final/LICENSE.snappy.txt (New BSD License) * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.jboss-marshalling.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.jboss-marshalling.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.caliper.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.caliper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.commons-logging.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.commons-logging.txt (Apache License 2.0) * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.log4j.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.log4j.txt (Apache License 2.0) * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.89.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.aalto-xml.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.aalto-xml.txt (Apache License 2.0) * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.hpack.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.hpack.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/twitter/hpack -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.hyper-hpack.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.hyper-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/python-hyper/hpack/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.nghttp2-hpack.txt (MIT License) + * deps/netty-4.1.93.Final/LICENSE.nghttp2-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/nghttp2/nghttp2/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.commons-lang.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.commons-lang.txt (Apache License 2.0) * HOMEPAGE: * https://commons.apache.org/proper/commons-lang/ -lib/io.netty-netty-codec-4.1.89.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.93.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: - * deps/netty-4.1.89.Final/LICENSE.mvn-wrapper.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.mvn-wrapper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/takari/maven-wrapper -lib/io.netty-netty-codec-4.1.89.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.93.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/). * LICENSE: - * deps/netty-4.1.89.Final/LICENSE.dnsinfo.txt (Apache License 2.0) + * deps/netty-4.1.93.Final/LICENSE.dnsinfo.txt (Apache License 2.0) * HOMEPAGE: * http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index d2625bfe6f5..0d630af6a5f 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -23,30 +23,30 @@ LongAdder), which was released with the following comments: http://creativecommons.org/publicdomain/zero/1.0/ ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.89.Final.jar -- lib/io.netty-netty-codec-4.1.89.Final.jar -- lib/io.netty-netty-codec-dns-4.1.89.Final.jar -- lib/io.netty-netty-codec-http-4.1.89.Final.jar -- lib/io.netty-netty-codec-http2-4.1.89.Final.jar -- lib/io.netty-netty-codec-socks-4.1.89.Final.jar -- lib/io.netty-netty-common-4.1.89.Final.jar -- lib/io.netty-netty-handler-4.1.89.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.89.Final.jar -- lib/io.netty-netty-resolver-4.1.89.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.89.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.56.Final.jar -- lib/io.netty-netty-transport-4.1.89.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.89.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.89.Final.jar +- lib/io.netty-netty-buffer-4.1.93.Final.jar +- lib/io.netty-netty-codec-4.1.93.Final.jar +- lib/io.netty-netty-codec-dns-4.1.93.Final.jar +- lib/io.netty-netty-codec-http-4.1.93.Final.jar +- lib/io.netty-netty-codec-http2-4.1.93.Final.jar +- lib/io.netty-netty-codec-socks-4.1.93.Final.jar +- lib/io.netty-netty-common-4.1.93.Final.jar +- lib/io.netty-netty-handler-4.1.93.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar +- lib/io.netty-netty-resolver-4.1.93.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.93.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar +- lib/io.netty-netty-transport-4.1.93.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.93.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 8f27afd2a4a..292620d1b02 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -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.89.Final.jar -- lib/io.netty-netty-codec-4.1.89.Final.jar -- lib/io.netty-netty-codec-http-4.1.89.Final.jar -- lib/io.netty-netty-codec-http2-4.1.89.Final.jar -- lib/io.netty-netty-codec-socks-4.1.89.Final.jar -- lib/io.netty-netty-common-4.1.89.Final.jar -- lib/io.netty-netty-handler-4.1.89.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.89.Final.jar -- lib/io.netty-netty-resolver-4.1.89.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.56.Final.jar -- lib/io.netty-netty-transport-4.1.89.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.89.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.89.Final.jar +- lib/io.netty-netty-buffer-4.1.93.Final.jar +- lib/io.netty-netty-codec-4.1.93.Final.jar +- lib/io.netty-netty-codec-http-4.1.93.Final.jar +- lib/io.netty-netty-codec-http2-4.1.93.Final.jar +- lib/io.netty-netty-codec-socks-4.1.93.Final.jar +- lib/io.netty-netty-common-4.1.93.Final.jar +- lib/io.netty-netty-handler-4.1.93.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar +- lib/io.netty-netty-resolver-4.1.93.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar +- lib/io.netty-netty-transport-4.1.93.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.93.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 961e8c798f8..c0cd48d3356 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -5,30 +5,30 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.89.Final.jar -- lib/io.netty-netty-codec-4.1.89.Final.jar -- lib/io.netty-netty-codec-dns-4.1.89.Final.jar -- lib/io.netty-netty-codec-http-4.1.89.Final.jar -- lib/io.netty-netty-codec-http2-4.1.89.Final.jar -- lib/io.netty-netty-codec-socks-4.1.89.Final.jar -- lib/io.netty-netty-common-4.1.89.Final.jar -- lib/io.netty-netty-handler-4.1.89.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.89.Final.jar -- lib/io.netty-netty-resolver-4.1.89.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.89.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.56.Final.jar -- lib/io.netty-netty-transport-4.1.89.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.89.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.89.Final.jar +- lib/io.netty-netty-buffer-4.1.93.Final.jar +- lib/io.netty-netty-codec-4.1.93.Final.jar +- lib/io.netty-netty-codec-dns-4.1.93.Final.jar +- lib/io.netty-netty-codec-http-4.1.93.Final.jar +- lib/io.netty-netty-codec-http2-4.1.93.Final.jar +- lib/io.netty-netty-codec-socks-4.1.93.Final.jar +- lib/io.netty-netty-common-4.1.93.Final.jar +- lib/io.netty-netty-handler-4.1.93.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar +- lib/io.netty-netty-resolver-4.1.93.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.93.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar +- lib/io.netty-netty-transport-4.1.93.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.93.Final.jar The Netty Project diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.aalto-xml.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.aalto-xml.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.aalto-xml.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.aalto-xml.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.base64.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.base64.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.base64.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.base64.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.bouncycastle.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.bouncycastle.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.bouncycastle.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.bouncycastle.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.caliper.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.caliper.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.caliper.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.caliper.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.commons-lang.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.commons-lang.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.commons-lang.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.commons-lang.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.commons-logging.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.commons-logging.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.commons-logging.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.commons-logging.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.compress-lzf.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.compress-lzf.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.compress-lzf.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.compress-lzf.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.dnsinfo.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.dnsinfo.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.dnsinfo.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.dnsinfo.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.harmony.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.harmony.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.harmony.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.harmony.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.hpack.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.hpack.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.hpack.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.hpack.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.hyper-hpack.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.hyper-hpack.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.hyper-hpack.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.hyper-hpack.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jboss-marshalling.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jboss-marshalling.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jboss-marshalling.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jboss-marshalling.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jbzip2.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jbzip2.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jbzip2.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jbzip2.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jctools.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jctools.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jctools.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jctools.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jfastlz.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jfastlz.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jfastlz.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jfastlz.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jsr166y.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jsr166y.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jsr166y.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jsr166y.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jzlib.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jzlib.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.jzlib.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jzlib.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.libdivsufsort.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.libdivsufsort.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.libdivsufsort.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.libdivsufsort.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.log4j.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.log4j.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.log4j.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.log4j.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.lz4.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.lz4.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.lz4.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.lz4.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.lzma-java.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.lzma-java.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.lzma-java.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.lzma-java.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.mvn-wrapper.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.mvn-wrapper.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.mvn-wrapper.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.mvn-wrapper.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.nghttp2-hpack.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.nghttp2-hpack.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.nghttp2-hpack.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.nghttp2-hpack.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.protobuf.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.protobuf.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.protobuf.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.protobuf.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.slf4j.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.slf4j.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.slf4j.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.slf4j.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.snappy.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.snappy.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.snappy.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.snappy.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.webbit.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.webbit.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/LICENSE.webbit.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.webbit.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/NOTICE.harmony.txt b/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/NOTICE.harmony.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.89.Final/NOTICE.harmony.txt rename to bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/NOTICE.harmony.txt diff --git a/pom.xml b/pom.xml index 4086dec3177..9396e5f6992 100644 --- a/pom.xml +++ b/pom.xml @@ -152,9 +152,9 @@ 2.18.0 1.3.0 3.12.4 - 4.1.89.Final - 2.0.56.Final - 0.0.18.Final + 4.1.93.Final + 2.0.61.Final + 0.0.21.Final 9.1.3 2.0.9 0.15.0 From 79485f9f754333e5faa88d40b08add4a77d83d8a Mon Sep 17 00:00:00 2001 From: Zhangao Date: Tue, 6 Jun 2023 14:35:38 +0800 Subject: [PATCH 043/233] Fix journal without flush (#3979) Co-authored-by: gavingaozhangmin (cherry picked from commit 50bf016ecdcfe41602d2f99595334ee2c994e571) --- .../src/main/java/org/apache/bookkeeper/bookie/Journal.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java index 99eaa238191..d8df972878f 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java @@ -421,6 +421,7 @@ private ForceWriteRequest(Handle recyclerHandle) { private void recycle() { logFile = null; + flushed = false; if (forceWriteWaiters != null) { forceWriteWaiters.recycle(); forceWriteWaiters = null; From 07d3af61e5d8cb62a34adb416433064f3791114b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=A7=E6=98=93=E5=AE=A2?= Date: Mon, 19 Jun 2023 10:19:15 +0800 Subject: [PATCH 044/233] Fix arbitrary file upload vulnerability with httpServerEnabled (#3982) ### Motivation There is a potential arbitrary file upload vulnerability with `httpServerEnabled=true`, it's caused by `BodyHandler.create()` which returns a BodyHandler that automatically processes file upload requests. https://github.com/apache/bookkeeper/blob/7f64246ad38981126cc8dd929ff448805a738b8f/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxHttpServer.java#L82 This simple command will upload a file into the `file-uploads` directory under the bookkeeper server process `CWD`. ```shell $ curl -i --request POST \ --url http://localhost:8000/api/v1/bookie/info \ --header 'Content-Type: multipart/form-data' \ --form file=@ $ ls LICENSE NOTICE README.md bin conf deps file-uploads lib logs scripts $ ls file-uploads 758801ba-ea1e-49e3-85d6-e510f539ea0d ``` ### Changes Create the `BodyHandler` with handleFileUploads disabled (`BodyHandler.create(false)`). (cherry picked from commit 1809e69c6d4eeced49e76b76e979e9da96942231) --- .../http/vertx/VertxHttpServer.java | 2 +- .../http/vertx/TestVertxHttpServer.java | 76 +++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxHttpServer.java b/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxHttpServer.java index ceaaf7d02dd..331ed6566b0 100644 --- a/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxHttpServer.java +++ b/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxHttpServer.java @@ -79,7 +79,7 @@ public boolean startServer(int port, String host, HttpServerConfiguration httpSe CompletableFuture> future = new CompletableFuture<>(); VertxHttpHandlerFactory handlerFactory = new VertxHttpHandlerFactory(httpServiceProvider); Router router = Router.router(vertx); - router.route().handler(BodyHandler.create()); + router.route().handler(BodyHandler.create(false)); HttpRouter requestRouter = new HttpRouter(handlerFactory) { @Override public void bindHandler(String endpoint, VertxAbstractHandler handler) { diff --git a/bookkeeper-http/vertx-http-server/src/test/java/org/apache/bookkeeper/http/vertx/TestVertxHttpServer.java b/bookkeeper-http/vertx-http-server/src/test/java/org/apache/bookkeeper/http/vertx/TestVertxHttpServer.java index 24a4bf9185a..a0c6c4ae69a 100644 --- a/bookkeeper-http/vertx-http-server/src/test/java/org/apache/bookkeeper/http/vertx/TestVertxHttpServer.java +++ b/bookkeeper-http/vertx-http-server/src/test/java/org/apache/bookkeeper/http/vertx/TestVertxHttpServer.java @@ -20,13 +20,20 @@ */ package org.apache.bookkeeper.http.vertx; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import com.google.common.io.Files; +import io.vertx.ext.web.handler.BodyHandler; import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; @@ -109,6 +116,22 @@ public void testHttpMethodsWithBody() throws IOException { httpServer.stopServer(); } + @Test + public void testArbitraryFileUpload() throws IOException { + VertxHttpServer httpServer = new VertxHttpServer(); + HttpServiceProvider httpServiceProvider = NullHttpServiceProvider.getInstance(); + httpServer.initialize(httpServiceProvider); + assertTrue(httpServer.startServer(0)); + int port = httpServer.getListeningPort(); + File tempFile = File.createTempFile("test-" + System.currentTimeMillis(), null); + Files.asCharSink(tempFile, StandardCharsets.UTF_8).write(TestVertxHttpServer.class.getName()); + String[] filenamesBeforeUploadRequest = listFiles(BodyHandler.DEFAULT_UPLOADS_DIRECTORY); + HttpResponse httpResponse = sendFile(getUrl(port, HttpRouter.BOOKIE_INFO), tempFile); + assertEquals(HttpServer.StatusCode.OK.getValue(), httpResponse.responseCode); + assertArrayEquals(filenamesBeforeUploadRequest, listFiles(BodyHandler.DEFAULT_UPLOADS_DIRECTORY)); + httpServer.stopServer(); + } + private HttpResponse send(String url, HttpServer.Method method) throws IOException { return send(url, method, ""); } @@ -143,6 +166,59 @@ private HttpResponse send(String url, HttpServer.Method method, String body) thr return new HttpResponse(responseCode, response.toString()); } + private HttpResponse sendFile(String url, File file) throws IOException { + URL obj = new URL(url); + HttpURLConnection con = (HttpURLConnection) obj.openConnection(); + String boundary = "---------------------------" + System.currentTimeMillis(); + // optional, default is GET + con.setRequestMethod("POST"); + con.setDoOutput(true); + con.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary); + try ( + OutputStream outputStream = con.getOutputStream(); + PrintWriter writer = new PrintWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8), + true); + FileInputStream fileInputStream = new FileInputStream(file); + ) { + writer.append("--" + boundary).append("\r\n"); + writer.append("Content-Disposition: form-data; name=\"file\"; filename=\"file.txt\"").append("\r\n"); + writer.append("Content-Type: text/plain").append("\r\n"); + writer.append("\r\n"); + + byte[] buffer = new byte[4096]; + int bytesRead; + while ((bytesRead = fileInputStream.read(buffer)) != -1) { + outputStream.write(buffer, 0, bytesRead); + } + + writer.append("\r\n"); + writer.append("--" + boundary + "--").append("\r\n"); + } + int responseCode = con.getResponseCode(); + StringBuilder response = new StringBuilder(); + BufferedReader in = null; + try { + in = new BufferedReader(new InputStreamReader(con.getInputStream())); + String inputLine; + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + } finally { + if (in != null) { + in.close(); + } + } + return new HttpResponse(responseCode, response.toString()); + } + + private String[] listFiles(String directory) { + File directoryFile = new File(directory); + if (!directoryFile.exists() || !directoryFile.isDirectory()) { + return new String[0]; + } + return directoryFile.list(); + } + private String getUrl(int port, String path) { return "http://localhost:" + port + path; } From cec8551b1dbe98a8dceff4c3b80b4088a53314d9 Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Tue, 13 Jun 2023 14:30:42 +0800 Subject: [PATCH 045/233] Fix memory leak of direct memory. (#3983) Descriptions of the changes in this PR: ### Motivation When open a non-exist file for DirectReader, it will throw an exception. The ByteBuf won't release. When close DirectWriter, if the close failed, the ByteBuf also won't release. (cherry picked from commit c8c593ee6d3e1f8970bc90b4b6785ff405c81cc4) --- .../bookie/storage/directentrylogger/DirectReader.java | 3 +-- .../bookie/storage/directentrylogger/DirectWriter.java | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectReader.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectReader.java index 36d0b263f8a..f5076f3484e 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectReader.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectReader.java @@ -56,8 +56,6 @@ class DirectReader implements LogReader { this.filename = filename; this.maxSaneEntrySize = maxSaneEntrySize; this.readBlockStats = readBlockStats; - - nativeBuffer = new Buffer(nativeIO, bufferSize); closed = false; try { @@ -71,6 +69,7 @@ class DirectReader implements LogReader { .kv("errno", ne.getErrno()).toString()); } refreshMaxOffset(); + nativeBuffer = new Buffer(nativeIO, bufferSize); } @Override diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectWriter.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectWriter.java index 17466d1e404..be411982d32 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectWriter.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectWriter.java @@ -233,10 +233,11 @@ public void close() throws IOException { throw new IOException(exMsg(ne.getMessage()) .kv("file", filename) .kv("errno", ne.getErrno()).toString()); - } - synchronized (bufferLock) { - bufferPool.release(nativeBuffer); - nativeBuffer = null; + } finally { + synchronized (bufferLock) { + bufferPool.release(nativeBuffer); + nativeBuffer = null; + } } } From 306eaef60df9ae43ea9e2db4ed769cb3e823e71b Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 19 Jun 2023 15:08:31 +0800 Subject: [PATCH 046/233] Unify ByteBufAllocator for the DirectIO component (#3985) ### Motivation Some classes in the DirectIO component use `PooledByteBufAllocator` to create ByteBuf instead of using the BookKeeper-initiated allocator. When we configured the BookKeeper allocator OOM policy to shut down, the OOM policy can't apply to those classes which use `PooledByteBufAllocator` to create ByteBuf. ### Modifications - Unify ByteBufAllocator for the DirectIO component. (cherry picked from commit bf06642c820f84978aaaf8e162d7a6e0a992c402) --- .../storage/directentrylogger/Buffer.java | 8 ++++--- .../storage/directentrylogger/BufferPool.java | 5 ++-- .../DirectCompactionEntryLog.java | 2 +- .../directentrylogger/DirectEntryLogger.java | 4 ++-- .../directentrylogger/DirectReader.java | 2 +- .../directentrylogger/LogReaderScan.java | 6 ++--- .../storage/directentrylogger/TestBuffer.java | 17 +++++++------- .../directentrylogger/TestDirectReader.java | 15 ++++++------ .../directentrylogger/TestDirectWriter.java | 23 ++++++++++--------- .../directentrylogger/TestMetadata.java | 2 +- 10 files changed, 45 insertions(+), 39 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/Buffer.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/Buffer.java index 2af6a17eb03..1b3a393ad01 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/Buffer.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/Buffer.java @@ -24,7 +24,7 @@ import static org.apache.bookkeeper.common.util.ExceptionMessageHelper.exMsg; import io.netty.buffer.ByteBuf; -import io.netty.buffer.PooledByteBufAllocator; +import io.netty.buffer.ByteBufAllocator; import io.netty.util.ReferenceCountUtil; import java.io.IOException; import java.nio.ByteBuffer; @@ -60,12 +60,14 @@ class Buffer { final int bufferSize; ByteBuf buffer; ByteBuffer byteBuffer; + ByteBufAllocator allocator; long pointer = 0; - Buffer(NativeIO nativeIO, int bufferSize) throws IOException { + Buffer(NativeIO nativeIO, ByteBufAllocator allocator, int bufferSize) throws IOException { checkArgument(isAligned(bufferSize), "Buffer size not aligned %d", bufferSize); + this.allocator = allocator; this.buffer = allocateAligned(ALIGNMENT, bufferSize); this.nativeIO = nativeIO; this.bufferSize = bufferSize; @@ -74,7 +76,7 @@ class Buffer { } private ByteBuf allocateAligned(int alignment, int bufferSize) { - ByteBuf buf = PooledByteBufAllocator.DEFAULT.directBuffer(bufferSize + alignment); + ByteBuf buf = allocator.directBuffer(bufferSize + alignment); long addr = buf.memoryAddress(); if ((addr & (alignment - 1)) == 0) { // The address is already aligned diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/BufferPool.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/BufferPool.java index 669e132d5a8..3614c65c0f8 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/BufferPool.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/BufferPool.java @@ -20,6 +20,7 @@ */ package org.apache.bookkeeper.bookie.storage.directentrylogger; +import io.netty.buffer.ByteBufAllocator; import java.io.IOException; import java.util.concurrent.ArrayBlockingQueue; import org.apache.bookkeeper.common.util.nativeio.NativeIO; @@ -30,10 +31,10 @@ public class BufferPool implements AutoCloseable { private final ArrayBlockingQueue pool; - BufferPool(NativeIO nativeIO, int bufferSize, int maxPoolSize) throws IOException { + BufferPool(NativeIO nativeIO, ByteBufAllocator allocator, int bufferSize, int maxPoolSize) throws IOException { pool = new ArrayBlockingQueue<>(maxPoolSize); for (int i = 0; i < maxPoolSize; i++) { - pool.add(new Buffer(nativeIO, bufferSize)); + pool.add(new Buffer(nativeIO, allocator, bufferSize)); } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectCompactionEntryLog.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectCompactionEntryLog.java index e6403f22140..fadde648de6 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectCompactionEntryLog.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectCompactionEntryLog.java @@ -207,7 +207,7 @@ public void markCompacted() throws IOException { public void scan(EntryLogScanner scanner) throws IOException { try (LogReader reader = new DirectReader(dstLogId, compactedFile.toString(), allocator, nativeIO, readBufferSize, maxSaneEntrySize, readBlockStats)) { - LogReaderScan.scan(reader, scanner); + LogReaderScan.scan(allocator, reader, scanner); } } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java index 3b211b54e8c..f5b74d1265d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java @@ -119,7 +119,7 @@ public DirectEntryLogger(File ledgerDir, this.allocator = allocator; int singleWriteBufferSize = Buffer.nextAlignment((int) (totalWriteBufferSize / NUMBER_OF_WRITE_BUFFERS)); - this.writeBuffers = new BufferPool(nativeIO, singleWriteBufferSize, NUMBER_OF_WRITE_BUFFERS); + this.writeBuffers = new BufferPool(nativeIO, allocator, singleWriteBufferSize, NUMBER_OF_WRITE_BUFFERS); // The total read buffer memory needs to get split across all the read threads, since the caches // are thread-specific and we want to ensure we don't pass the total memory limit. @@ -385,7 +385,7 @@ public boolean removeEntryLog(long entryLogId) { public void scanEntryLog(long entryLogId, EntryLogScanner scanner) throws IOException { checkArgument(entryLogId < Integer.MAX_VALUE, "Entry log id must be an int [%d]", entryLogId); try (LogReader reader = newDirectReader((int) entryLogId)) { - LogReaderScan.scan(reader, scanner); + LogReaderScan.scan(allocator, reader, scanner); } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectReader.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectReader.java index f5076f3484e..707bf307c05 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectReader.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectReader.java @@ -69,7 +69,7 @@ class DirectReader implements LogReader { .kv("errno", ne.getErrno()).toString()); } refreshMaxOffset(); - nativeBuffer = new Buffer(nativeIO, bufferSize); + nativeBuffer = new Buffer(nativeIO, allocator, bufferSize); } @Override diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/LogReaderScan.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/LogReaderScan.java index fdc9a0662f1..9718795143d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/LogReaderScan.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/LogReaderScan.java @@ -21,16 +21,16 @@ package org.apache.bookkeeper.bookie.storage.directentrylogger; import io.netty.buffer.ByteBuf; -import io.netty.buffer.PooledByteBufAllocator; +import io.netty.buffer.ByteBufAllocator; import io.netty.util.ReferenceCountUtil; import java.io.IOException; import org.apache.bookkeeper.bookie.storage.EntryLogScanner; class LogReaderScan { - static void scan(LogReader reader, EntryLogScanner scanner) throws IOException { + static void scan(ByteBufAllocator allocator, LogReader reader, EntryLogScanner scanner) throws IOException { int offset = Header.LOGFILE_LEGACY_HEADER_SIZE; - ByteBuf entry = PooledByteBufAllocator.DEFAULT.directBuffer(16 * 1024 * 1024); + ByteBuf entry = allocator.directBuffer(16 * 1024 * 1024); try { while (offset < reader.maxOffset()) { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestBuffer.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestBuffer.java index 6d9b4957e9f..a4d9554166c 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestBuffer.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestBuffer.java @@ -26,6 +26,7 @@ // CHECKSTYLE.OFF: IllegalImport import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.Unpooled; import io.netty.util.internal.PlatformDependent; import java.io.IOException; @@ -70,13 +71,13 @@ public void testMaxAlignment() throws Exception { @Test(expected = IllegalArgumentException.class) public void testCreateUnaligned() throws Exception { - new Buffer(new NativeIOImpl(), 1234); + new Buffer(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 1234); } @Test public void testWriteInt() throws Exception { int bufferSize = 1 << 20; - Buffer b = new Buffer(new NativeIOImpl(), bufferSize); + Buffer b = new Buffer(new NativeIOImpl(), ByteBufAllocator.DEFAULT, bufferSize); assertTrue(b.hasSpace(bufferSize)); assertEquals(0, b.position()); b.writeInt(0xdeadbeef); @@ -111,7 +112,7 @@ public void testWriteBuffer() throws Exception { ByteBuf bb = Unpooled.buffer(1021); fillByteBuf(bb, 0xdeadbeef); int bufferSize = 1 << 20; - Buffer b = new Buffer(new NativeIOImpl(), bufferSize); + Buffer b = new Buffer(new NativeIOImpl(), ByteBufAllocator.DEFAULT, bufferSize); assertEquals(0, b.position()); b.writeByteBuf(bb); assertEquals(1021, b.position()); @@ -138,7 +139,7 @@ public void testWriteBuffer() throws Exception { public void testPartialRead() throws Exception { ByteBuf bb = Unpooled.buffer(5000); - Buffer b = new Buffer(new NativeIOImpl(), 4096); + Buffer b = new Buffer(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 4096); for (int i = 0; i < 4096 / Integer.BYTES; i++) { b.writeInt(0xdeadbeef); } @@ -149,7 +150,7 @@ public void testPartialRead() throws Exception { @Test(expected = IOException.class) public void testReadIntAtBoundary() throws Exception { - Buffer b = new Buffer(new NativeIOImpl(), 4096); + Buffer b = new Buffer(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 4096); for (int i = 0; i < 4096 / Integer.BYTES; i++) { b.writeInt(0xdeadbeef); @@ -163,7 +164,7 @@ public void testReadIntAtBoundary() throws Exception { @Test(expected = IOException.class) public void testReadLongAtBoundary() throws Exception { - Buffer b = new Buffer(new NativeIOImpl(), 4096); + Buffer b = new Buffer(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 4096); for (int i = 0; i < 4096 / Integer.BYTES; i++) { b.writeInt(0xdeadbeef); @@ -177,7 +178,7 @@ public void testReadLongAtBoundary() throws Exception { @Test public void testPadToAlignment() throws Exception { - Buffer b = new Buffer(new NativeIOImpl(), 1 << 23); + Buffer b = new Buffer(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 1 << 23); for (int i = 0; i < 1025; i++) { b.writeInt(0xdededede); @@ -194,7 +195,7 @@ public void testPadToAlignment() throws Exception { @Test public void testFree() throws Exception { - Buffer b = new Buffer(new NativeIOImpl(), 1 << 23); + Buffer b = new Buffer(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 1 << 23); b.free(); // success if process doesn't explode b.free(); } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestDirectReader.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestDirectReader.java index 7ebf2709b99..75ad4437e9e 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestDirectReader.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestDirectReader.java @@ -189,7 +189,7 @@ public void testReadBufferAcrossBoundary() throws Exception { File ledgerDir = tmpDirs.createNew("readBuffer", "logs"); writeFileWithPattern(ledgerDir, 1234, 0xbeefcafe, 1, 1 << 20); - BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT * 4, 8); + BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT * 4, 8); try (LogReader reader = new DirectReader(1234, logFilename(ledgerDir, 1234), ByteBufAllocator.DEFAULT, @@ -268,7 +268,7 @@ public void testReadEntries() throws Exception { int entrySize = Buffer.ALIGNMENT / 4 + 100; Map offset2Pattern = new HashMap<>(); - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT, 8); LogWriter writer = new DirectWriter(1234, logFilename(ledgerDir, 1234), 1 << 20, MoreExecutors.newDirectExecutorService(), buffers, new NativeIOImpl(), Slogger.CONSOLE)) { @@ -315,7 +315,7 @@ public int fallocate(int fd, int mode, long offset, long len) return 0; } }; - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT, 8); LogWriter writer = new DirectWriter(1234, logFilename(ledgerDir, 1234), 1 << 20, MoreExecutors.newDirectExecutorService(), buffers, new NativeIOImpl(), Slogger.CONSOLE); @@ -353,7 +353,7 @@ public void testReadFromFileBeingWrittenReadInPreallocated() throws Exception { int entrySize = Buffer.ALIGNMENT / 2 + 8; - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT, 8); LogWriter writer = new DirectWriter(1234, logFilename(ledgerDir, 1234), 1 << 20, MoreExecutors.newDirectExecutorService(), buffers, new NativeIOImpl(), Slogger.CONSOLE); @@ -403,7 +403,8 @@ public int fallocate(int fd, int mode, long offset, long len) return 0; // don't preallocate } }; - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT * 10, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), + ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT * 10, 8); LogWriter writer = new DirectWriter(1234, logFilename(ledgerDir, 1234), 1 << 20, MoreExecutors.newDirectExecutorService(), buffers, new NativeIOImpl(), Slogger.CONSOLE)) { @@ -452,7 +453,7 @@ public void testLargeEntry() throws Exception { int entrySize = Buffer.ALIGNMENT * 4; int offset1, offset2; - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT * 8, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT * 8, 8); LogWriter writer = new DirectWriter(1234, logFilename(ledgerDir, 1234), 1 << 20, MoreExecutors.newDirectExecutorService(), buffers, new NativeIOImpl(), Slogger.CONSOLE)) { @@ -496,7 +497,7 @@ public void testLargeEntry() throws Exception { private static void writeFileWithPattern(File directory, int logId, int pattern, int blockIncrement, int fileSize) throws Exception { - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT, 8); LogWriter writer = new DirectWriter(logId, logFilename(directory, logId), fileSize, MoreExecutors.newDirectExecutorService(), buffers, new NativeIOImpl(), Slogger.CONSOLE)) { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestDirectWriter.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestDirectWriter.java index b2868c907dc..d8974147747 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestDirectWriter.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestDirectWriter.java @@ -26,6 +26,7 @@ import com.google.common.util.concurrent.MoreExecutors; import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.Unpooled; import java.io.File; import java.io.FileInputStream; @@ -61,7 +62,7 @@ public void cleanup() throws Exception { @Test(expected = IllegalArgumentException.class) public void testWriteAtAlignment() throws Exception { File ledgerDir = tmpDirs.createNew("writeAlignment", "logs"); - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT, 8); LogWriter writer = new DirectWriter(5678, logFilename(ledgerDir, 5678), 1 << 24, writeExecutor, buffers, new NativeIOImpl(), Slogger.CONSOLE)) { @@ -75,7 +76,7 @@ buffers, new NativeIOImpl(), Slogger.CONSOLE)) { @Test(expected = IllegalArgumentException.class) public void testWriteAlignmentSize() throws Exception { File ledgerDir = tmpDirs.createNew("writeAlignment", "logs"); - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT, 8); LogWriter writer = new DirectWriter(5678, logFilename(ledgerDir, 5678), 1 << 24, writeExecutor, buffers, new NativeIOImpl(), Slogger.CONSOLE)) { ByteBuf bb = Unpooled.buffer(123); @@ -88,7 +89,7 @@ buffers, new NativeIOImpl(), Slogger.CONSOLE)) { @Test public void testWriteAlignedNotAtStart() throws Exception { File ledgerDir = tmpDirs.createNew("writeAlignment", "logs"); - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT, 8); LogWriter writer = new DirectWriter(5678, logFilename(ledgerDir, 5678), 1 << 24, writeExecutor, buffers, new NativeIOImpl(), Slogger.CONSOLE)) { ByteBuf bb = Unpooled.buffer(Buffer.ALIGNMENT); @@ -102,7 +103,7 @@ buffers, new NativeIOImpl(), Slogger.CONSOLE)) { @Test(timeout = 10000) public void testFlushingWillWaitForBuffer() throws Exception { File ledgerDir = tmpDirs.createNew("writeFailFailsFlush", "logs"); - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT, 1); // only one buffer available, so we can't flush in bg LogWriter writer = new DirectWriter(5678, logFilename(ledgerDir, 5678), 1 << 24, writeExecutor, buffers, new NativeIOImpl(), Slogger.CONSOLE)) { @@ -129,7 +130,7 @@ public int pwrite(int fd, long pointer, int count, long offset) throws NativeIOE return super.pwrite(fd, pointer, count, offset); } }; - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT, 8); LogWriter writer = new DirectWriter(5678, logFilename(ledgerDir, 5678), 1 << 24, writeExecutor, buffers, io, Slogger.CONSOLE)) { for (int i = 0; i < 10; i++) { @@ -158,7 +159,7 @@ public int pwrite(int fd, long pointer, int count, long offset) throws NativeIOE } }; - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), 1 << 14, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 1 << 14, 8); LogWriter writer = new DirectWriter(5678, logFilename(ledgerDir, 5678), 1 << 24, writeExecutor, buffers, io, Slogger.CONSOLE)) { ByteBuf bb = Unpooled.buffer(Buffer.ALIGNMENT); @@ -171,7 +172,7 @@ public int pwrite(int fd, long pointer, int count, long offset) throws NativeIOE @Test public void testWriteWithPadding() throws Exception { File ledgerDir = tmpDirs.createNew("paddingWrite", "logs"); - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), 1 << 14, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 1 << 14, 8); LogWriter writer = new DirectWriter(5678, logFilename(ledgerDir, 5678), 1 << 24, writeExecutor, buffers, new NativeIOImpl(), Slogger.CONSOLE)) { ByteBuf bb = Unpooled.buffer(Buffer.ALIGNMENT); @@ -199,7 +200,7 @@ public void testWriteBlocksFlush() throws Exception { ExecutorService flushExecutor = Executors.newSingleThreadExecutor(); try { File ledgerDir = tmpDirs.createNew("blockWrite", "logs"); - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), 1 << 14, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 1 << 14, 8); LogWriter writer = new DirectWriter(1234, logFilename(ledgerDir, 1234), 1 << 24, writeExecutor, buffers, new NativeIOImpl(), Slogger.CONSOLE)) { @@ -239,7 +240,7 @@ public void testFailsToOpen() throws Exception { File ledgerDir = tmpDirs.createNew("failOpen", "logs"); ledgerDir.delete(); - BufferPool buffers = new BufferPool(new NativeIOImpl(), 1 << 14, 8); + BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 1 << 14, 8); try { new DirectWriter(1234, logFilename(ledgerDir, 1234), 1 << 30, MoreExecutors.newDirectExecutorService(), @@ -259,7 +260,7 @@ public int fallocate(int fd, int mode, long offset, long len) throw new NativeIOException("pretending I'm a mac"); } }; - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), 1 << 14, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 1 << 14, 8); LogWriter writer = new DirectWriter(3456, logFilename(ledgerDir, 3456), 1 << 24, writeExecutor, buffers, nativeIO, Slogger.CONSOLE)) { @@ -282,7 +283,7 @@ public int fallocate(int fd, int mode, long offset, long len) public void testWriteAtIntLimit() throws Exception { File ledgerDir = tmpDirs.createNew("intLimit", "logs"); - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), 1 << 14, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, 1 << 14, 8); LogWriter writer = new DirectWriter(3456, logFilename(ledgerDir, 3456), (long) Integer.MAX_VALUE + (Buffer.ALIGNMENT * 100), writeExecutor, diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestMetadata.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestMetadata.java index 953e69b5912..4aafd18ba4e 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestMetadata.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestMetadata.java @@ -55,7 +55,7 @@ public void cleanup() throws Exception { public void testReadMetaFromHeader() throws Exception { File ledgerDir = tmpDirs.createNew("writeMetadataBeforeFsync", "logs"); int logId = 5678; - try (BufferPool buffers = new BufferPool(new NativeIOImpl(), Buffer.ALIGNMENT, 8); + try (BufferPool buffers = new BufferPool(new NativeIOImpl(), ByteBufAllocator.DEFAULT, Buffer.ALIGNMENT, 8); LogWriter writer = new DirectWriter(logId, logFilename(ledgerDir, logId), 1 << 24, writeExecutor, buffers, new NativeIOImpl(), Slogger.CONSOLE)) { From 2038cf438618dcce609ec9d99acf069e928924ac Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 20 Jun 2023 04:11:30 +0300 Subject: [PATCH 047/233] Upgrade snappy-java to address multiple CVEs (#3993) Address multiple CVEs: CVE-2023-34453 CVE-2023-34454 CVE-2023-34455 See https://github.com/xerial/snappy-java/releases/tag/v1.1.10.1 (cherry picked from commit 5ca8d83aedf3f300c029eda3ec0f64bbffbbee8d) --- bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 4 ++-- bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 4 ++-- bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 4 ++-- pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index d97eca62482..3b5f140ed3d 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -317,7 +317,7 @@ Apache Software License, Version 2. - lib/io.dropwizard.metrics-metrics-jvm-4.1.12.1.jar [47] - lib/io.perfmark-perfmark-api-0.25.0.jar [48] - lib/org.conscrypt-conscrypt-openjdk-uber-2.5.1.jar [49] -- lib/org.xerial.snappy-snappy-java-1.1.7.7.jar [50] +- lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/org.hdrhistogram-HdrHistogram-2.1.10.jar [52] - lib/com.carrotsearch-hppc-0.9.1.jar [53] @@ -367,7 +367,7 @@ Apache Software License, Version 2. [47] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1 [48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.25.0 [49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.1 -[50] Source available at https://github.com/google/snappy/releases/tag/1.1.7.7 +[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.1 [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/HdrHistogram/HdrHistogram/tree/HdrHistogram-2.1.10 [53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index b8f1f292310..b31351645fd 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -289,7 +289,7 @@ Apache Software License, Version 2. - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [46] - lib/io.perfmark-perfmark-api-0.25.0.jar [47] - lib/org.conscrypt-conscrypt-openjdk-uber-2.5.1.jar [49] -- lib/org.xerial.snappy-snappy-java-1.1.7.7.jar [50] +- lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/com.carrotsearch-hppc-0.9.1.jar [52] @@ -330,7 +330,7 @@ Apache Software License, Version 2. [46] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1 [47] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.25.0 [49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.1 -[50] Source available at https://github.com/google/snappy/releases/tag/1.1.7.7 +[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.1 [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index 7383286d0c4..b26219b582a 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -314,7 +314,7 @@ Apache Software License, Version 2. - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47] - lib/io.perfmark-perfmark-api-0.25.0.jar [48] - lib/org.conscrypt-conscrypt-openjdk-uber-2.5.1.jar [49] -- lib/org.xerial.snappy-snappy-java-1.1.7.7.jar [50] +- lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/com.carrotsearch-hppc-0.9.1.jar [52] @@ -363,7 +363,7 @@ Apache Software License, Version 2. [47] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1 [48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.25.0 [49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.1 -[50] Source available at https://github.com/google/snappy/releases/tag/1.1.7.7 +[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.1 [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 diff --git a/pom.xml b/pom.xml index 9396e5f6992..3ecb97eaf2a 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ 1.17.6 4.3.8 3.8.1 - 1.1.7.7 + 1.1.10.1 2.1.2 0.9.1 From 9bfb4a921e8fd13f02af926dd7e23e8455839a7a Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 20 Jun 2023 06:33:49 +0300 Subject: [PATCH 048/233] Upgrade grpc and protobuf to address CVE-2023-32732 (#3992) ### Motivation OWASP dependency check fails because of CVE-2023-32732 in grpc. ### Changes * Upgrade grpc to 1.56.0 * Upgrade protobuf to 3.22.3 to match the version used in grpc 1.56.0 * Upgrade other grpc/protobuf related libs (cherry picked from commit e188ed82d39705132a2b4848a240dc60c50cd72b) --- .../src/main/resources/LICENSE-all.bin.txt | 64 +++++++++---------- .../src/main/resources/LICENSE-bkctl.bin.txt | 64 +++++++++---------- .../src/main/resources/LICENSE-server.bin.txt | 64 +++++++++---------- .../src/main/resources/NOTICE-all.bin.txt | 18 +++--- .../src/main/resources/NOTICE-bkctl.bin.txt | 18 +++--- .../src/main/resources/NOTICE-server.bin.txt | 18 +++--- metadata-drivers/etcd/pom.xml | 8 +++ pom.xml | 6 +- stream/common/pom.xml | 8 +++ stream/tests-common/pom.xml | 8 +++ 10 files changed, 150 insertions(+), 126 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 3b5f140ed3d..ba837481ab4 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -275,26 +275,26 @@ Apache Software License, Version 2. - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] - lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25] - lib/net.jpountz.lz4-lz4-1.3.0.jar [26] -- lib/com.google.api.grpc-proto-google-common-protos-2.0.1.jar [28] -- lib/com.google.code.gson-gson-2.9.0.jar [29] +- lib/com.google.api.grpc-proto-google-common-protos-2.17.0.jar [28] +- lib/com.google.code.gson-gson-2.10.1.jar [29] - lib/io.opencensus-opencensus-api-0.28.0.jar [30] - lib/io.opencensus-opencensus-contrib-http-util-0.28.0.jar [30] - lib/io.opencensus-opencensus-proto-0.2.0.jar [30] -- lib/io.grpc-grpc-all-1.47.0.jar [33] -- lib/io.grpc-grpc-alts-1.47.0.jar [33] -- lib/io.grpc-grpc-api-1.47.0.jar [33] -- lib/io.grpc-grpc-auth-1.47.0.jar [33] -- lib/io.grpc-grpc-context-1.47.0.jar [33] -- lib/io.grpc-grpc-core-1.47.0.jar [33] -- lib/io.grpc-grpc-grpclb-1.47.0.jar [33] -- lib/io.grpc-grpc-netty-1.47.0.jar [33] -- lib/io.grpc-grpc-protobuf-1.47.0.jar [33] -- lib/io.grpc-grpc-protobuf-lite-1.47.0.jar [33] -- lib/io.grpc-grpc-services-1.47.0.jar [33] -- lib/io.grpc-grpc-stub-1.47.0.jar [33] -- lib/io.grpc-grpc-testing-1.47.0.jar [33] -- lib/io.grpc-grpc-xds-1.47.0.jar [33] -- lib/io.grpc-grpc-rls-1.47.0.jar[33] +- lib/io.grpc-grpc-all-1.56.0.jar [33] +- lib/io.grpc-grpc-alts-1.56.0.jar [33] +- lib/io.grpc-grpc-api-1.56.0.jar [33] +- lib/io.grpc-grpc-auth-1.56.0.jar [33] +- lib/io.grpc-grpc-context-1.56.0.jar [33] +- lib/io.grpc-grpc-core-1.56.0.jar [33] +- lib/io.grpc-grpc-grpclb-1.56.0.jar [33] +- lib/io.grpc-grpc-netty-1.56.0.jar [33] +- lib/io.grpc-grpc-protobuf-1.56.0.jar [33] +- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar [33] +- lib/io.grpc-grpc-services-1.56.0.jar [33] +- lib/io.grpc-grpc-stub-1.56.0.jar [33] +- lib/io.grpc-grpc-testing-1.56.0.jar [33] +- lib/io.grpc-grpc-xds-1.56.0.jar [33] +- lib/io.grpc-grpc-rls-1.56.0.jar[33] - lib/org.apache.curator-curator-client-5.1.0.jar [34] - lib/org.apache.curator-curator-framework-5.1.0.jar [34] - lib/org.apache.curator-curator-recipes-5.1.0.jar [34] @@ -308,15 +308,15 @@ Apache Software License, Version 2. - lib/com.google.android-annotations-4.1.1.4.jar [42] - lib/com.google.http-client-google-http-client-1.41.0.jar [43] - lib/com.google.http-client-google-http-client-gson-1.41.0.jar [43] -- lib/com.google.auto.value-auto-value-annotations-1.9.jar [44] +- lib/com.google.auto.value-auto-value-annotations-1.10.1.jar [44] - lib/com.google.j2objc-j2objc-annotations-1.3.jar [45] -- lib/com.google.re2j-re2j-1.5.jar [46] +- lib/com.google.re2j-re2j-1.7.jar [46] - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47] - lib/io.dropwizard.metrics-metrics-graphite-4.1.12.1.jar [47] - lib/io.dropwizard.metrics-metrics-jmx-4.1.12.1.jar [47] - lib/io.dropwizard.metrics-metrics-jvm-4.1.12.1.jar [47] -- lib/io.perfmark-perfmark-api-0.25.0.jar [48] -- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.1.jar [49] +- lib/io.perfmark-perfmark-api-0.26.0.jar [48] +- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49] - lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/org.hdrhistogram-HdrHistogram-2.1.10.jar [52] @@ -347,10 +347,10 @@ Apache Software License, Version 2. [24] Source available at https://github.com/cbeust/jcommander/tree/1.82 [25] Source available at https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3 [26] Source available at https://github.com/lz4/lz4-java/tree/1.3.0 -[28] Source available at https://github.com/googleapis/java-common-protos/tree/v2.0.1 -[29] Source available at https://github.com/google/gson/tree/gson-parent-2.9.0 +[28] Source available at https://github.com/googleapis/java-common-protos/tree/v2.17.0 +[29] Source available at https://github.com/google/gson/tree/gson-parent-2.10.1 [30] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.28.0 -[33] Source available at https://github.com/grpc/grpc-java/tree/v1.47.0 +[33] Source available at https://github.com/grpc/grpc-java/tree/v1.56.0 [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 @@ -361,12 +361,12 @@ Apache Software License, Version 2. [41] Source available at https://github.com/apache/thrift/tree/0.14.2 [42] Source available at https://source.android.com/ [43] Source available at https://github.com/googleapis/google-http-java-client/releases/tag/v1.41.0 -[44] Source available at https://github.com/google/auto/releases/tag/auto-value-1.9 +[44] Source available at https://github.com/google/auto/releases/tag/auto-value-1.10.1 [45] Source available at https://github.com/google/j2objc/releases/tag/1.3 -[46] Source available at https://github.com/google/re2j/releases/tag/re2j-1.5 +[46] Source available at https://github.com/google/re2j/releases/tag/re2j-1.7 [47] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1 -[48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.25.0 -[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.1 +[48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.26.0 +[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.2 [50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.1 [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/HdrHistogram/HdrHistogram/tree/HdrHistogram-2.1.10 @@ -641,13 +641,13 @@ This product bundles Google Protocol Buffers, which is available under a "3-clau license. Bundled as - - lib/com.google.protobuf-protobuf-java-3.19.6.jar -Source available at https://github.com/google/protobuf/tree/v3.19.6 + - lib/com.google.protobuf-protobuf-java-3.22.3.jar +Source available at https://github.com/google/protobuf/tree/v3.22.3 For details, see deps/protobuf-3.14.0/LICENSE. Bundled as - - lib/com.google.protobuf-protobuf-java-util-3.19.6.jar -Source available at https://github.com/protocolbuffers/protobuf/tree/v3.19.6 + - lib/com.google.protobuf-protobuf-java-util-3.22.3.jar +Source available at https://github.com/protocolbuffers/protobuf/tree/v3.22.3 For details, see deps/protobuf-3.12.0/LICENSE. ------------------------------------------------------------------------------------ This product bundles the JCP Standard Java Servlet API, which is available under a diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index b31351645fd..67897da9472 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -250,26 +250,26 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.8.1-tests.jar [20] - lib/com.beust-jcommander-1.82.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] -- lib/com.google.code.gson-gson-2.9.0.jar [28] +- lib/com.google.api.grpc-proto-google-common-protos-2.17.0.jar [27] +- lib/com.google.code.gson-gson-2.10.1.jar [28] - lib/io.opencensus-opencensus-api-0.28.0.jar [29] - lib/io.opencensus-opencensus-contrib-http-util-0.28.0.jar [29] - lib/io.opencensus-opencensus-proto-0.2.0.jar [29] -- lib/io.grpc-grpc-all-1.47.0.jar [32] -- lib/io.grpc-grpc-alts-1.47.0.jar [32] -- lib/io.grpc-grpc-api-1.47.0.jar [32] -- lib/io.grpc-grpc-auth-1.47.0.jar [32] -- lib/io.grpc-grpc-context-1.47.0.jar [32] -- lib/io.grpc-grpc-core-1.47.0.jar [32] -- lib/io.grpc-grpc-grpclb-1.47.0.jar [32] -- lib/io.grpc-grpc-netty-1.47.0.jar [32] -- lib/io.grpc-grpc-protobuf-1.47.0.jar [32] -- lib/io.grpc-grpc-protobuf-lite-1.47.0.jar [32] -- lib/io.grpc-grpc-services-1.47.0.jar [32] -- lib/io.grpc-grpc-stub-1.47.0.jar [32] -- lib/io.grpc-grpc-testing-1.47.0.jar [32] -- lib/io.grpc-grpc-xds-1.47.0.jar [32] -- lib/io.grpc-grpc-rls-1.47.0.jar[32] +- lib/io.grpc-grpc-all-1.56.0.jar [32] +- lib/io.grpc-grpc-alts-1.56.0.jar [32] +- lib/io.grpc-grpc-api-1.56.0.jar [32] +- lib/io.grpc-grpc-auth-1.56.0.jar [32] +- lib/io.grpc-grpc-context-1.56.0.jar [32] +- lib/io.grpc-grpc-core-1.56.0.jar [32] +- lib/io.grpc-grpc-grpclb-1.56.0.jar [32] +- lib/io.grpc-grpc-netty-1.56.0.jar [32] +- lib/io.grpc-grpc-protobuf-1.56.0.jar [32] +- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar [32] +- lib/io.grpc-grpc-services-1.56.0.jar [32] +- lib/io.grpc-grpc-stub-1.56.0.jar [32] +- lib/io.grpc-grpc-testing-1.56.0.jar [32] +- lib/io.grpc-grpc-xds-1.56.0.jar [32] +- lib/io.grpc-grpc-rls-1.56.0.jar[32] - lib/org.apache.curator-curator-client-5.1.0.jar [33] - lib/org.apache.curator-curator-framework-5.1.0.jar [33] - lib/org.apache.curator-curator-recipes-5.1.0.jar [33] @@ -281,14 +281,14 @@ Apache Software License, Version 2. - lib/org.apache.httpcomponents-httpcore-4.4.15.jar [39] - lib/org.apache.thrift-libthrift-0.14.2.jar [40] - lib/com.google.android-annotations-4.1.1.4.jar [41] -- lib/com.google.auto.value-auto-value-annotations-1.9.jar [42] +- lib/com.google.auto.value-auto-value-annotations-1.10.1.jar [42] - lib/com.google.http-client-google-http-client-1.41.0.jar [43] - lib/com.google.http-client-google-http-client-gson-1.41.0.jar [43] - lib/com.google.j2objc-j2objc-annotations-1.3.jar [44] -- lib/com.google.re2j-re2j-1.5.jar [45] +- lib/com.google.re2j-re2j-1.7.jar [45] - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [46] -- lib/io.perfmark-perfmark-api-0.25.0.jar [47] -- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.1.jar [49] +- lib/io.perfmark-perfmark-api-0.26.0.jar [47] +- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49] - lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/com.carrotsearch-hppc-0.9.1.jar [52] @@ -310,10 +310,10 @@ Apache Software License, Version 2. [20] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0 [23] Source available at https://github.com/cbeust/jcommander/tree/1.82 [25] Source available at https://github.com/lz4/lz4-java/tree/1.3.0 -[27] Source available at https://github.com/googleapis/java-common-protos/tree/v2.0.1 -[28] Source available at https://github.com/google/gson/tree/gson-parent-2.9.0 +[27] Source available at https://github.com/googleapis/java-common-protos/tree/v2.17.0 +[28] Source available at https://github.com/google/gson/tree/gson-parent-2.10.1 [29] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.28.0 -[32] Source available at https://github.com/grpc/grpc-java/tree/v1.47.0 +[32] Source available at https://github.com/grpc/grpc-java/tree/v1.56.0 [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 @@ -323,13 +323,13 @@ Apache Software License, Version 2. [39] Source available at https://github.com/apache/httpcomponents-core/tree/rel/v4.4.15 [40] Source available at https://github.com/apache/thrift/tree/0.14.2 [41] Source available at https://source.android.com/ -[42] Source available at https://github.com/google/auto/releases/tag/auto-value-1.9 +[42] Source available at https://github.com/google/auto/releases/tag/auto-value-1.10.1 [43] Source available at https://github.com/googleapis/google-http-java-client/releases/tag/v1.41.0 [44] Source available at https://github.com/google/j2objc/releases/tag/1.3 -[45] Source available at https://github.com/google/re2j/releases/tag/re2j-1.5 +[45] Source available at https://github.com/google/re2j/releases/tag/re2j-1.7 [46] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1 -[47] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.25.0 -[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.1 +[47] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.26.0 +[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.2 [50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.1 [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 @@ -566,13 +566,13 @@ This product bundles Google Protocol Buffers, which is available under a "3-clau license. Bundled as - - lib/com.google.protobuf-protobuf-java-3.19.6.jar -Source available at https://github.com/google/protobuf/tree/v3.19.6 + - lib/com.google.protobuf-protobuf-java-3.22.3.jar +Source available at https://github.com/google/protobuf/tree/v3.22.3 For details, see deps/protobuf-3.14.0/LICENSE. Bundled as - - lib/com.google.protobuf-protobuf-java-util-3.19.6.jar -Source available at https://github.com/protocolbuffers/protobuf/tree/v3.19.6 + - lib/com.google.protobuf-protobuf-java-util-3.22.3.jar +Source available at https://github.com/protocolbuffers/protobuf/tree/v3.22.3 For details, see deps/protobuf-3.12.0/LICENSE. ------------------------------------------------------------------------------------ This product bundles Simple Logging Facade for Java, which is available under a diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index b26219b582a..4c430e85157 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -275,26 +275,26 @@ Apache Software License, Version 2. - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] - lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25] - lib/net.jpountz.lz4-lz4-1.3.0.jar [26] -- lib/com.google.api.grpc-proto-google-common-protos-2.0.1.jar [28] -- lib/com.google.code.gson-gson-2.9.0.jar [29] +- lib/com.google.api.grpc-proto-google-common-protos-2.17.0.jar [28] +- lib/com.google.code.gson-gson-2.10.1.jar [29] - lib/io.opencensus-opencensus-api-0.28.0.jar [30] - lib/io.opencensus-opencensus-contrib-http-util-0.28.0.jar [30] - lib/io.opencensus-opencensus-proto-0.2.0.jar [30] -- lib/io.grpc-grpc-all-1.47.0.jar [33] -- lib/io.grpc-grpc-alts-1.47.0.jar [33] -- lib/io.grpc-grpc-api-1.47.0.jar [33] -- lib/io.grpc-grpc-auth-1.47.0.jar [33] -- lib/io.grpc-grpc-context-1.47.0.jar [33] -- lib/io.grpc-grpc-core-1.47.0.jar [33] -- lib/io.grpc-grpc-grpclb-1.47.0.jar [33] -- lib/io.grpc-grpc-netty-1.47.0.jar [33] -- lib/io.grpc-grpc-protobuf-1.47.0.jar [33] -- lib/io.grpc-grpc-protobuf-lite-1.47.0.jar [33] -- lib/io.grpc-grpc-services-1.47.0.jar [33] -- lib/io.grpc-grpc-stub-1.47.0.jar [33] -- lib/io.grpc-grpc-testing-1.47.0.jar [33] -- lib/io.grpc-grpc-xds-1.47.0.jar [33] -- lib/io.grpc-grpc-rls-1.47.0.jar[33] +- lib/io.grpc-grpc-all-1.56.0.jar [33] +- lib/io.grpc-grpc-alts-1.56.0.jar [33] +- lib/io.grpc-grpc-api-1.56.0.jar [33] +- lib/io.grpc-grpc-auth-1.56.0.jar [33] +- lib/io.grpc-grpc-context-1.56.0.jar [33] +- lib/io.grpc-grpc-core-1.56.0.jar [33] +- lib/io.grpc-grpc-grpclb-1.56.0.jar [33] +- lib/io.grpc-grpc-netty-1.56.0.jar [33] +- lib/io.grpc-grpc-protobuf-1.56.0.jar [33] +- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar [33] +- lib/io.grpc-grpc-services-1.56.0.jar [33] +- lib/io.grpc-grpc-stub-1.56.0.jar [33] +- lib/io.grpc-grpc-testing-1.56.0.jar [33] +- lib/io.grpc-grpc-xds-1.56.0.jar [33] +- lib/io.grpc-grpc-rls-1.56.0.jar[33] - lib/org.apache.curator-curator-client-5.1.0.jar [34] - lib/org.apache.curator-curator-framework-5.1.0.jar [34] - lib/org.apache.curator-curator-recipes-5.1.0.jar [34] @@ -308,12 +308,12 @@ Apache Software License, Version 2. - lib/com.google.android-annotations-4.1.1.4.jar [42] - lib/com.google.http-client-google-http-client-1.41.0.jar [43] - lib/com.google.http-client-google-http-client-gson-1.41.0.jar [43] -- lib/com.google.auto.value-auto-value-annotations-1.9.jar [44] +- lib/com.google.auto.value-auto-value-annotations-1.10.1.jar [44] - lib/com.google.j2objc-j2objc-annotations-1.3.jar [45] -- lib/com.google.re2j-re2j-1.5.jar [46] +- lib/com.google.re2j-re2j-1.7.jar [46] - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47] -- lib/io.perfmark-perfmark-api-0.25.0.jar [48] -- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.1.jar [49] +- lib/io.perfmark-perfmark-api-0.26.0.jar [48] +- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49] - lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/com.carrotsearch-hppc-0.9.1.jar [52] @@ -343,10 +343,10 @@ Apache Software License, Version 2. [24] Source available at https://github.com/cbeust/jcommander/tree/1.82 [25] Source available at https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3 [26] Source available at https://github.com/lz4/lz4-java/tree/1.3.0 -[28] Source available at https://github.com/googleapis/java-common-protos/tree/v2.0.1 -[29] Source available at https://github.com/google/gson/tree/gson-parent-2.9.0 +[28] Source available at https://github.com/googleapis/java-common-protos/tree/v2.17.0 +[29] Source available at https://github.com/google/gson/tree/gson-parent-2.10.1 [30] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.28.0 -[33] Source available at https://github.com/grpc/grpc-java/tree/v1.47.0 +[33] Source available at https://github.com/grpc/grpc-java/tree/v1.56.0 [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 @@ -357,12 +357,12 @@ Apache Software License, Version 2. [41] Source available at https://github.com/apache/thrift/tree/0.14.2 [42] Source available at https://source.android.com/ [43] Source available at https://github.com/googleapis/google-http-java-client/releases/tag/v1.41.0 -[44] Source available at https://github.com/google/auto/releases/tag/auto-value-1.9 +[44] Source available at https://github.com/google/auto/releases/tag/auto-value-1.10.1 [45] Source available at https://github.com/google/j2objc/releases/tag/1.3 -[46] Source available at https://github.com/google/re2j/releases/tag/re2j-1.5 +[46] Source available at https://github.com/google/re2j/releases/tag/re2j-1.7 [47] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1 -[48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.25.0 -[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.1 +[48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.26.0 +[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.2 [50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.1 [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 @@ -630,13 +630,13 @@ This product bundles Google Protocol Buffers, which is available under a "3-clau license. Bundled as - - lib/com.google.protobuf-protobuf-java-3.19.6.jar -Source available at https://github.com/google/protobuf/tree/v3.19.6 + - lib/com.google.protobuf-protobuf-java-3.22.3.jar +Source available at https://github.com/google/protobuf/tree/v3.22.3 For details, see deps/protobuf-3.14.0/LICENSE. Bundled as - - lib/com.google.protobuf-protobuf-java-util-3.19.6.jar -Source available at https://github.com/protocolbuffers/protobuf/tree/v3.19.6 + - lib/com.google.protobuf-protobuf-java-util-3.22.3.jar +Source available at https://github.com/protocolbuffers/protobuf/tree/v3.22.3 For details, see deps/protobuf-3.12.0/LICENSE. ------------------------------------------------------------------------------------ This product bundles the JCP Standard Java Servlet API, which is available under a diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index 0d630af6a5f..01ceaf80c6c 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -134,15 +134,15 @@ granted provided that the copyright notice appears in all copies. Copyright 2010 Cedric Beust cedric@beust.com ------------------------------------------------------------------------------------ -- lib/io.grpc-grpc-all-1.47.0.jar -- lib/io.grpc-grpc-auth-1.47.0.jar -- lib/io.grpc-grpc-context-1.47.0.jar -- lib/io.grpc-grpc-core-1.47.0.jar -- lib/io.grpc-grpc-netty-1.47.0.jar -- lib/io.grpc-grpc-protobuf-1.47.0.jar -- lib/io.grpc-grpc-protobuf-lite-1.47.0.jar -- lib/io.grpc-grpc-stub-1.47.0.jar -- lib/io.grpc-grpc-testing-1.47.0.jar +- lib/io.grpc-grpc-all-1.56.0.jar +- lib/io.grpc-grpc-auth-1.56.0.jar +- lib/io.grpc-grpc-context-1.56.0.jar +- lib/io.grpc-grpc-core-1.56.0.jar +- lib/io.grpc-grpc-netty-1.56.0.jar +- lib/io.grpc-grpc-protobuf-1.56.0.jar +- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar +- lib/io.grpc-grpc-stub-1.56.0.jar +- lib/io.grpc-grpc-testing-1.56.0.jar Copyright 2014, gRPC Authors All rights reserved. diff --git a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt index 292620d1b02..e4c1a03a8ad 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -56,15 +56,15 @@ under the License. Copyright 2010 Cedric Beust cedric@beust.com ------------------------------------------------------------------------------------ -- lib/io.grpc-grpc-all-1.47.0.jar -- lib/io.grpc-grpc-auth-1.47.0.jar -- lib/io.grpc-grpc-context-1.47.0.jar -- lib/io.grpc-grpc-core-1.47.0.jar -- lib/io.grpc-grpc-netty-1.47.0.jar -- lib/io.grpc-grpc-protobuf-1.47.0.jar -- lib/io.grpc-grpc-protobuf-lite-1.47.0.jar -- lib/io.grpc-grpc-stub-1.47.0.jar -- lib/io.grpc-grpc-testing-1.47.0.jar +- lib/io.grpc-grpc-all-1.56.0.jar +- lib/io.grpc-grpc-auth-1.56.0.jar +- lib/io.grpc-grpc-context-1.56.0.jar +- lib/io.grpc-grpc-core-1.56.0.jar +- lib/io.grpc-grpc-netty-1.56.0.jar +- lib/io.grpc-grpc-protobuf-1.56.0.jar +- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar +- lib/io.grpc-grpc-stub-1.56.0.jar +- lib/io.grpc-grpc-testing-1.56.0.jar Copyright 2014, gRPC Authors All rights reserved. diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt index c0cd48d3356..96d7d9d664b 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -116,15 +116,15 @@ granted provided that the copyright notice appears in all copies. Copyright 2010 Cedric Beust cedric@beust.com ------------------------------------------------------------------------------------ -- lib/io.grpc-grpc-all-1.47.0.jar -- lib/io.grpc-grpc-auth-1.47.0.jar -- lib/io.grpc-grpc-context-1.47.0.jar -- lib/io.grpc-grpc-core-1.47.0.jar -- lib/io.grpc-grpc-netty-1.47.0.jar -- lib/io.grpc-grpc-protobuf-1.47.0.jar -- lib/io.grpc-grpc-protobuf-lite-1.47.0.jar -- lib/io.grpc-grpc-stub-1.47.0.jar -- lib/io.grpc-grpc-testing-1.47.0.jar +- lib/io.grpc-grpc-all-1.56.0.jar +- lib/io.grpc-grpc-auth-1.56.0.jar +- lib/io.grpc-grpc-context-1.56.0.jar +- lib/io.grpc-grpc-core-1.56.0.jar +- lib/io.grpc-grpc-netty-1.56.0.jar +- lib/io.grpc-grpc-protobuf-1.56.0.jar +- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar +- lib/io.grpc-grpc-stub-1.56.0.jar +- lib/io.grpc-grpc-testing-1.56.0.jar Copyright 2014, gRPC Authors All rights reserved. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 2d13190404e..be330511a49 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -58,6 +58,14 @@ io.grpc grpc-okhttp + + io.grpc + grpc-servlet + + + io.grpc + grpc-servlet-jakarta + diff --git a/pom.xml b/pom.xml index 3ecb97eaf2a..e8a9d83c9c7 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ 2.7.0 3.0.2 2.9.0 - 1.47.0 + 1.56.0 31.0.1-jre 1.1.1 3.3.5 @@ -161,8 +161,8 @@ 0.8.3 4.5.13 4.4.15 - 3.19.6 - 3.19.6 + 3.22.3 + 3.22.3 ${grpc.version} 0.9.11 7.9.2 diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 25a272714c2..a6d0304ca78 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -52,6 +52,14 @@ io.grpc grpc-okhttp + + io.grpc + grpc-servlet + + + io.grpc + grpc-servlet-jakarta + diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 6961f64c509..e5b5a5e937a 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -44,6 +44,14 @@ io.grpc grpc-okhttp + + io.grpc + grpc-servlet + + + io.grpc + grpc-servlet-jakarta + From d3e46307576b76d38ff87ed901f680204a979d6e Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Tue, 20 Jun 2023 09:10:41 +0800 Subject: [PATCH 049/233] Make slogger use current class (#3994) ### Motivation We use Slogger to support DirectIO Entrylogger and create the slogger instance in DbLedgerStorage and passed down to DirectIOEntrylogger. However, in the subclasses, we generate a new Slogger instance without setting the context, which leads to the Slogger instance belonging to DbLedgerStorage or Slf4j. The broker logs are as follows. ``` 2023-06-19T15:21:56,518+0800 [main] INFO org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage - ENTRYLOG_IDS_CANDIDATES_SELECTED 2023-06-19T15:21:56,561+0800 [main] INFO org.apache.bookkeeper.slogger.slf4j.Slf4jSlogger {directory=data/bookkeeper/ledgers/current, event=ENTRYLOGGER_CREATED, maxCachedReaders=32, maxCachedReadersPerThread=4, maxFileSize=1073741824, maxSaneEntrySize=5252620, perThreadBufferSize=33554432, readBufferSize=8388608, singleWriteBufferSize=33554432, totalReadBufferSize=268435456, totalWriteBufferSize=268435456} - ENTRYLOGGER_CREATED ``` Without the specific slogger instance name, it will be hard to configure a specific class to enable KV logger configuration. ### Modification Set the specific class context for each subclass slogger instance. After this change, the broker logs are as follows. ``` 2023-06-19T16:01:56,685+0800 [main] INFO org.apache.bookkeeper.bookie.storage.directentrylogger.EntryLogIdsImpl {dirs=[data/bookkeeper/ledgers/current], durationMs=0, event=ENTRYLOG_IDS_CANDIDATES_SELECTED, maxId=21474836 47, nextId=0} - ENTRYLOG_IDS_CANDIDATES_SELECTED 2023-06-19T16:01:56,721+0800 [main] INFO org.apache.bookkeeper.bookie.storage.directentrylogger.DirectEntryLogger {directory=data/bookkeeper/ledgers/current, event=ENTRYLOGGER_CREATED, maxCachedReaders=32, maxCachedReader sPerThread=4, maxFileSize=1073741824, maxSaneEntrySize=5252620, perThreadBufferSize=33554432, readBufferSize=8388608, singleWriteBufferSize=33554432, totalReadBufferSize=268435456, totalWriteBufferSize=268435456} - ENTRYLO GGER_CREATED ``` (cherry picked from commit 8085f66ecefbc6159ba3e8cc2fc04ac5dcd56d72) --- .../storage/directentrylogger/DirectCompactionEntryLog.java | 2 +- .../bookie/storage/directentrylogger/DirectEntryLogger.java | 3 +-- .../bookie/storage/directentrylogger/DirectWriter.java | 6 ++++-- .../storage/{ => directentrylogger}/EntryLogIdsImpl.java | 6 +++--- .../bookkeeper/bookie/storage/ldb/DbLedgerStorage.java | 2 +- .../apache/bookkeeper/bookie/storage/EntryLogTestUtils.java | 1 + .../storage/{ => directentrylogger}/TestEntryLogIds.java | 6 +++--- .../TestTransactionalEntryLogCompactor.java | 1 - 8 files changed, 14 insertions(+), 13 deletions(-) rename bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/{ => directentrylogger}/EntryLogIdsImpl.java (96%) rename bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/{ => directentrylogger}/TestEntryLogIds.java (98%) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectCompactionEntryLog.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectCompactionEntryLog.java index fadde648de6..58ac98fec53 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectCompactionEntryLog.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectCompactionEntryLog.java @@ -87,7 +87,7 @@ private DirectCompactionEntryLog(int srcLogId, this.srcLogId = srcLogId; this.dstLogId = dstLogId; - this.slog = slog.kv("dstLogId", dstLogId).kv("srcLogId", srcLogId).ctx(); + this.slog = slog.kv("dstLogId", dstLogId).kv("srcLogId", srcLogId).ctx(DirectCompactionEntryLog.class); } @Override diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java index f5b74d1265d..0d2d509598f 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java @@ -53,7 +53,6 @@ import org.apache.bookkeeper.bookie.EntryLogMetadata; import org.apache.bookkeeper.bookie.storage.CompactionEntryLog; import org.apache.bookkeeper.bookie.storage.EntryLogIds; -import org.apache.bookkeeper.bookie.storage.EntryLogIdsImpl; import org.apache.bookkeeper.bookie.storage.EntryLogScanner; import org.apache.bookkeeper.bookie.storage.EntryLogger; import org.apache.bookkeeper.common.util.nativeio.NativeIO; @@ -112,7 +111,7 @@ public DirectEntryLogger(File ledgerDir, this.maxSaneEntrySize = maxSaneEntrySize; this.readBufferSize = Buffer.nextAlignment(readBufferSize); this.ids = ids; - this.slog = slogParent.kv("directory", ledgerDir).ctx(); + this.slog = slogParent.kv("directory", ledgerDir).ctx(DirectEntryLogger.class); this.stats = new DirectEntryLoggerStats(stats); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectWriter.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectWriter.java index be411982d32..20a3d855b4a 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectWriter.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectWriter.java @@ -45,6 +45,7 @@ class DirectWriter implements LogWriter { final ExecutorService writeExecutor; final Object bufferLock = new Object(); final List> outstandingWrites = new ArrayList>(); + final Slogger slog; Buffer nativeBuffer; long offset; private static volatile boolean useFallocate = true; @@ -60,6 +61,7 @@ class DirectWriter implements LogWriter { this.filename = filename; this.writeExecutor = writeExecutor; this.nativeIO = nativeIO; + this.slog = slog.ctx(DirectWriter.class); offset = 0; @@ -76,7 +78,7 @@ class DirectWriter implements LogWriter { if (useFallocate) { if (!SystemUtils.IS_OS_LINUX) { disableUseFallocate(); - slog.warn(Events.FALLOCATE_NOT_AVAILABLE); + this.slog.warn(Events.FALLOCATE_NOT_AVAILABLE); } else { try { int ret = nativeIO.fallocate(fd, NativeIO.FALLOC_FL_ZERO_RANGE, 0, maxFileSize); @@ -85,7 +87,7 @@ class DirectWriter implements LogWriter { // fallocate(2) is not supported on all filesystems. Since this is an optimization, disable // subsequent usage instead of failing the operation. disableUseFallocate(); - slog.kv("message", ex.getMessage()) + this.slog.kv("message", ex.getMessage()) .kv("file", filename) .kv("errno", ex.getErrno()) .warn(Events.FALLOCATE_NOT_AVAILABLE); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/EntryLogIdsImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/EntryLogIdsImpl.java similarity index 96% rename from bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/EntryLogIdsImpl.java rename to bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/EntryLogIdsImpl.java index 704d07ed6c5..6b43fca47aa 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/EntryLogIdsImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/EntryLogIdsImpl.java @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.bookkeeper.bookie.storage; +package org.apache.bookkeeper.bookie.storage.directentrylogger; import java.io.File; import java.io.IOException; @@ -29,7 +29,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.bookkeeper.bookie.LedgerDirsManager; -import org.apache.bookkeeper.bookie.storage.directentrylogger.Events; +import org.apache.bookkeeper.bookie.storage.EntryLogIds; import org.apache.bookkeeper.slogger.Slogger; import org.apache.commons.lang3.tuple.Pair; /** @@ -48,7 +48,7 @@ public class EntryLogIdsImpl implements EntryLogIds { public EntryLogIdsImpl(LedgerDirsManager ledgerDirsManager, Slogger slog) throws IOException { this.ledgerDirsManager = ledgerDirsManager; - this.slog = slog; + this.slog = slog.ctx(EntryLogIdsImpl.class); findLargestGap(); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java index ce9e8370ea5..5b283325914 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java @@ -54,9 +54,9 @@ import org.apache.bookkeeper.bookie.LedgerDirsManager; import org.apache.bookkeeper.bookie.LedgerStorage; import org.apache.bookkeeper.bookie.StateManager; -import org.apache.bookkeeper.bookie.storage.EntryLogIdsImpl; import org.apache.bookkeeper.bookie.storage.EntryLogger; import org.apache.bookkeeper.bookie.storage.directentrylogger.DirectEntryLogger; +import org.apache.bookkeeper.bookie.storage.directentrylogger.EntryLogIdsImpl; import org.apache.bookkeeper.bookie.storage.ldb.KeyValueStorageFactory.DbConfigType; import org.apache.bookkeeper.bookie.storage.ldb.SingleDirectoryDbLedgerStorage.LedgerLoggerProcessor; import org.apache.bookkeeper.common.util.MathUtils; diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/EntryLogTestUtils.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/EntryLogTestUtils.java index 8fa4bb9f845..f88e3883af5 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/EntryLogTestUtils.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/EntryLogTestUtils.java @@ -32,6 +32,7 @@ import org.apache.bookkeeper.bookie.DefaultEntryLogger; import org.apache.bookkeeper.bookie.LedgerDirsManager; import org.apache.bookkeeper.bookie.storage.directentrylogger.DirectEntryLogger; +import org.apache.bookkeeper.bookie.storage.directentrylogger.EntryLogIdsImpl; import org.apache.bookkeeper.common.util.nativeio.NativeIOImpl; import org.apache.bookkeeper.conf.ServerConfiguration; import org.apache.bookkeeper.slogger.Slogger; diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/TestEntryLogIds.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestEntryLogIds.java similarity index 98% rename from bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/TestEntryLogIds.java rename to bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestEntryLogIds.java index 8b0d7f68bd5..787a0514be1 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/TestEntryLogIds.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestEntryLogIds.java @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.bookkeeper.bookie.storage; +package org.apache.bookkeeper.bookie.storage.directentrylogger; import static org.apache.bookkeeper.bookie.storage.EntryLogTestUtils.logIdFromLocation; import static org.apache.bookkeeper.bookie.storage.EntryLogTestUtils.makeEntry; @@ -33,8 +33,8 @@ import io.netty.buffer.ByteBuf; import java.io.File; import org.apache.bookkeeper.bookie.LedgerDirsManager; -import org.apache.bookkeeper.bookie.storage.directentrylogger.DirectCompactionEntryLog; -import org.apache.bookkeeper.bookie.storage.directentrylogger.DirectEntryLogger; +import org.apache.bookkeeper.bookie.storage.EntryLogIds; +import org.apache.bookkeeper.bookie.storage.EntryLogger; import org.apache.bookkeeper.slogger.Slogger; import org.apache.bookkeeper.test.TmpDirs; import org.apache.commons.lang3.tuple.Pair; diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestTransactionalEntryLogCompactor.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestTransactionalEntryLogCompactor.java index db79988af37..86d760d4598 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestTransactionalEntryLogCompactor.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestTransactionalEntryLogCompactor.java @@ -49,7 +49,6 @@ import org.apache.bookkeeper.bookie.MockLedgerStorage; import org.apache.bookkeeper.bookie.TransactionalEntryLogCompactor; import org.apache.bookkeeper.bookie.storage.CompactionEntryLog; -import org.apache.bookkeeper.bookie.storage.EntryLogIdsImpl; import org.apache.bookkeeper.bookie.storage.EntryLogScanner; import org.apache.bookkeeper.bookie.storage.EntryLogger; import org.apache.bookkeeper.common.util.nativeio.NativeIOImpl; From 12d0721a50709441b628d64ed8b1060af9edc944 Mon Sep 17 00:00:00 2001 From: zymap Date: Tue, 20 Jun 2023 21:36:05 +0800 Subject: [PATCH 050/233] Bump python client version to 4.16.2 --- stream/clients/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream/clients/python/setup.py b/stream/clients/python/setup.py index 03d2c8a87c2..bea58c7de83 100644 --- a/stream/clients/python/setup.py +++ b/stream/clients/python/setup.py @@ -19,7 +19,7 @@ name = 'apache-bookkeeper-client' description = 'Apache BookKeeper client library' -version = '4.16.1' +version = '4.16.2' # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta' From f548345f1d1cd0cb4aa6022da4bcc9d001adf667 Mon Sep 17 00:00:00 2001 From: zymap Date: Tue, 20 Jun 2023 21:55:52 +0800 Subject: [PATCH 051/233] Bump version to 4.16.2-SNAPSHOT --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 90 files changed, 92 insertions(+), 92 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index c7b786a2e09..a57a98e83c3 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 68df2afcc82..6b5863b5271 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 7e37723c11a..14142494a7a 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index bfa902a1f49..e5068a134d4 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 53e11269108..ea15539574d 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 7f0d86c8d43..c14ce7b1045 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 3c53c535462..f321db66741 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 167ada7944a..8cda12cdc31 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 0ee3ae1b2b9..acd80a6e6c1 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 8a2e4f65b65..89bf227f0c9 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index b307ca775ec..b9acc2fe618 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index e105e7c84ce..93b00f6d055 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index d53c3a40252..50d7e96f486 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 5640737eb4f..a38d755310c 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index db52bf7cb5c..563a95ee62d 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 94226b11867..be7b5b5ab0d 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 22d52df9d0b..da55a2a2593 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 541c071cce3..e04841259ad 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 23e333c1a46..5d5c5db8088 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index be330511a49..f2d23a699d1 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index f22dda375ff..46e92f2d141 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index dfa6cd6cc58..9b85c86af79 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 4ef4467b5e7..a65c2cfc541 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index e8a9d83c9c7..5a69db2cbcb 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 5b357ff789c..4777e0f5111 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index b491fc5d986..97b804e4e5d 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 88db77d3006..1958db3841e 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 2ecfae091ad..8456e3119fd 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 0bb20a73e95..65015c656ce 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index c247ba1e636..2f9d1546bba 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 0abc5dd27d3..7af8c59448e 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 284da098703..c61096d21bb 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index b7885a6c9b9..655a782313a 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 57f57ab687c..6fca97615c3 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 4a431ba28ed..376ddc763dd 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index d06f8007c68..d88e6968ac9 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 2c8c2ff9d76..97c41d2035f 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 554ca204383..cf05c876066 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index aa597b9514c..208893aa610 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index a2a4d432f1c..ffebbb01683 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index fe9f4b44f37..a3103a27cb3 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index a6d0304ca78..367743c34d0 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index cac43c5c702..8dd4656c267 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 1915206c938..514ba9e8c2e 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 388ea7bde87..ed3f5e0e9dd 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 00fdef05aff..d6a518cad5f 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index e8c357dc977..f43ac614b0e 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 8dfaa4df814..36943dc6cf5 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 1050538d528..64f6c1cc747 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 18eb972aa1f..d1a92241eab 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index b37e08959b1..24fb15ddf11 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 76a6eca6d57..e838dfbb219 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 43a7c94b5b8..50366c29042 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 266e631ff5d..5825e1f90f8 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index c9e2a0f794a..71d9f951a88 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index e5b5a5e937a..23bdf7b64ae 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 402b025f667..2fc4a23372a 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 008b336e0c4..99173acfcd9 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index d64727ae18c..81965f7f468 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index ca8df5dc603..3a2bc2484f6 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index a625d253cc9..5600bede76f 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index d673841c9bb..c838cf8da1e 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index cdf79010d5e..9224c156e5e 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 002212d8820..26184b68605 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index e7992d8520b..0457f7b08ed 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 99f96f68b2f..8c79dafd824 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 8da404766b8..698d07c354b 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 881fb8d61e4..1ef7c54d9be 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 350bf731dc1..fe21a8d89a5 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 59fa057863d..e2c3a5676c5 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 3016acad0b5..91317041618 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 41467b34cb2..c1da5d8c0bf 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 2fffa5a89f9..a9558064a52 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 8d04433c8f9..16e6a8a8ef4 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 18bf94de153..19c1f4b9acd 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index dcde0a7b7ff..65c292ca5f9 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 26f7d8f0d32..1473757fff1 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 21b0a718940..4ea58800a63 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index a369678dd7b..9b16d2a32fa 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 0142dbcf0bd..c43ef97f197 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index bf70960c755..dac250c8c5c 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 5be495d8c21..6f9d3966a32 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 22e2c2992f4..d4803b69432 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 02e1b37791a..df0407471f4 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index c8dffe8c60c..15f05ecff7e 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index d2941bfe039..dbe3c38539f 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 71dd242d373..08303ad43b4 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 50b89b6ece8..a13fd897523 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 090c82c8acd..b8c4f5dbefc 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index f8509d7fb4a..0c69b5b9600 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.1-SNAPSHOT + 4.16.2-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From 7fb5e9ac7f84f2b446064fedd0fa036c3e2a85bb Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 21 Jun 2023 06:09:39 +0300 Subject: [PATCH 052/233] Fix issue with binary compatibility with older grpc versions at runtime in the bookkeeper client. (#3997) ### Motivation - grpc version was upgraded to 1.56.0 in #3992 - that breaks binary compatibility for DnsNameResolverProvider class - see https://github.com/grpc/grpc-java/commit/fcb5c54e4b82d354f42ced0121928fabce9ef53f#diff-b04e884de51ed12ff79482f600a2d4ec18e405ee189a4952ae35f4d2742b7160L50 ### Changes - make the field type NameResolverProvider instead of DnsNameResolverProvider - this prevents possible NoSuchMethodError errors about DnsNameResolverProvider.newNameResolver method (cherry picked from commit ffc8e8bec19e54dc76710c3de133401248f243d6) --- .../bookkeeper/common/resolver/ServiceNameResolverProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream/common/src/main/java/org/apache/bookkeeper/common/resolver/ServiceNameResolverProvider.java b/stream/common/src/main/java/org/apache/bookkeeper/common/resolver/ServiceNameResolverProvider.java index 53e74891f90..a3a1b29a6b4 100644 --- a/stream/common/src/main/java/org/apache/bookkeeper/common/resolver/ServiceNameResolverProvider.java +++ b/stream/common/src/main/java/org/apache/bookkeeper/common/resolver/ServiceNameResolverProvider.java @@ -40,7 +40,7 @@ @Slf4j public final class ServiceNameResolverProvider extends NameResolverFactoryProvider { - private final DnsNameResolverProvider dnsProvider; + private final NameResolverProvider dnsProvider; private final Resource executorResource; public ServiceNameResolverProvider() { From ad3fb70d16dbf49ce4b7186fa5f82bd521ba0c57 Mon Sep 17 00:00:00 2001 From: zymap Date: Wed, 21 Jun 2023 06:31:31 +0000 Subject: [PATCH 053/233] [maven-release-plugin] prepare release v4.16.2-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +++++- bookkeeper-dist/bkctl/pom.xml | 6 +++++- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +++++- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +++++- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +++++- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +++++- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +++++- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +++++- shaded/distributedlog-core-shaded/pom.xml | 6 +++++- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +++++- .../codahale-metrics-provider/pom.xml | 6 +++++- stats/bookkeeper-stats-providers/pom.xml | 6 +++++- .../prometheus-metrics-provider/pom.xml | 6 +++++- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +++++- stream/api/pom.xml | 6 +++++- stream/bk-grpc-name-resolver/pom.xml | 6 +++++- stream/clients/java/all/pom.xml | 6 +++++- stream/clients/java/base/pom.xml | 6 +++++- stream/clients/java/kv/pom.xml | 6 +++++- stream/clients/java/pom.xml | 6 +++++- stream/clients/pom.xml | 6 +++++- stream/common/pom.xml | 6 +++++- stream/distributedlog/common/pom.xml | 6 +++++- stream/distributedlog/core/pom.xml | 6 +++++- stream/distributedlog/io/dlfs/pom.xml | 6 +++++- stream/distributedlog/io/pom.xml | 6 +++++- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +++++- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +++++- stream/server/pom.xml | 6 +++++- stream/statelib/pom.xml | 6 +++++- stream/storage/api/pom.xml | 6 +++++- stream/storage/impl/pom.xml | 6 +++++- stream/storage/pom.xml | 6 +++++- stream/tests-common/pom.xml | 6 +++++- tests/backward-compat/bc-non-fips/pom.xml | 6 +++++- tests/backward-compat/current-server-old-clients/pom.xml | 6 +++++- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +++++- tests/backward-compat/hostname-bookieid/pom.xml | 6 +++++- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +++++- tests/backward-compat/pom.xml | 6 +++++- tests/backward-compat/recovery-no-password/pom.xml | 6 +++++- tests/backward-compat/upgrade-direct/pom.xml | 6 +++++- tests/backward-compat/upgrade/pom.xml | 6 +++++- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +++++- tests/docker-images/all-released-versions-image/pom.xml | 6 +++++- tests/docker-images/all-versions-image/pom.xml | 6 +++++- tests/docker-images/pom.xml | 6 +++++- tests/integration-tests-base-groovy/pom.xml | 6 +++++- tests/integration-tests-base/pom.xml | 6 +++++- tests/integration-tests-topologies/pom.xml | 6 +++++- tests/integration-tests-utils/pom.xml | 6 +++++- tests/integration/cluster/pom.xml | 6 +++++- tests/integration/pom.xml | 6 +++++- tests/integration/smoke/pom.xml | 6 +++++- tests/integration/standalone/pom.xml | 6 +++++- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +++++- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +++++- tests/shaded/pom.xml | 6 +++++- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +++++- tools/framework/pom.xml | 6 +++++- tools/ledger/pom.xml | 6 +++++- tools/perf/pom.xml | 6 +++++- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +++++- 90 files changed, 353 insertions(+), 93 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index a57a98e83c3..f14e8d47310 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 6b5863b5271..4101dbcb2e1 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 14142494a7a..cb757dcf4fa 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index e5068a134d4..1ae9f91a8c8 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -154,4 +154,8 @@ + + + v4.16.2-rc0 + diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index ea15539574d..fe0af0a148c 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -79,4 +79,8 @@ + + + v4.16.2-rc0 + diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index c14ce7b1045..530c89cf403 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index f321db66741..4206d92d2af 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -129,4 +129,8 @@ + + + v4.16.2-rc0 + diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 8cda12cdc31..e5285b67e92 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index acd80a6e6c1..de6950c07d1 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 89bf227f0c9..8c623476a4e 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index b9acc2fe618..0c22a98ea38 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 93b00f6d055..cac53b61364 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 50d7e96f486..d752f0bc9e3 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index a38d755310c..31b88359a7b 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,10 +18,14 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API + + + v4.16.2-rc0 + diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 563a95ee62d..90f4889d878 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index be7b5b5ab0d..fd78793ec8f 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -31,4 +31,8 @@ ${project.parent.version} + + + v4.16.2-rc0 + diff --git a/buildtools/pom.xml b/buildtools/pom.xml index da55a2a2593..890211c5197 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 buildtools Apache BookKeeper :: Build Tools - 4.16.2-SNAPSHOT + 4.16.2 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index e04841259ad..7c3042aa510 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 5d5c5db8088..31669535be4 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index f2d23a699d1..1d04e488b06 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.2-SNAPSHOT + 4.16.2 .. 4.0.0 @@ -158,4 +158,8 @@ + + + v4.16.2-rc0 + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 46e92f2d141..21223c2d491 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 9b85c86af79..7c280f13be8 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index a65c2cfc541..afde4f76401 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. diff --git a/pom.xml b/pom.xml index 5a69db2cbcb..e627894a0f2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.13 + v4.16.2-rc0 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 4777e0f5111..1e69bea727d 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2-SNAPSHOT + 4.16.2 .. bookkeeper-server-shaded @@ -126,4 +126,8 @@ + + + v4.16.2-rc0 + diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 97b804e4e5d..3cf67c7026e 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2-SNAPSHOT + 4.16.2 .. bookkeeper-server-tests-shaded @@ -144,4 +144,8 @@ + + + v4.16.2-rc0 + diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 1958db3841e..f46b9c463db 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.distributedlog @@ -238,4 +238,8 @@ + + + v4.16.2-rc0 + diff --git a/shaded/pom.xml b/shaded/pom.xml index 8456e3119fd..793aabc3c0b 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 65015c656ce..03e383f50dd 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,4 +59,8 @@ + + + v4.16.2-rc0 + diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 2f9d1546bba..80d0de0fd9c 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,4 +53,8 @@ guava + + + v4.16.2-rc0 + diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 7af8c59448e..889b0e63644 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 bookkeeper-stats-providers @@ -29,4 +29,8 @@ codahale-metrics-provider prometheus-metrics-provider + + + v4.16.2-rc0 + diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index c61096d21bb..1639bab4626 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,4 +72,8 @@ + + + v4.16.2-rc0 + diff --git a/stats/pom.xml b/stats/pom.xml index 655a782313a..e224b3bbb20 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 6fca97615c3..04fbcf5e1ec 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,4 +50,8 @@ jackson-annotations + + + v4.16.2-rc0 + diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 376ddc763dd..818d6beffb5 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -46,4 +46,8 @@ freebuilder + + + v4.16.2-rc0 + diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index d88e6968ac9..b9f1f216530 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -77,4 +77,8 @@ test + + + v4.16.2-rc0 + diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 97c41d2035f..2c0bb907085 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2-SNAPSHOT + 4.16.2 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,4 +112,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index cf05c876066..56ca5841cd8 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2-SNAPSHOT + 4.16.2 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,4 +59,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 208893aa610..714277894b0 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2-SNAPSHOT + 4.16.2 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,4 +47,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index ffebbb01683..0b510051aaa 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.2-SNAPSHOT + 4.16.2 .. stream-storage-java-client-parent @@ -31,4 +31,8 @@ kv all + + + v4.16.2-rc0 + diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index a3103a27cb3..f1bbc2c5fa5 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.2 .. stream-storage-clients-parent @@ -47,4 +47,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 367743c34d0..49d4d94145b 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -82,4 +82,8 @@ test + + + v4.16.2-rc0 + diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 8dd4656c267..61e6585594c 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.2 distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,4 +106,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 514ba9e8c2e..96346871861 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.2 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,4 +138,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index ed3f5e0e9dd..b4af81ff339 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.2-SNAPSHOT + 4.16.2 ../.. org.apache.distributedlog @@ -100,4 +100,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index d6a518cad5f..d7ed17dc6f4 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 distributedlog-io @@ -28,4 +28,8 @@ dlfs + + + v4.16.2-rc0 + diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f43ac614b0e..c5b09c4e528 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 36943dc6cf5..2ca83e33202 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.2 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,4 +61,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/pom.xml b/stream/pom.xml index 64f6c1cc747..12865e22d44 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index d1a92241eab..e88734423d8 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -118,4 +118,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 24fb15ddf11..f3874bd788c 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.2 stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,4 +82,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index e838dfbb219..cf758f4e325 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -130,4 +130,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 50366c29042..48536c853ad 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.2-SNAPSHOT + 4.16.2 .. stream-storage-service-api @@ -55,4 +55,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 5825e1f90f8..32bca35f76e 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.2-SNAPSHOT + 4.16.2 .. stream-storage-service-impl @@ -121,4 +121,8 @@ + + + v4.16.2-rc0 + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 71d9f951a88..8eab8c0a105 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.2 .. stream-storage-service-parent @@ -30,4 +30,8 @@ api impl + + + v4.16.2-rc0 + diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 23bdf7b64ae..149a56da903 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper.tests @@ -123,4 +123,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 2fc4a23372a..3a5df391606 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -76,4 +76,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 99173acfcd9..e4013367451 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server + + + v4.16.2-rc0 + diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 81965f7f468..c36bb8419a2 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager + + + v4.16.2-rc0 + diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 3a2bc2484f6..d8e22ff0089 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) + + + v4.16.2-rc0 + diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 5600bede76f..8013663053e 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies + + + v4.16.2-rc0 + diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index c838cf8da1e..befca0258d0 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.2-SNAPSHOT + 4.16.2 ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,4 +49,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 9224c156e5e..7e754945743 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -36,4 +36,8 @@ ${project.version} + + + v4.16.2-rc0 + diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 26184b68605..ff561ab9d61 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version + + + v4.16.2-rc0 + diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 0457f7b08ed..41f1c7dc8d2 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version + + + v4.16.2-rc0 + diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 8c79dafd824..fca2e29f491 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current + + + v4.16.2-rc0 + diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 698d07c354b..af6734b241a 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 org.apache.bookkeeper.tests @@ -68,4 +68,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 1ef7c54d9be..b6ac31162b1 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 org.apache.bookkeeper.tests @@ -108,4 +108,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index fe21a8d89a5..1fffe5d35ca 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests docker-images @@ -30,4 +30,8 @@ all-released-versions-image all-versions-image + + + v4.16.2-rc0 + diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index e2c3a5676c5..930324e3825 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.2-SNAPSHOT + 4.16.2 ../integration-tests-base @@ -109,4 +109,8 @@ test + + + v4.16.2-rc0 + diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 91317041618..a468cd77435 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index c1da5d8c0bf..2b24969aa8e 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests @@ -45,4 +45,8 @@ ${project.version} + + + v4.16.2-rc0 + diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index a9558064a52..3a196726a88 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 16e6a8a8ef4..0eee49c1d9e 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -83,4 +83,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 19c1f4b9acd..68277777007 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests integration @@ -70,4 +70,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 65c292ca5f9..5d7327d3542 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -72,4 +72,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 1473757fff1..b4a6d2d0c99 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -68,4 +68,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/pom.xml b/tests/pom.xml index 4ea58800a63..6ce53127096 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 9b16d2a32fa..df9d0e10d9a 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests @@ -73,4 +73,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index c43ef97f197..d3e4fc949e0 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2-SNAPSHOT + 4.16.2 .. bookkeeper-server-shaded-test @@ -59,4 +59,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index dac250c8c5c..07c8160e9a2 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2-SNAPSHOT + 4.16.2 .. bookkeeper-server-tests-shaded-test @@ -75,4 +75,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 6f9d3966a32..f89a21dbfaf 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2-SNAPSHOT + 4.16.2 .. distributedlog-core-shaded-test @@ -84,4 +84,8 @@ + + + v4.16.2-rc0 + diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d4803b69432..91bb8aad915 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper.tests.shaded @@ -32,4 +32,8 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test + + + v4.16.2-rc0 + diff --git a/testtools/pom.xml b/testtools/pom.xml index df0407471f4..fc29b1849fd 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 testtools Apache BookKeeper :: Test Tools - 4.16.2-SNAPSHOT + 4.16.2 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 15f05ecff7e..b3a6349a445 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-tools Apache BookKeeper :: Tools @@ -79,4 +79,8 @@ + + + v4.16.2-rc0 + diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index dbe3c38539f..a39507b1ff2 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,4 +41,8 @@ test + + + v4.16.2-rc0 + diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 08303ad43b4..67f7c53473f 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,4 +71,8 @@ test + + + v4.16.2-rc0 + diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index a13fd897523..c14443233d3 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,4 +48,8 @@ HdrHistogram + + + v4.16.2-rc0 + diff --git a/tools/pom.xml b/tools/pom.xml index b8c4f5dbefc..ecbdf2ce4c9 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 0c69b5b9600..ea22027ecd4 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.2-SNAPSHOT + 4.16.2 stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,4 +48,8 @@ ${project.version} + + + v4.16.2-rc0 + From d042bf7fb130a436c25003f963f631fc46d45793 Mon Sep 17 00:00:00 2001 From: zymap Date: Wed, 21 Jun 2023 06:31:39 +0000 Subject: [PATCH 054/233] [maven-release-plugin] rollback changes from release preparation of v4.16.2-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +----- bookkeeper-dist/bkctl/pom.xml | 6 +----- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +----- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +----- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +----- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +----- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +----- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +----- shaded/distributedlog-core-shaded/pom.xml | 6 +----- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +----- .../codahale-metrics-provider/pom.xml | 6 +----- stats/bookkeeper-stats-providers/pom.xml | 6 +----- .../prometheus-metrics-provider/pom.xml | 6 +----- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +----- stream/api/pom.xml | 6 +----- stream/bk-grpc-name-resolver/pom.xml | 6 +----- stream/clients/java/all/pom.xml | 6 +----- stream/clients/java/base/pom.xml | 6 +----- stream/clients/java/kv/pom.xml | 6 +----- stream/clients/java/pom.xml | 6 +----- stream/clients/pom.xml | 6 +----- stream/common/pom.xml | 6 +----- stream/distributedlog/common/pom.xml | 6 +----- stream/distributedlog/core/pom.xml | 6 +----- stream/distributedlog/io/dlfs/pom.xml | 6 +----- stream/distributedlog/io/pom.xml | 6 +----- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +----- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +----- stream/server/pom.xml | 6 +----- stream/statelib/pom.xml | 6 +----- stream/storage/api/pom.xml | 6 +----- stream/storage/impl/pom.xml | 6 +----- stream/storage/pom.xml | 6 +----- stream/tests-common/pom.xml | 6 +----- tests/backward-compat/bc-non-fips/pom.xml | 6 +----- tests/backward-compat/current-server-old-clients/pom.xml | 6 +----- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +----- tests/backward-compat/hostname-bookieid/pom.xml | 6 +----- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +----- tests/backward-compat/pom.xml | 6 +----- tests/backward-compat/recovery-no-password/pom.xml | 6 +----- tests/backward-compat/upgrade-direct/pom.xml | 6 +----- tests/backward-compat/upgrade/pom.xml | 6 +----- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +----- tests/docker-images/all-released-versions-image/pom.xml | 6 +----- tests/docker-images/all-versions-image/pom.xml | 6 +----- tests/docker-images/pom.xml | 6 +----- tests/integration-tests-base-groovy/pom.xml | 6 +----- tests/integration-tests-base/pom.xml | 6 +----- tests/integration-tests-topologies/pom.xml | 6 +----- tests/integration-tests-utils/pom.xml | 6 +----- tests/integration/cluster/pom.xml | 6 +----- tests/integration/pom.xml | 6 +----- tests/integration/smoke/pom.xml | 6 +----- tests/integration/standalone/pom.xml | 6 +----- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +----- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +----- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +----- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +----- tests/shaded/pom.xml | 6 +----- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +----- tools/framework/pom.xml | 6 +----- tools/ledger/pom.xml | 6 +----- tools/perf/pom.xml | 6 +----- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +----- 90 files changed, 93 insertions(+), 353 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index f14e8d47310..a57a98e83c3 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 4101dbcb2e1..6b5863b5271 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index cb757dcf4fa..14142494a7a 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 1ae9f91a8c8..e5068a134d4 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -154,8 +154,4 @@ - - - v4.16.2-rc0 - diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index fe0af0a148c..ea15539574d 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -79,8 +79,4 @@ - - - v4.16.2-rc0 - diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 530c89cf403..c14ce7b1045 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 4206d92d2af..f321db66741 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -129,8 +129,4 @@ - - - v4.16.2-rc0 - diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index e5285b67e92..8cda12cdc31 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index de6950c07d1..acd80a6e6c1 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 8c623476a4e..89bf227f0c9 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 0c22a98ea38..b9acc2fe618 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index cac53b61364..93b00f6d055 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index d752f0bc9e3..50d7e96f486 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 31b88359a7b..a38d755310c 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,14 +18,10 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API - - - v4.16.2-rc0 - diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 90f4889d878..563a95ee62d 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index fd78793ec8f..be7b5b5ab0d 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -31,8 +31,4 @@ ${project.parent.version} - - - v4.16.2-rc0 - diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 890211c5197..da55a2a2593 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.2 + 4.16.2-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 7c3042aa510..e04841259ad 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 31669535be4..5d5c5db8088 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 1d04e488b06..f2d23a699d1 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.2 + 4.16.2-SNAPSHOT .. 4.0.0 @@ -158,8 +158,4 @@ - - - v4.16.2-rc0 - diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 21223c2d491..46e92f2d141 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 7c280f13be8..9b85c86af79 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index afde4f76401..a65c2cfc541 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index e627894a0f2..5a69db2cbcb 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.2-rc0 + branch-4.13 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 1e69bea727d..4777e0f5111 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2 + 4.16.2-SNAPSHOT .. bookkeeper-server-shaded @@ -126,8 +126,4 @@ - - - v4.16.2-rc0 - diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 3cf67c7026e..97b804e4e5d 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2 + 4.16.2-SNAPSHOT .. bookkeeper-server-tests-shaded @@ -144,8 +144,4 @@ - - - v4.16.2-rc0 - diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index f46b9c463db..1958db3841e 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.distributedlog @@ -238,8 +238,4 @@ - - - v4.16.2-rc0 - diff --git a/shaded/pom.xml b/shaded/pom.xml index 793aabc3c0b..8456e3119fd 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 03e383f50dd..65015c656ce 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,8 +59,4 @@ - - - v4.16.2-rc0 - diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 80d0de0fd9c..2f9d1546bba 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,8 +53,4 @@ guava - - - v4.16.2-rc0 - diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 889b0e63644..7af8c59448e 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 bookkeeper-stats-providers @@ -29,8 +29,4 @@ codahale-metrics-provider prometheus-metrics-provider - - - v4.16.2-rc0 - diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 1639bab4626..c61096d21bb 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,8 +72,4 @@ - - - v4.16.2-rc0 - diff --git a/stats/pom.xml b/stats/pom.xml index e224b3bbb20..655a782313a 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 04fbcf5e1ec..6fca97615c3 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,8 +50,4 @@ jackson-annotations - - - v4.16.2-rc0 - diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 818d6beffb5..376ddc763dd 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -46,8 +46,4 @@ freebuilder - - - v4.16.2-rc0 - diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index b9f1f216530..d88e6968ac9 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -77,8 +77,4 @@ test - - - v4.16.2-rc0 - diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 2c0bb907085..97c41d2035f 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2 + 4.16.2-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,8 +112,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 56ca5841cd8..cf05c876066 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2 + 4.16.2-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,8 +59,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 714277894b0..208893aa610 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2 + 4.16.2-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,8 +47,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 0b510051aaa..ffebbb01683 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.2 + 4.16.2-SNAPSHOT .. stream-storage-java-client-parent @@ -31,8 +31,4 @@ kv all - - - v4.16.2-rc0 - diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index f1bbc2c5fa5..a3103a27cb3 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2 + 4.16.2-SNAPSHOT .. stream-storage-clients-parent @@ -47,8 +47,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 49d4d94145b..367743c34d0 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -82,8 +82,4 @@ test - - - v4.16.2-rc0 - diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 61e6585594c..8dd4656c267 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2 + 4.16.2-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,8 +106,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 96346871861..514ba9e8c2e 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2 + 4.16.2-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,8 +138,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index b4af81ff339..ed3f5e0e9dd 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.2 + 4.16.2-SNAPSHOT ../.. org.apache.distributedlog @@ -100,8 +100,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index d7ed17dc6f4..d6a518cad5f 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 distributedlog-io @@ -28,8 +28,4 @@ dlfs - - - v4.16.2-rc0 - diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index c5b09c4e528..f43ac614b0e 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 2ca83e33202..36943dc6cf5 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2 + 4.16.2-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,8 +61,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/pom.xml b/stream/pom.xml index 12865e22d44..64f6c1cc747 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index e88734423d8..d1a92241eab 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -118,8 +118,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/server/pom.xml b/stream/server/pom.xml index f3874bd788c..24fb15ddf11 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2 + 4.16.2-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,8 +82,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index cf758f4e325..e838dfbb219 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -130,8 +130,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 48536c853ad..50366c29042 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.2 + 4.16.2-SNAPSHOT .. stream-storage-service-api @@ -55,8 +55,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 32bca35f76e..5825e1f90f8 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.2 + 4.16.2-SNAPSHOT .. stream-storage-service-impl @@ -121,8 +121,4 @@ - - - v4.16.2-rc0 - diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 8eab8c0a105..71d9f951a88 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2 + 4.16.2-SNAPSHOT .. stream-storage-service-parent @@ -30,8 +30,4 @@ api impl - - - v4.16.2-rc0 - diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 149a56da903..23bdf7b64ae 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper.tests @@ -123,8 +123,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 3a5df391606..2fc4a23372a 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -76,8 +76,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index e4013367451..99173acfcd9 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server - - - v4.16.2-rc0 - diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index c36bb8419a2..81965f7f468 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager - - - v4.16.2-rc0 - diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index d8e22ff0089..3a2bc2484f6 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) - - - v4.16.2-rc0 - diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 8013663053e..5600bede76f 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies - - - v4.16.2-rc0 - diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index befca0258d0..c838cf8da1e 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.2 + 4.16.2-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,8 +49,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 7e754945743..9224c156e5e 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -36,8 +36,4 @@ ${project.version} - - - v4.16.2-rc0 - diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index ff561ab9d61..26184b68605 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version - - - v4.16.2-rc0 - diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 41f1c7dc8d2..0457f7b08ed 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version - - - v4.16.2-rc0 - diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index fca2e29f491..8c79dafd824 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current - - - v4.16.2-rc0 - diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index af6734b241a..698d07c354b 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -68,8 +68,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index b6ac31162b1..1ef7c54d9be 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -108,8 +108,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 1fffe5d35ca..fe21a8d89a5 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests docker-images @@ -30,8 +30,4 @@ all-released-versions-image all-versions-image - - - v4.16.2-rc0 - diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 930324e3825..e2c3a5676c5 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.2 + 4.16.2-SNAPSHOT ../integration-tests-base @@ -109,8 +109,4 @@ test - - - v4.16.2-rc0 - diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index a468cd77435..91317041618 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 2b24969aa8e..c1da5d8c0bf 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests @@ -45,8 +45,4 @@ ${project.version} - - - v4.16.2-rc0 - diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 3a196726a88..a9558064a52 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 0eee49c1d9e..16e6a8a8ef4 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -83,8 +83,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 68277777007..19c1f4b9acd 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests integration @@ -70,8 +70,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 5d7327d3542..65c292ca5f9 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -72,8 +72,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index b4a6d2d0c99..1473757fff1 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -68,8 +68,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/pom.xml b/tests/pom.xml index 6ce53127096..4ea58800a63 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index df9d0e10d9a..9b16d2a32fa 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests @@ -73,8 +73,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index d3e4fc949e0..c43ef97f197 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2 + 4.16.2-SNAPSHOT .. bookkeeper-server-shaded-test @@ -59,8 +59,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 07c8160e9a2..dac250c8c5c 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2 + 4.16.2-SNAPSHOT .. bookkeeper-server-tests-shaded-test @@ -75,8 +75,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index f89a21dbfaf..6f9d3966a32 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2 + 4.16.2-SNAPSHOT .. distributedlog-core-shaded-test @@ -84,8 +84,4 @@ - - - v4.16.2-rc0 - diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 91bb8aad915..d4803b69432 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper.tests.shaded @@ -32,8 +32,4 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test - - - v4.16.2-rc0 - diff --git a/testtools/pom.xml b/testtools/pom.xml index fc29b1849fd..df0407471f4 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.2 + 4.16.2-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index b3a6349a445..15f05ecff7e 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools @@ -79,8 +79,4 @@ - - - v4.16.2-rc0 - diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index a39507b1ff2..dbe3c38539f 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,8 +41,4 @@ test - - - v4.16.2-rc0 - diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 67f7c53473f..08303ad43b4 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,8 +71,4 @@ test - - - v4.16.2-rc0 - diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index c14443233d3..a13fd897523 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,8 +48,4 @@ HdrHistogram - - - v4.16.2-rc0 - diff --git a/tools/pom.xml b/tools/pom.xml index ecbdf2ce4c9..b8c4f5dbefc 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index ea22027ecd4..0c69b5b9600 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.2 + 4.16.2-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,8 +48,4 @@ ${project.version} - - - v4.16.2-rc0 - From 9f63cf7e50fde97d22c1e3b1dd2f299c970769d8 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Mon, 26 Jun 2023 09:08:52 +0800 Subject: [PATCH 055/233] [Branch-4.16] Downgrade grpc and protobuf to avoid introducing breaking change (#4001) * Downgrade grpc to 1.54.1 --- ### Motivation We upgrade grpc and protobuf to address CVE-2023-32732. But it requires the protobuf 3.22+. In protobuf 3.22.0, it introduces a breaking change. It require all the sub-project, which depends on the bookkeeper to upgrade protobuf to 3.22.0+. It should not be acceptable in a minor release. So we use a lower version of grpc and protobuf to address the CVE issue. See more context: https://github.com/apache/bookkeeper/pull/3997 --- .../src/main/resources/LICENSE-all.bin.txt | 48 +++++++++---------- .../src/main/resources/LICENSE-bkctl.bin.txt | 48 +++++++++---------- .../src/main/resources/LICENSE-server.bin.txt | 48 +++++++++---------- .../src/main/resources/NOTICE-all.bin.txt | 18 +++---- .../src/main/resources/NOTICE-bkctl.bin.txt | 18 +++---- .../src/main/resources/NOTICE-server.bin.txt | 18 +++---- pom.xml | 6 +-- 7 files changed, 102 insertions(+), 102 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index ba837481ab4..06e582cd996 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -275,26 +275,26 @@ Apache Software License, Version 2. - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] - lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25] - lib/net.jpountz.lz4-lz4-1.3.0.jar [26] -- lib/com.google.api.grpc-proto-google-common-protos-2.17.0.jar [28] -- lib/com.google.code.gson-gson-2.10.1.jar [29] +- lib/com.google.api.grpc-proto-google-common-protos-2.9.0.jar [28] +- lib/com.google.code.gson-gson-2.9.0.jar [29] - lib/io.opencensus-opencensus-api-0.28.0.jar [30] - lib/io.opencensus-opencensus-contrib-http-util-0.28.0.jar [30] - lib/io.opencensus-opencensus-proto-0.2.0.jar [30] -- lib/io.grpc-grpc-all-1.56.0.jar [33] -- lib/io.grpc-grpc-alts-1.56.0.jar [33] -- lib/io.grpc-grpc-api-1.56.0.jar [33] -- lib/io.grpc-grpc-auth-1.56.0.jar [33] -- lib/io.grpc-grpc-context-1.56.0.jar [33] -- lib/io.grpc-grpc-core-1.56.0.jar [33] -- lib/io.grpc-grpc-grpclb-1.56.0.jar [33] -- lib/io.grpc-grpc-netty-1.56.0.jar [33] -- lib/io.grpc-grpc-protobuf-1.56.0.jar [33] -- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar [33] -- lib/io.grpc-grpc-services-1.56.0.jar [33] -- lib/io.grpc-grpc-stub-1.56.0.jar [33] -- lib/io.grpc-grpc-testing-1.56.0.jar [33] -- lib/io.grpc-grpc-xds-1.56.0.jar [33] -- lib/io.grpc-grpc-rls-1.56.0.jar[33] +- lib/io.grpc-grpc-all-1.54.1.jar [33] +- lib/io.grpc-grpc-alts-1.54.1.jar [33] +- lib/io.grpc-grpc-api-1.54.1.jar [33] +- lib/io.grpc-grpc-auth-1.54.1.jar [33] +- lib/io.grpc-grpc-context-1.54.1.jar [33] +- lib/io.grpc-grpc-core-1.54.1.jar [33] +- lib/io.grpc-grpc-grpclb-1.54.1.jar [33] +- lib/io.grpc-grpc-netty-1.54.1.jar [33] +- lib/io.grpc-grpc-protobuf-1.54.1.jar [33] +- lib/io.grpc-grpc-protobuf-lite-1.54.1.jar [33] +- lib/io.grpc-grpc-services-1.54.1.jar [33] +- lib/io.grpc-grpc-stub-1.54.1.jar [33] +- lib/io.grpc-grpc-testing-1.54.1.jar [33] +- lib/io.grpc-grpc-xds-1.54.1.jar [33] +- lib/io.grpc-grpc-rls-1.54.1.jar[33] - lib/org.apache.curator-curator-client-5.1.0.jar [34] - lib/org.apache.curator-curator-framework-5.1.0.jar [34] - lib/org.apache.curator-curator-recipes-5.1.0.jar [34] @@ -308,14 +308,14 @@ Apache Software License, Version 2. - lib/com.google.android-annotations-4.1.1.4.jar [42] - lib/com.google.http-client-google-http-client-1.41.0.jar [43] - lib/com.google.http-client-google-http-client-gson-1.41.0.jar [43] -- lib/com.google.auto.value-auto-value-annotations-1.10.1.jar [44] +- lib/com.google.auto.value-auto-value-annotations-1.9.jar [44] - lib/com.google.j2objc-j2objc-annotations-1.3.jar [45] -- lib/com.google.re2j-re2j-1.7.jar [46] +- lib/com.google.re2j-re2j-1.6.jar [46] - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47] - lib/io.dropwizard.metrics-metrics-graphite-4.1.12.1.jar [47] - lib/io.dropwizard.metrics-metrics-jmx-4.1.12.1.jar [47] - lib/io.dropwizard.metrics-metrics-jvm-4.1.12.1.jar [47] -- lib/io.perfmark-perfmark-api-0.26.0.jar [48] +- lib/io.perfmark-perfmark-api-0.25.0.jar [48] - lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49] - lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] @@ -641,13 +641,13 @@ This product bundles Google Protocol Buffers, which is available under a "3-clau license. Bundled as - - lib/com.google.protobuf-protobuf-java-3.22.3.jar -Source available at https://github.com/google/protobuf/tree/v3.22.3 + - lib/com.google.protobuf-protobuf-java-3.21.9.jar +Source available at https://github.com/google/protobuf/tree/v3.21.9 For details, see deps/protobuf-3.14.0/LICENSE. Bundled as - - lib/com.google.protobuf-protobuf-java-util-3.22.3.jar -Source available at https://github.com/protocolbuffers/protobuf/tree/v3.22.3 + - lib/com.google.protobuf-protobuf-java-util-3.21.9.jar +Source available at https://github.com/protocolbuffers/protobuf/tree/v3.21.9 For details, see deps/protobuf-3.12.0/LICENSE. ------------------------------------------------------------------------------------ This product bundles the JCP Standard Java Servlet API, which is available under a diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index 67897da9472..d635e89c6ee 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -250,26 +250,26 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.8.1-tests.jar [20] - lib/com.beust-jcommander-1.82.jar [23] - lib/net.jpountz.lz4-lz4-1.3.0.jar [25] -- lib/com.google.api.grpc-proto-google-common-protos-2.17.0.jar [27] -- lib/com.google.code.gson-gson-2.10.1.jar [28] +- lib/com.google.api.grpc-proto-google-common-protos-2.9.0.jar [27] +- lib/com.google.code.gson-gson-2.9.0.jar [28] - lib/io.opencensus-opencensus-api-0.28.0.jar [29] - lib/io.opencensus-opencensus-contrib-http-util-0.28.0.jar [29] - lib/io.opencensus-opencensus-proto-0.2.0.jar [29] -- lib/io.grpc-grpc-all-1.56.0.jar [32] -- lib/io.grpc-grpc-alts-1.56.0.jar [32] -- lib/io.grpc-grpc-api-1.56.0.jar [32] -- lib/io.grpc-grpc-auth-1.56.0.jar [32] -- lib/io.grpc-grpc-context-1.56.0.jar [32] -- lib/io.grpc-grpc-core-1.56.0.jar [32] -- lib/io.grpc-grpc-grpclb-1.56.0.jar [32] -- lib/io.grpc-grpc-netty-1.56.0.jar [32] -- lib/io.grpc-grpc-protobuf-1.56.0.jar [32] -- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar [32] -- lib/io.grpc-grpc-services-1.56.0.jar [32] -- lib/io.grpc-grpc-stub-1.56.0.jar [32] -- lib/io.grpc-grpc-testing-1.56.0.jar [32] -- lib/io.grpc-grpc-xds-1.56.0.jar [32] -- lib/io.grpc-grpc-rls-1.56.0.jar[32] +- lib/io.grpc-grpc-all-1.54.1.jar [32] +- lib/io.grpc-grpc-alts-1.54.1.jar [32] +- lib/io.grpc-grpc-api-1.54.1.jar [32] +- lib/io.grpc-grpc-auth-1.54.1.jar [32] +- lib/io.grpc-grpc-context-1.54.1.jar [32] +- lib/io.grpc-grpc-core-1.54.1.jar [32] +- lib/io.grpc-grpc-grpclb-1.54.1.jar [32] +- lib/io.grpc-grpc-netty-1.54.1.jar [32] +- lib/io.grpc-grpc-protobuf-1.54.1.jar [32] +- lib/io.grpc-grpc-protobuf-lite-1.54.1.jar [32] +- lib/io.grpc-grpc-services-1.54.1.jar [32] +- lib/io.grpc-grpc-stub-1.54.1.jar [32] +- lib/io.grpc-grpc-testing-1.54.1.jar [32] +- lib/io.grpc-grpc-xds-1.54.1.jar [32] +- lib/io.grpc-grpc-rls-1.54.1.jar[32] - lib/org.apache.curator-curator-client-5.1.0.jar [33] - lib/org.apache.curator-curator-framework-5.1.0.jar [33] - lib/org.apache.curator-curator-recipes-5.1.0.jar [33] @@ -281,13 +281,13 @@ Apache Software License, Version 2. - lib/org.apache.httpcomponents-httpcore-4.4.15.jar [39] - lib/org.apache.thrift-libthrift-0.14.2.jar [40] - lib/com.google.android-annotations-4.1.1.4.jar [41] -- lib/com.google.auto.value-auto-value-annotations-1.10.1.jar [42] +- lib/com.google.auto.value-auto-value-annotations-1.9.jar [42] - lib/com.google.http-client-google-http-client-1.41.0.jar [43] - lib/com.google.http-client-google-http-client-gson-1.41.0.jar [43] - lib/com.google.j2objc-j2objc-annotations-1.3.jar [44] -- lib/com.google.re2j-re2j-1.7.jar [45] +- lib/com.google.re2j-re2j-1.6.jar [45] - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [46] -- lib/io.perfmark-perfmark-api-0.26.0.jar [47] +- lib/io.perfmark-perfmark-api-0.25.0.jar [47] - lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49] - lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] @@ -566,13 +566,13 @@ This product bundles Google Protocol Buffers, which is available under a "3-clau license. Bundled as - - lib/com.google.protobuf-protobuf-java-3.22.3.jar -Source available at https://github.com/google/protobuf/tree/v3.22.3 + - lib/com.google.protobuf-protobuf-java-3.21.9.jar +Source available at https://github.com/google/protobuf/tree/v3.21.9 For details, see deps/protobuf-3.14.0/LICENSE. Bundled as - - lib/com.google.protobuf-protobuf-java-util-3.22.3.jar -Source available at https://github.com/protocolbuffers/protobuf/tree/v3.22.3 + - lib/com.google.protobuf-protobuf-java-util-3.21.9.jar +Source available at https://github.com/protocolbuffers/protobuf/tree/v3.21.9 For details, see deps/protobuf-3.12.0/LICENSE. ------------------------------------------------------------------------------------ This product bundles Simple Logging Facade for Java, which is available under a diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index 4c430e85157..ae5e848b67b 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -275,26 +275,26 @@ Apache Software License, Version 2. - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] - lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25] - lib/net.jpountz.lz4-lz4-1.3.0.jar [26] -- lib/com.google.api.grpc-proto-google-common-protos-2.17.0.jar [28] -- lib/com.google.code.gson-gson-2.10.1.jar [29] +- lib/com.google.api.grpc-proto-google-common-protos-2.9.0.jar [28] +- lib/com.google.code.gson-gson-2.9.0.jar [29] - lib/io.opencensus-opencensus-api-0.28.0.jar [30] - lib/io.opencensus-opencensus-contrib-http-util-0.28.0.jar [30] - lib/io.opencensus-opencensus-proto-0.2.0.jar [30] -- lib/io.grpc-grpc-all-1.56.0.jar [33] -- lib/io.grpc-grpc-alts-1.56.0.jar [33] -- lib/io.grpc-grpc-api-1.56.0.jar [33] -- lib/io.grpc-grpc-auth-1.56.0.jar [33] -- lib/io.grpc-grpc-context-1.56.0.jar [33] -- lib/io.grpc-grpc-core-1.56.0.jar [33] -- lib/io.grpc-grpc-grpclb-1.56.0.jar [33] -- lib/io.grpc-grpc-netty-1.56.0.jar [33] -- lib/io.grpc-grpc-protobuf-1.56.0.jar [33] -- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar [33] -- lib/io.grpc-grpc-services-1.56.0.jar [33] -- lib/io.grpc-grpc-stub-1.56.0.jar [33] -- lib/io.grpc-grpc-testing-1.56.0.jar [33] -- lib/io.grpc-grpc-xds-1.56.0.jar [33] -- lib/io.grpc-grpc-rls-1.56.0.jar[33] +- lib/io.grpc-grpc-all-1.54.1.jar [33] +- lib/io.grpc-grpc-alts-1.54.1.jar [33] +- lib/io.grpc-grpc-api-1.54.1.jar [33] +- lib/io.grpc-grpc-auth-1.54.1.jar [33] +- lib/io.grpc-grpc-context-1.54.1.jar [33] +- lib/io.grpc-grpc-core-1.54.1.jar [33] +- lib/io.grpc-grpc-grpclb-1.54.1.jar [33] +- lib/io.grpc-grpc-netty-1.54.1.jar [33] +- lib/io.grpc-grpc-protobuf-1.54.1.jar [33] +- lib/io.grpc-grpc-protobuf-lite-1.54.1.jar [33] +- lib/io.grpc-grpc-services-1.54.1.jar [33] +- lib/io.grpc-grpc-stub-1.54.1.jar [33] +- lib/io.grpc-grpc-testing-1.54.1.jar [33] +- lib/io.grpc-grpc-xds-1.54.1.jar [33] +- lib/io.grpc-grpc-rls-1.54.1.jar[33] - lib/org.apache.curator-curator-client-5.1.0.jar [34] - lib/org.apache.curator-curator-framework-5.1.0.jar [34] - lib/org.apache.curator-curator-recipes-5.1.0.jar [34] @@ -308,11 +308,11 @@ Apache Software License, Version 2. - lib/com.google.android-annotations-4.1.1.4.jar [42] - lib/com.google.http-client-google-http-client-1.41.0.jar [43] - lib/com.google.http-client-google-http-client-gson-1.41.0.jar [43] -- lib/com.google.auto.value-auto-value-annotations-1.10.1.jar [44] +- lib/com.google.auto.value-auto-value-annotations-1.9.jar [44] - lib/com.google.j2objc-j2objc-annotations-1.3.jar [45] -- lib/com.google.re2j-re2j-1.7.jar [46] +- lib/com.google.re2j-re2j-1.6.jar [46] - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47] -- lib/io.perfmark-perfmark-api-0.26.0.jar [48] +- lib/io.perfmark-perfmark-api-0.25.0.jar [48] - lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49] - lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] @@ -630,13 +630,13 @@ This product bundles Google Protocol Buffers, which is available under a "3-clau license. Bundled as - - lib/com.google.protobuf-protobuf-java-3.22.3.jar -Source available at https://github.com/google/protobuf/tree/v3.22.3 + - lib/com.google.protobuf-protobuf-java-3.21.9.jar +Source available at https://github.com/google/protobuf/tree/v3.21.9 For details, see deps/protobuf-3.14.0/LICENSE. Bundled as - - lib/com.google.protobuf-protobuf-java-util-3.22.3.jar -Source available at https://github.com/protocolbuffers/protobuf/tree/v3.22.3 + - lib/com.google.protobuf-protobuf-java-util-3.21.9.jar +Source available at https://github.com/protocolbuffers/protobuf/tree/v3.21.9 For details, see deps/protobuf-3.12.0/LICENSE. ------------------------------------------------------------------------------------ This product bundles the JCP Standard Java Servlet API, which is available under a diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index 01ceaf80c6c..668f47495e9 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -134,15 +134,15 @@ granted provided that the copyright notice appears in all copies. Copyright 2010 Cedric Beust cedric@beust.com ------------------------------------------------------------------------------------ -- lib/io.grpc-grpc-all-1.56.0.jar -- lib/io.grpc-grpc-auth-1.56.0.jar -- lib/io.grpc-grpc-context-1.56.0.jar -- lib/io.grpc-grpc-core-1.56.0.jar -- lib/io.grpc-grpc-netty-1.56.0.jar -- lib/io.grpc-grpc-protobuf-1.56.0.jar -- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar -- lib/io.grpc-grpc-stub-1.56.0.jar -- lib/io.grpc-grpc-testing-1.56.0.jar +- lib/io.grpc-grpc-all-1.54.1.jar +- lib/io.grpc-grpc-auth-1.54.1.jar +- lib/io.grpc-grpc-context-1.54.1.jar +- lib/io.grpc-grpc-core-1.54.1.jar +- lib/io.grpc-grpc-netty-1.54.1.jar +- lib/io.grpc-grpc-protobuf-1.54.1.jar +- lib/io.grpc-grpc-protobuf-lite-1.54.1.jar +- lib/io.grpc-grpc-stub-1.54.1.jar +- lib/io.grpc-grpc-testing-1.54.1.jar Copyright 2014, gRPC Authors All rights reserved. diff --git a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt index e4c1a03a8ad..ee19aca7a51 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -56,15 +56,15 @@ under the License. Copyright 2010 Cedric Beust cedric@beust.com ------------------------------------------------------------------------------------ -- lib/io.grpc-grpc-all-1.56.0.jar -- lib/io.grpc-grpc-auth-1.56.0.jar -- lib/io.grpc-grpc-context-1.56.0.jar -- lib/io.grpc-grpc-core-1.56.0.jar -- lib/io.grpc-grpc-netty-1.56.0.jar -- lib/io.grpc-grpc-protobuf-1.56.0.jar -- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar -- lib/io.grpc-grpc-stub-1.56.0.jar -- lib/io.grpc-grpc-testing-1.56.0.jar +- lib/io.grpc-grpc-all-1.54.1.jar +- lib/io.grpc-grpc-auth-1.54.1.jar +- lib/io.grpc-grpc-context-1.54.1.jar +- lib/io.grpc-grpc-core-1.54.1.jar +- lib/io.grpc-grpc-netty-1.54.1.jar +- lib/io.grpc-grpc-protobuf-1.54.1.jar +- lib/io.grpc-grpc-protobuf-lite-1.54.1.jar +- lib/io.grpc-grpc-stub-1.54.1.jar +- lib/io.grpc-grpc-testing-1.54.1.jar Copyright 2014, gRPC Authors All rights reserved. diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt index 96d7d9d664b..028ae6eb2a1 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -116,15 +116,15 @@ granted provided that the copyright notice appears in all copies. Copyright 2010 Cedric Beust cedric@beust.com ------------------------------------------------------------------------------------ -- lib/io.grpc-grpc-all-1.56.0.jar -- lib/io.grpc-grpc-auth-1.56.0.jar -- lib/io.grpc-grpc-context-1.56.0.jar -- lib/io.grpc-grpc-core-1.56.0.jar -- lib/io.grpc-grpc-netty-1.56.0.jar -- lib/io.grpc-grpc-protobuf-1.56.0.jar -- lib/io.grpc-grpc-protobuf-lite-1.56.0.jar -- lib/io.grpc-grpc-stub-1.56.0.jar -- lib/io.grpc-grpc-testing-1.56.0.jar +- lib/io.grpc-grpc-all-1.54.1.jar +- lib/io.grpc-grpc-auth-1.54.1.jar +- lib/io.grpc-grpc-context-1.54.1.jar +- lib/io.grpc-grpc-core-1.54.1.jar +- lib/io.grpc-grpc-netty-1.54.1.jar +- lib/io.grpc-grpc-protobuf-1.54.1.jar +- lib/io.grpc-grpc-protobuf-lite-1.54.1.jar +- lib/io.grpc-grpc-stub-1.54.1.jar +- lib/io.grpc-grpc-testing-1.54.1.jar Copyright 2014, gRPC Authors All rights reserved. diff --git a/pom.xml b/pom.xml index 5a69db2cbcb..d8b161165d2 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ 2.7.0 3.0.2 2.9.0 - 1.56.0 + 1.54.1 31.0.1-jre 1.1.1 3.3.5 @@ -161,8 +161,8 @@ 0.8.3 4.5.13 4.4.15 - 3.22.3 - 3.22.3 + 3.21.9 + 3.21.9 ${grpc.version} 0.9.11 7.9.2 From 14dbfd2d787e73c1b2c2469841c2b98e1370f2da Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Sun, 25 Jun 2023 23:58:57 +0800 Subject: [PATCH 056/233] Fix data lost when configured multiple ledger directories (#3329) (cherry picked from commit 8a76703ee44b1f5af9eaedd68a53368dbf5855f0) --- .../apache/bookkeeper/bookie/BookieImpl.java | 5 + .../org/apache/bookkeeper/bookie/Journal.java | 2 +- .../ldb/SingleDirectoryDbLedgerStorage.java | 6 +- .../storage/ldb/DbLedgerStorageTest.java | 183 ++++++++++++++++++ 4 files changed, 194 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java index 0628ec28afa..e5520185f3c 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java @@ -1285,4 +1285,9 @@ public OfLong getListOfEntriesOfLedger(long ledgerId) throws IOException, NoLedg } } } + + @VisibleForTesting + public List getJournals() { + return this.journals; + } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java index d8df972878f..9a056ca67b0 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java @@ -226,7 +226,7 @@ void rollLog(LastLogMark lastMark) throws NoWritableLedgerDirException { * The last mark should first be max journal log id, * and then max log position in max journal log. */ - void readLog() { + public void readLog() { byte[] buff = new byte[16]; ByteBuffer bb = ByteBuffer.wrap(buff); LogMark mark = new LogMark(); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java index a140db7010c..c0fff1ec46c 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java @@ -142,6 +142,7 @@ public class SingleDirectoryDbLedgerStorage implements CompactableLedgerStorage private final long maxReadAheadBytesSize; private final Counter flushExecutorTime; + private final boolean singleLedgerDirs; public SingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager ledgerManager, LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, @@ -172,6 +173,7 @@ public SingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager le this.writeCacheMaxSize = writeCacheSize; this.writeCache = new WriteCache(allocator, writeCacheMaxSize / 2); this.writeCacheBeingFlushed = new WriteCache(allocator, writeCacheMaxSize / 2); + this.singleLedgerDirs = conf.getLedgerDirs().length == 1; readCacheMaxSize = readCacheSize; this.readAheadCacheBatchSize = readAheadCacheBatchSize; @@ -895,7 +897,9 @@ private void swapWriteCache() { public void flush() throws IOException { Checkpoint cp = checkpointSource.newCheckpoint(); checkpoint(cp); - checkpointSource.checkpointComplete(cp, true); + if (singleLedgerDirs) { + checkpointSource.checkpointComplete(cp, true); + } } @Override diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java index 2a7e8e2869b..65f11e5d6a3 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java @@ -31,16 +31,21 @@ import io.netty.buffer.Unpooled; import io.netty.util.ReferenceCountUtil; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; +import java.nio.ByteBuffer; import java.util.List; import org.apache.bookkeeper.bookie.Bookie; import org.apache.bookkeeper.bookie.Bookie.NoEntryException; import org.apache.bookkeeper.bookie.BookieException; import org.apache.bookkeeper.bookie.BookieImpl; +import org.apache.bookkeeper.bookie.CheckpointSource; +import org.apache.bookkeeper.bookie.CheckpointSourceList; import org.apache.bookkeeper.bookie.DefaultEntryLogger; import org.apache.bookkeeper.bookie.EntryLocation; import org.apache.bookkeeper.bookie.LedgerDirsManager; import org.apache.bookkeeper.bookie.LedgerStorage; +import org.apache.bookkeeper.bookie.LogMark; import org.apache.bookkeeper.bookie.TestBookieImpl; import org.apache.bookkeeper.bookie.storage.EntryLogger; import org.apache.bookkeeper.conf.ServerConfiguration; @@ -639,4 +644,182 @@ public void testStorageStateFlags() throws Exception { storage = (DbLedgerStorage) new TestBookieImpl(conf).getLedgerStorage(); } + + @Test + public void testMultiLedgerDirectoryCheckpoint() throws Exception { + int gcWaitTime = 1000; + File firstDir = new File(tmpDir, "dir1"); + File secondDir = new File(tmpDir, "dir2"); + ServerConfiguration conf = TestBKConfiguration.newServerConfiguration(); + conf.setGcWaitTime(gcWaitTime); + conf.setProperty(DbLedgerStorage.WRITE_CACHE_MAX_SIZE_MB, 4); + conf.setProperty(DbLedgerStorage.READ_AHEAD_CACHE_MAX_SIZE_MB, 4); + conf.setLedgerStorageClass(DbLedgerStorage.class.getName()); + conf.setLedgerDirNames(new String[] { firstDir.getCanonicalPath(), secondDir.getCanonicalPath() }); + + BookieImpl bookie = new TestBookieImpl(conf); + ByteBuf entry1 = Unpooled.buffer(1024); + entry1.writeLong(1); // ledger id + entry1.writeLong(2); // entry id + entry1.writeBytes("entry-1".getBytes()); + + bookie.getLedgerStorage().addEntry(entry1); + // write one entry to first ledger directory and flush with logMark(1, 2), + // only the first ledger directory should have lastMark + bookie.getJournals().get(0).getLastLogMark().getCurMark().setLogMark(1, 2); + ((DbLedgerStorage) bookie.getLedgerStorage()).getLedgerStorageList().get(0).flush(); + + File firstDirMark = new File(firstDir + "/current", "lastMark"); + File secondDirMark = new File(secondDir + "/current", "lastMark"); + + // LedgerStorage flush won't trigger lastMark update due to two ledger directories configured + try { + readLogMark(firstDirMark); + readLogMark(secondDirMark); + fail(); + } catch (Exception e) { + // + } + + // write the second entry to second leger directory and flush with log(4, 5), + // the fist ledger directory's lastMark is (1, 2) and the second ledger directory's lastMark is (4, 5); + ByteBuf entry2 = Unpooled.buffer(1024); + entry2.writeLong(2); // ledger id + entry2.writeLong(1); // entry id + entry2.writeBytes("entry-2".getBytes()); + + bookie.getLedgerStorage().addEntry(entry2); + // write one entry to first ledger directory and flush with logMark(1, 2), + // only the first ledger directory should have lastMark + bookie.getJournals().get(0).getLastLogMark().getCurMark().setLogMark(4, 5); + ((DbLedgerStorage) bookie.getLedgerStorage()).getLedgerStorageList().get(1).flush(); + + // LedgerStorage flush won't trigger lastMark update due to two ledger directories configured + try { + readLogMark(firstDirMark); + readLogMark(secondDirMark); + fail(); + } catch (Exception e) { + // + } + + // The dbLedgerStorage flush also won't trigger lastMark update due to two ledger directories configured. + bookie.getLedgerStorage().flush(); + try { + readLogMark(firstDirMark); + readLogMark(secondDirMark); + fail(); + } catch (Exception e) { + // + } + + // trigger checkpoint simulate SyncThread do checkpoint. + CheckpointSource checkpointSource = new CheckpointSourceList(bookie.getJournals()); + bookie.getJournals().get(0).getLastLogMark().getCurMark().setLogMark(7, 8); + CheckpointSource.Checkpoint checkpoint = checkpointSource.newCheckpoint(); + checkpointSource.checkpointComplete(checkpoint, false); + + try { + LogMark firstLogMark = readLogMark(firstDirMark); + LogMark secondLogMark = readLogMark(secondDirMark); + assertEquals(7, firstLogMark.getLogFileId()); + assertEquals(8, firstLogMark.getLogFileOffset()); + assertEquals(7, secondLogMark.getLogFileId()); + assertEquals(8, secondLogMark.getLogFileOffset()); + } catch (Exception e) { + fail(); + } + + // test replay journal lastMark, to make sure we get the right LastMark position + bookie.getJournals().get(0).getLastLogMark().readLog(); + LogMark logMark = bookie.getJournals().get(0).getLastLogMark().getCurMark(); + assertEquals(7, logMark.getLogFileId()); + assertEquals(8, logMark.getLogFileOffset()); + } + + private LogMark readLogMark(File file) throws IOException { + byte[] buff = new byte[16]; + ByteBuffer bb = ByteBuffer.wrap(buff); + LogMark mark = new LogMark(); + try (FileInputStream fis = new FileInputStream(file)) { + int bytesRead = fis.read(buff); + if (bytesRead != 16) { + throw new IOException("Couldn't read enough bytes from lastMark." + + " Wanted " + 16 + ", got " + bytesRead); + } + } + bb.clear(); + mark.readLogMark(bb); + + return mark; + } + + @Test + public void testSingleLedgerDirectoryCheckpoint() throws Exception { + int gcWaitTime = 1000; + File ledgerDir = new File(tmpDir, "dir"); + ServerConfiguration conf = TestBKConfiguration.newServerConfiguration(); + conf.setGcWaitTime(gcWaitTime); + conf.setProperty(DbLedgerStorage.WRITE_CACHE_MAX_SIZE_MB, 4); + conf.setProperty(DbLedgerStorage.READ_AHEAD_CACHE_MAX_SIZE_MB, 4); + conf.setLedgerStorageClass(DbLedgerStorage.class.getName()); + conf.setLedgerDirNames(new String[] { ledgerDir.getCanonicalPath() }); + + BookieImpl bookie = new TestBookieImpl(conf); + ByteBuf entry1 = Unpooled.buffer(1024); + entry1.writeLong(1); // ledger id + entry1.writeLong(2); // entry id + entry1.writeBytes("entry-1".getBytes()); + bookie.getLedgerStorage().addEntry(entry1); + + bookie.getJournals().get(0).getLastLogMark().getCurMark().setLogMark(1, 2); + ((DbLedgerStorage) bookie.getLedgerStorage()).getLedgerStorageList().get(0).flush(); + + File ledgerDirMark = new File(ledgerDir + "/current", "lastMark"); + try { + LogMark logMark = readLogMark(ledgerDirMark); + assertEquals(1, logMark.getLogFileId()); + assertEquals(2, logMark.getLogFileOffset()); + } catch (Exception e) { + fail(); + } + + ByteBuf entry2 = Unpooled.buffer(1024); + entry2.writeLong(2); // ledger id + entry2.writeLong(1); // entry id + entry2.writeBytes("entry-2".getBytes()); + + bookie.getLedgerStorage().addEntry(entry2); + // write one entry to first ledger directory and flush with logMark(1, 2), + // only the first ledger directory should have lastMark + bookie.getJournals().get(0).getLastLogMark().getCurMark().setLogMark(4, 5); + + bookie.getLedgerStorage().flush(); + try { + LogMark logMark = readLogMark(ledgerDirMark); + assertEquals(4, logMark.getLogFileId()); + assertEquals(5, logMark.getLogFileOffset()); + } catch (Exception e) { + fail(); + } + + CheckpointSource checkpointSource = new CheckpointSourceList(bookie.getJournals()); + bookie.getJournals().get(0).getLastLogMark().getCurMark().setLogMark(7, 8); + CheckpointSource.Checkpoint checkpoint = checkpointSource.newCheckpoint(); + checkpointSource.checkpointComplete(checkpoint, false); + + try { + LogMark firstLogMark = readLogMark(ledgerDirMark); + assertEquals(7, firstLogMark.getLogFileId()); + assertEquals(8, firstLogMark.getLogFileOffset()); + } catch (Exception e) { + fail(); + } + + // test replay journal lastMark, to make sure we get the right LastMark position + bookie.getJournals().get(0).getLastLogMark().readLog(); + LogMark logMark = bookie.getJournals().get(0).getLastLogMark().getCurMark(); + assertEquals(7, logMark.getLogFileId()); + assertEquals(8, logMark.getLogFileOffset()); + } } From 8b3f782c59fc4c5a40ffd62ec56538bafae5af5a Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 26 Jun 2023 09:09:21 +0800 Subject: [PATCH 057/233] Fix trigger GC not work (#3998) * Fix trigger gc not work (cherry picked from commit 147b5bf846189584d6a9b4e20ac9a73e6e617255) --- .../bookie/GarbageCollectorThread.java | 5 +- .../bookie/InterleavedLedgerStorage.java | 2 +- .../bookkeeper/bookie/LedgerStorage.java | 2 +- .../bookie/SortedLedgerStorage.java | 2 +- .../bookie/storage/ldb/DbLedgerStorage.java | 2 +- .../ldb/SingleDirectoryDbLedgerStorage.java | 2 +- .../server/http/service/TriggerGCService.java | 74 +++++---- .../bookkeeper/bookie/MockLedgerStorage.java | 2 +- .../http/service/TriggerGCServiceTest.java | 147 ++++++++++++++++++ 9 files changed, 198 insertions(+), 40 deletions(-) create mode 100644 bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/TriggerGCServiceTest.java diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java index 552592f624f..1dc7c4b5a5e 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java @@ -292,12 +292,11 @@ public void enableForceGC() { } } - public void enableForceGC(Boolean forceMajor, Boolean forceMinor) { + public void enableForceGC(boolean forceMajor, boolean forceMinor) { if (forceGarbageCollection.compareAndSet(false, true)) { LOG.info("Forced garbage collection triggered by thread: {}, forceMajor: {}, forceMinor: {}", Thread.currentThread().getName(), forceMajor, forceMinor); - triggerGC(true, forceMajor == null ? suspendMajorCompaction.get() : !forceMajor, - forceMinor == null ? suspendMinorCompaction.get() : !forceMinor); + triggerGC(true, !forceMajor, !forceMinor); } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java index c6e60106727..2b90e3b0081 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java @@ -260,7 +260,7 @@ public void forceGC() { } @Override - public void forceGC(Boolean forceMajor, Boolean forceMinor) { + public void forceGC(boolean forceMajor, boolean forceMinor) { gcThread.enableForceGC(forceMajor, forceMinor); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorage.java index 92f0d38c6ea..6eca6e00108 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorage.java @@ -232,7 +232,7 @@ default void forceGC() { /** * Force trigger Garbage Collection with forceMajor or forceMinor parameter. */ - default void forceGC(Boolean forceMajor, Boolean forceMinor) { + default void forceGC(boolean forceMajor, boolean forceMinor) { return; } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java index 01d14400f04..c3c9e972138 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java @@ -367,7 +367,7 @@ public void forceGC() { } @Override - public void forceGC(Boolean forceMajor, Boolean forceMinor) { + public void forceGC(boolean forceMajor, boolean forceMinor) { interleavedLedgerStorage.forceGC(forceMajor, forceMinor); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java index 5b283325914..8824b1cb6fa 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java @@ -506,7 +506,7 @@ public void forceGC() { } @Override - public void forceGC(Boolean forceMajor, Boolean forceMinor) { + public void forceGC(boolean forceMajor, boolean forceMinor) { ledgerStorageList.stream().forEach(s -> s.forceGC(forceMajor, forceMinor)); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java index c0fff1ec46c..f97559dde94 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java @@ -269,7 +269,7 @@ public void forceGC() { } @Override - public void forceGC(Boolean forceMajor, Boolean forceMinor) { + public void forceGC(boolean forceMajor, boolean forceMinor) { gcThread.enableForceGC(forceMajor, forceMinor); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/TriggerGCService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/TriggerGCService.java index 9f01c5c1b42..1f4eea7fb1c 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/TriggerGCService.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/TriggerGCService.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; +import org.apache.bookkeeper.bookie.LedgerStorage; import org.apache.bookkeeper.common.util.JsonUtil; import org.apache.bookkeeper.conf.ServerConfiguration; import org.apache.bookkeeper.http.HttpServer; @@ -29,6 +30,7 @@ import org.apache.bookkeeper.http.service.HttpServiceRequest; import org.apache.bookkeeper.http.service.HttpServiceResponse; import org.apache.bookkeeper.proto.BookieServer; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,40 +63,50 @@ public TriggerGCService(ServerConfiguration conf, BookieServer bookieServer) { @Override public HttpServiceResponse handle(HttpServiceRequest request) throws Exception { HttpServiceResponse response = new HttpServiceResponse(); + try { + if (HttpServer.Method.PUT == request.getMethod()) { + String requestBody = request.getBody(); + if (StringUtils.isBlank(requestBody)) { + bookieServer.getBookie().getLedgerStorage().forceGC(); + } else { + @SuppressWarnings("unchecked") + Map configMap = JsonUtil.fromJson(requestBody, HashMap.class); + LedgerStorage ledgerStorage = bookieServer.getBookie().getLedgerStorage(); + boolean forceMajor = !ledgerStorage.isMajorGcSuspended(); + boolean forceMinor = !ledgerStorage.isMinorGcSuspended(); - if (HttpServer.Method.PUT == request.getMethod()) { - String requestBody = request.getBody(); - if (null == requestBody) { - bookieServer.getBookie().getLedgerStorage().forceGC(); - } else { - @SuppressWarnings("unchecked") - Map configMap = JsonUtil.fromJson(requestBody, HashMap.class); - Boolean forceMajor = (Boolean) configMap.getOrDefault("forceMajor", null); - Boolean forceMinor = (Boolean) configMap.getOrDefault("forceMinor", null); - bookieServer.getBookie().getLedgerStorage().forceGC(forceMajor, forceMinor); - } + forceMajor = Boolean.parseBoolean(configMap.getOrDefault("forceMajor", forceMajor).toString()); + forceMinor = Boolean.parseBoolean(configMap.getOrDefault("forceMinor", forceMinor).toString()); + ledgerStorage.forceGC(forceMajor, forceMinor); + } - String output = "Triggered GC on BookieServer: " + bookieServer.toString(); - String jsonResponse = JsonUtil.toJson(output); - if (LOG.isDebugEnabled()) { - LOG.debug("output body:" + jsonResponse); - } - response.setBody(jsonResponse); - response.setCode(HttpServer.StatusCode.OK); - return response; - } else if (HttpServer.Method.GET == request.getMethod()) { - Boolean isInForceGC = bookieServer.getBookie().getLedgerStorage().isInForceGC(); - Pair output = Pair.of("is_in_force_gc", isInForceGC.toString()); - String jsonResponse = JsonUtil.toJson(output); - if (LOG.isDebugEnabled()) { - LOG.debug("output body:" + jsonResponse); + String output = "Triggered GC on BookieServer: " + bookieServer.getBookieId(); + String jsonResponse = JsonUtil.toJson(output); + if (LOG.isDebugEnabled()) { + LOG.debug("output body:" + jsonResponse); + } + response.setBody(jsonResponse); + response.setCode(HttpServer.StatusCode.OK); + return response; + } else if (HttpServer.Method.GET == request.getMethod()) { + Boolean isInForceGC = bookieServer.getBookie().getLedgerStorage().isInForceGC(); + Pair output = Pair.of("is_in_force_gc", isInForceGC.toString()); + String jsonResponse = JsonUtil.toJson(output); + if (LOG.isDebugEnabled()) { + LOG.debug("output body:" + jsonResponse); + } + response.setBody(jsonResponse); + response.setCode(HttpServer.StatusCode.OK); + return response; + } else { + response.setCode(HttpServer.StatusCode.METHOD_NOT_ALLOWED); + response.setBody("Not allowed method. Should be PUT to trigger GC, Or GET to get Force GC state."); + return response; } - response.setBody(jsonResponse); - response.setCode(HttpServer.StatusCode.OK); - return response; - } else { - response.setCode(HttpServer.StatusCode.NOT_FOUND); - response.setBody("Not found method. Should be PUT to trigger GC, Or GET to get Force GC state."); + } catch (Exception e) { + LOG.error("Failed to handle the request, method: {}, body: {} ", request.getMethod(), request.getBody(), e); + response.setCode(HttpServer.StatusCode.BAD_REQUEST); + response.setBody("Failed to handle the request, exception: " + e.getMessage()); return response; } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/MockLedgerStorage.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/MockLedgerStorage.java index 0b14c395a86..e1979dbdc4f 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/MockLedgerStorage.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/MockLedgerStorage.java @@ -271,7 +271,7 @@ public void forceGC() { } @Override - public void forceGC(Boolean forceMajor, Boolean forceMinor) { + public void forceGC(boolean forceMajor, boolean forceMinor) { CompactableLedgerStorage.super.forceGC(forceMajor, forceMinor); } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/TriggerGCServiceTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/TriggerGCServiceTest.java new file mode 100644 index 00000000000..dca0466e563 --- /dev/null +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/TriggerGCServiceTest.java @@ -0,0 +1,147 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.bookkeeper.server.http.service; + +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import lombok.extern.slf4j.Slf4j; +import org.apache.bookkeeper.bookie.LedgerStorage; +import org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage; +import org.apache.bookkeeper.conf.ServerConfiguration; +import org.apache.bookkeeper.http.HttpServer; +import org.apache.bookkeeper.http.service.HttpServiceRequest; +import org.apache.bookkeeper.http.service.HttpServiceResponse; +import org.apache.bookkeeper.proto.BookieServer; +import org.junit.Before; +import org.junit.Test; + + +/** + * Unit test for {@link TriggerGCService}. + */ +@Slf4j +public class TriggerGCServiceTest { + private TriggerGCService service; + private BookieServer mockBookieServer; + private LedgerStorage mockLedgerStorage; + + @Before + public void setup() { + this.mockBookieServer = mock(BookieServer.class, RETURNS_DEEP_STUBS); + this.mockLedgerStorage = mock(DbLedgerStorage.class); + when(mockBookieServer.getBookie().getLedgerStorage()).thenReturn(mockLedgerStorage); + when(mockLedgerStorage.isInForceGC()).thenReturn(false); + when(mockLedgerStorage.isMajorGcSuspended()).thenReturn(false); + when(mockLedgerStorage.isMinorGcSuspended()).thenReturn(false); + this.service = new TriggerGCService(new ServerConfiguration(), mockBookieServer); + } + + @Test + public void testHandleRequest() throws Exception { + + // test empty put body + HttpServiceRequest request = new HttpServiceRequest(); + request.setMethod(HttpServer.Method.PUT); + HttpServiceResponse resp = service.handle(request); + assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode()); + assertEquals("\"Triggered GC on BookieServer: " + mockBookieServer.getBookieId() + "\"", + resp.getBody()); + + // test invalid put json body + request = new HttpServiceRequest(); + request.setMethod(HttpServer.Method.PUT); + request.setBody("test"); + resp = service.handle(request); + assertEquals(HttpServer.StatusCode.BAD_REQUEST.getValue(), resp.getStatusCode()); + assertEquals("Failed to handle the request, exception: Failed to deserialize Object from Json string", + resp.getBody()); + + // test forceMajor and forceMinor not set + request = new HttpServiceRequest(); + request.setMethod(HttpServer.Method.PUT); + request.setBody("{\"test\":1}"); + resp = service.handle(request); + verify(mockLedgerStorage, times(1)).forceGC(eq(true), eq(true)); + assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode()); + assertEquals("\"Triggered GC on BookieServer: " + mockBookieServer.getBookieId() + "\"", + resp.getBody()); + + // test forceMajor set, but forceMinor not set + request = new HttpServiceRequest(); + request.setMethod(HttpServer.Method.PUT); + request.setBody("{\"test\":1,\"forceMajor\":true}"); + resp = service.handle(request); + verify(mockLedgerStorage, times(2)).forceGC(eq(true), eq(true)); + assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode()); + assertEquals("\"Triggered GC on BookieServer: " + mockBookieServer.getBookieId() + "\"", + resp.getBody()); + + // test forceMajor set, but forceMinor not set + request = new HttpServiceRequest(); + request.setMethod(HttpServer.Method.PUT); + request.setBody("{\"test\":1,\"forceMajor\":\"true\"}"); + resp = service.handle(request); + verify(mockLedgerStorage, times(3)).forceGC(eq(true), eq(true)); + assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode()); + assertEquals("\"Triggered GC on BookieServer: " + mockBookieServer.getBookieId() + "\"", + resp.getBody()); + + // test forceMajor set to false, and forMinor not set + request = new HttpServiceRequest(); + request.setMethod(HttpServer.Method.PUT); + request.setBody("{\"test\":1,\"forceMajor\":false}"); + resp = service.handle(request); + verify(mockLedgerStorage, times(1)).forceGC(eq(false), eq(true)); + assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode()); + assertEquals("\"Triggered GC on BookieServer: " + mockBookieServer.getBookieId() + "\"", + resp.getBody()); + + // test forceMajor not set and forMinor set + request = new HttpServiceRequest(); + request.setMethod(HttpServer.Method.PUT); + request.setBody("{\"test\":1,\"forceMinor\":true}"); + resp = service.handle(request); + verify(mockLedgerStorage, times(4)).forceGC(eq(true), eq(true)); + assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode()); + assertEquals("\"Triggered GC on BookieServer: " + mockBookieServer.getBookieId() + "\"", + resp.getBody()); + + // test get gc + request = new HttpServiceRequest(); + request.setMethod(HttpServer.Method.GET); + resp = service.handle(request); + assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode()); + assertEquals("{\n \"is_in_force_gc\" : \"false\"\n}", resp.getBody()); + + // test invalid method type + request = new HttpServiceRequest(); + request.setMethod(HttpServer.Method.POST); + resp = service.handle(request); + assertEquals(HttpServer.StatusCode.METHOD_NOT_ALLOWED.getValue(), resp.getStatusCode()); + assertEquals("Not allowed method. Should be PUT to trigger GC, Or GET to get Force GC state.", + resp.getBody()); + } + +} From 0465f7e6ebc2289334cc97b06fbfb0a8f07e2e8b Mon Sep 17 00:00:00 2001 From: zymap Date: Mon, 26 Jun 2023 02:44:38 +0000 Subject: [PATCH 058/233] [maven-release-plugin] prepare release v4.16.2-rc1 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +++++- bookkeeper-dist/bkctl/pom.xml | 6 +++++- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +++++- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +++++- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +++++- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +++++- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +++++- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +++++- shaded/distributedlog-core-shaded/pom.xml | 6 +++++- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +++++- .../codahale-metrics-provider/pom.xml | 6 +++++- stats/bookkeeper-stats-providers/pom.xml | 6 +++++- .../prometheus-metrics-provider/pom.xml | 6 +++++- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +++++- stream/api/pom.xml | 6 +++++- stream/bk-grpc-name-resolver/pom.xml | 6 +++++- stream/clients/java/all/pom.xml | 6 +++++- stream/clients/java/base/pom.xml | 6 +++++- stream/clients/java/kv/pom.xml | 6 +++++- stream/clients/java/pom.xml | 6 +++++- stream/clients/pom.xml | 6 +++++- stream/common/pom.xml | 6 +++++- stream/distributedlog/common/pom.xml | 6 +++++- stream/distributedlog/core/pom.xml | 6 +++++- stream/distributedlog/io/dlfs/pom.xml | 6 +++++- stream/distributedlog/io/pom.xml | 6 +++++- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +++++- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +++++- stream/server/pom.xml | 6 +++++- stream/statelib/pom.xml | 6 +++++- stream/storage/api/pom.xml | 6 +++++- stream/storage/impl/pom.xml | 6 +++++- stream/storage/pom.xml | 6 +++++- stream/tests-common/pom.xml | 6 +++++- tests/backward-compat/bc-non-fips/pom.xml | 6 +++++- tests/backward-compat/current-server-old-clients/pom.xml | 6 +++++- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +++++- tests/backward-compat/hostname-bookieid/pom.xml | 6 +++++- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +++++- tests/backward-compat/pom.xml | 6 +++++- tests/backward-compat/recovery-no-password/pom.xml | 6 +++++- tests/backward-compat/upgrade-direct/pom.xml | 6 +++++- tests/backward-compat/upgrade/pom.xml | 6 +++++- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +++++- tests/docker-images/all-released-versions-image/pom.xml | 6 +++++- tests/docker-images/all-versions-image/pom.xml | 6 +++++- tests/docker-images/pom.xml | 6 +++++- tests/integration-tests-base-groovy/pom.xml | 6 +++++- tests/integration-tests-base/pom.xml | 6 +++++- tests/integration-tests-topologies/pom.xml | 6 +++++- tests/integration-tests-utils/pom.xml | 6 +++++- tests/integration/cluster/pom.xml | 6 +++++- tests/integration/pom.xml | 6 +++++- tests/integration/smoke/pom.xml | 6 +++++- tests/integration/standalone/pom.xml | 6 +++++- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +++++- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +++++- tests/shaded/pom.xml | 6 +++++- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +++++- tools/framework/pom.xml | 6 +++++- tools/ledger/pom.xml | 6 +++++- tools/perf/pom.xml | 6 +++++- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +++++- 90 files changed, 353 insertions(+), 93 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index a57a98e83c3..f14e8d47310 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 6b5863b5271..4101dbcb2e1 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 14142494a7a..cb757dcf4fa 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index e5068a134d4..f6b97913aae 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -154,4 +154,8 @@ + + + v4.16.2-rc1 + diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index ea15539574d..c290c7491a2 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -79,4 +79,8 @@ + + + v4.16.2-rc1 + diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index c14ce7b1045..530c89cf403 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index f321db66741..f25bcc1b4a4 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -129,4 +129,8 @@ + + + v4.16.2-rc1 + diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 8cda12cdc31..e5285b67e92 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index acd80a6e6c1..de6950c07d1 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 89bf227f0c9..8c623476a4e 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index b9acc2fe618..0c22a98ea38 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 93b00f6d055..cac53b61364 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 50d7e96f486..d752f0bc9e3 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index a38d755310c..e4e39bc3a9b 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,10 +18,14 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API + + + v4.16.2-rc1 + diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 563a95ee62d..90f4889d878 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index be7b5b5ab0d..b106c52d43a 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -31,4 +31,8 @@ ${project.parent.version} + + + v4.16.2-rc1 + diff --git a/buildtools/pom.xml b/buildtools/pom.xml index da55a2a2593..890211c5197 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 buildtools Apache BookKeeper :: Build Tools - 4.16.2-SNAPSHOT + 4.16.2 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index e04841259ad..7c3042aa510 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 5d5c5db8088..31669535be4 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index f2d23a699d1..d5fa712137e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.2-SNAPSHOT + 4.16.2 .. 4.0.0 @@ -158,4 +158,8 @@ + + + v4.16.2-rc1 + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 46e92f2d141..21223c2d491 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 9b85c86af79..7c280f13be8 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index a65c2cfc541..afde4f76401 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. diff --git a/pom.xml b/pom.xml index d8b161165d2..5a622c03d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.13 + v4.16.2-rc1 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 4777e0f5111..fd5a3b8bf5f 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2-SNAPSHOT + 4.16.2 .. bookkeeper-server-shaded @@ -126,4 +126,8 @@ + + + v4.16.2-rc1 + diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 97b804e4e5d..2a22ed8c381 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2-SNAPSHOT + 4.16.2 .. bookkeeper-server-tests-shaded @@ -144,4 +144,8 @@ + + + v4.16.2-rc1 + diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 1958db3841e..232c6e63fbc 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.distributedlog @@ -238,4 +238,8 @@ + + + v4.16.2-rc1 + diff --git a/shaded/pom.xml b/shaded/pom.xml index 8456e3119fd..793aabc3c0b 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 65015c656ce..de6a0861367 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,4 +59,8 @@ + + + v4.16.2-rc1 + diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 2f9d1546bba..1fe9075cecd 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,4 +53,8 @@ guava + + + v4.16.2-rc1 + diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 7af8c59448e..76741e81d40 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 bookkeeper-stats-providers @@ -29,4 +29,8 @@ codahale-metrics-provider prometheus-metrics-provider + + + v4.16.2-rc1 + diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index c61096d21bb..802ce70b9cd 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,4 +72,8 @@ + + + v4.16.2-rc1 + diff --git a/stats/pom.xml b/stats/pom.xml index 655a782313a..e224b3bbb20 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 6fca97615c3..674675e6732 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,4 +50,8 @@ jackson-annotations + + + v4.16.2-rc1 + diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 376ddc763dd..b35215d0dbc 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -46,4 +46,8 @@ freebuilder + + + v4.16.2-rc1 + diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index d88e6968ac9..5f96775fb3f 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -77,4 +77,8 @@ test + + + v4.16.2-rc1 + diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 97c41d2035f..5bd07d4230e 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2-SNAPSHOT + 4.16.2 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,4 +112,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index cf05c876066..4acb0da1810 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2-SNAPSHOT + 4.16.2 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,4 +59,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 208893aa610..ea1fe71e885 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2-SNAPSHOT + 4.16.2 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,4 +47,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index ffebbb01683..5441d1d2795 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.2-SNAPSHOT + 4.16.2 .. stream-storage-java-client-parent @@ -31,4 +31,8 @@ kv all + + + v4.16.2-rc1 + diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index a3103a27cb3..2826c773e25 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.2 .. stream-storage-clients-parent @@ -47,4 +47,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 367743c34d0..33d1d4dc7d0 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -82,4 +82,8 @@ test + + + v4.16.2-rc1 + diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 8dd4656c267..b6de58f9128 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.2 distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,4 +106,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 514ba9e8c2e..862e428f40d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.2 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,4 +138,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index ed3f5e0e9dd..2a36aaf9a73 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.2-SNAPSHOT + 4.16.2 ../.. org.apache.distributedlog @@ -100,4 +100,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index d6a518cad5f..48bade374d2 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 distributedlog-io @@ -28,4 +28,8 @@ dlfs + + + v4.16.2-rc1 + diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f43ac614b0e..c5b09c4e528 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 36943dc6cf5..5a46d6eb24c 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.2 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,4 +61,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/pom.xml b/stream/pom.xml index 64f6c1cc747..12865e22d44 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index d1a92241eab..45ec03c24d2 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -118,4 +118,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 24fb15ddf11..b89edf010bc 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.2 stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,4 +82,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index e838dfbb219..49ee15d5a84 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper @@ -130,4 +130,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 50366c29042..7e3ef650724 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.2-SNAPSHOT + 4.16.2 .. stream-storage-service-api @@ -55,4 +55,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 5825e1f90f8..c31238ede3d 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.2-SNAPSHOT + 4.16.2 .. stream-storage-service-impl @@ -121,4 +121,8 @@ + + + v4.16.2-rc1 + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 71d9f951a88..b7f68ae129c 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.2 .. stream-storage-service-parent @@ -30,4 +30,8 @@ api impl + + + v4.16.2-rc1 + diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 23bdf7b64ae..ab1bd354b2a 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper.tests @@ -123,4 +123,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 2fc4a23372a..9ac03376f6b 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -76,4 +76,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 99173acfcd9..390b01dcc00 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server + + + v4.16.2-rc1 + diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 81965f7f468..8c3b0d49b84 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager + + + v4.16.2-rc1 + diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 3a2bc2484f6..a345da56d0b 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) + + + v4.16.2-rc1 + diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 5600bede76f..9e3dc8daecd 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies + + + v4.16.2-rc1 + diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index c838cf8da1e..827207fdde8 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.2-SNAPSHOT + 4.16.2 ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,4 +49,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 9224c156e5e..0f9e09dd23c 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -36,4 +36,8 @@ ${project.version} + + + v4.16.2-rc1 + diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 26184b68605..d81ebb8b60b 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version + + + v4.16.2-rc1 + diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 0457f7b08ed..403e0de04fc 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version + + + v4.16.2-rc1 + diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 8c79dafd824..d0a304c07bf 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -28,4 +28,8 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current + + + v4.16.2-rc1 + diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 698d07c354b..24606043d67 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 org.apache.bookkeeper.tests @@ -68,4 +68,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 1ef7c54d9be..aab96465f60 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.2-SNAPSHOT + 4.16.2 4.0.0 org.apache.bookkeeper.tests @@ -108,4 +108,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index fe21a8d89a5..8094618ff86 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests docker-images @@ -30,4 +30,8 @@ all-released-versions-image all-versions-image + + + v4.16.2-rc1 + diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index e2c3a5676c5..fe7244f7952 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.2-SNAPSHOT + 4.16.2 ../integration-tests-base @@ -109,4 +109,8 @@ test + + + v4.16.2-rc1 + diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 91317041618..58acfa89667 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index c1da5d8c0bf..3dc7139fd74 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests @@ -45,4 +45,8 @@ ${project.version} + + + v4.16.2-rc1 + diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index a9558064a52..68cdc0a9d86 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 16e6a8a8ef4..e69ef53ace6 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -83,4 +83,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 19c1f4b9acd..afc74f33c1a 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests integration @@ -70,4 +70,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 65c292ca5f9..90761d6ce45 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -72,4 +72,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 1473757fff1..d6d12a6df49 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.2-SNAPSHOT + 4.16.2 .. @@ -68,4 +68,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/pom.xml b/tests/pom.xml index 4ea58800a63..6ce53127096 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 9b16d2a32fa..e107a749754 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 org.apache.bookkeeper.tests @@ -73,4 +73,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index c43ef97f197..4e637d058f8 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2-SNAPSHOT + 4.16.2 .. bookkeeper-server-shaded-test @@ -59,4 +59,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index dac250c8c5c..b660dd8ebac 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2-SNAPSHOT + 4.16.2 .. bookkeeper-server-tests-shaded-test @@ -75,4 +75,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 6f9d3966a32..c68f863928b 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2-SNAPSHOT + 4.16.2 .. distributedlog-core-shaded-test @@ -84,4 +84,8 @@ + + + v4.16.2-rc1 + diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d4803b69432..da814361cde 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.2 .. org.apache.bookkeeper.tests.shaded @@ -32,4 +32,8 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test + + + v4.16.2-rc1 + diff --git a/testtools/pom.xml b/testtools/pom.xml index df0407471f4..fc29b1849fd 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 testtools Apache BookKeeper :: Test Tools - 4.16.2-SNAPSHOT + 4.16.2 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 15f05ecff7e..781fe2e9546 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-tools Apache BookKeeper :: Tools @@ -79,4 +79,8 @@ + + + v4.16.2-rc1 + diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index dbe3c38539f..a924657b018 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,4 +41,8 @@ test + + + v4.16.2-rc1 + diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 08303ad43b4..0de0db30ae8 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,4 +71,8 @@ test + + + v4.16.2-rc1 + diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index a13fd897523..05a14f77ab3 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,4 +48,8 @@ HdrHistogram + + + v4.16.2-rc1 + diff --git a/tools/pom.xml b/tools/pom.xml index b8c4f5dbefc..ecbdf2ce4c9 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.2 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 0c69b5b9600..acffc004ac4 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.2-SNAPSHOT + 4.16.2 stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,4 +48,8 @@ ${project.version} + + + v4.16.2-rc1 + From b45e10a9d15bf26460d9402465685226f1a35da7 Mon Sep 17 00:00:00 2001 From: zymap Date: Mon, 26 Jun 2023 02:44:46 +0000 Subject: [PATCH 059/233] [maven-release-plugin] rollback changes from release preparation of v4.16.2-rc1 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +----- bookkeeper-dist/bkctl/pom.xml | 6 +----- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +----- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +----- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +----- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +----- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +----- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +----- shaded/distributedlog-core-shaded/pom.xml | 6 +----- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +----- .../codahale-metrics-provider/pom.xml | 6 +----- stats/bookkeeper-stats-providers/pom.xml | 6 +----- .../prometheus-metrics-provider/pom.xml | 6 +----- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +----- stream/api/pom.xml | 6 +----- stream/bk-grpc-name-resolver/pom.xml | 6 +----- stream/clients/java/all/pom.xml | 6 +----- stream/clients/java/base/pom.xml | 6 +----- stream/clients/java/kv/pom.xml | 6 +----- stream/clients/java/pom.xml | 6 +----- stream/clients/pom.xml | 6 +----- stream/common/pom.xml | 6 +----- stream/distributedlog/common/pom.xml | 6 +----- stream/distributedlog/core/pom.xml | 6 +----- stream/distributedlog/io/dlfs/pom.xml | 6 +----- stream/distributedlog/io/pom.xml | 6 +----- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +----- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +----- stream/server/pom.xml | 6 +----- stream/statelib/pom.xml | 6 +----- stream/storage/api/pom.xml | 6 +----- stream/storage/impl/pom.xml | 6 +----- stream/storage/pom.xml | 6 +----- stream/tests-common/pom.xml | 6 +----- tests/backward-compat/bc-non-fips/pom.xml | 6 +----- tests/backward-compat/current-server-old-clients/pom.xml | 6 +----- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +----- tests/backward-compat/hostname-bookieid/pom.xml | 6 +----- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +----- tests/backward-compat/pom.xml | 6 +----- tests/backward-compat/recovery-no-password/pom.xml | 6 +----- tests/backward-compat/upgrade-direct/pom.xml | 6 +----- tests/backward-compat/upgrade/pom.xml | 6 +----- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +----- tests/docker-images/all-released-versions-image/pom.xml | 6 +----- tests/docker-images/all-versions-image/pom.xml | 6 +----- tests/docker-images/pom.xml | 6 +----- tests/integration-tests-base-groovy/pom.xml | 6 +----- tests/integration-tests-base/pom.xml | 6 +----- tests/integration-tests-topologies/pom.xml | 6 +----- tests/integration-tests-utils/pom.xml | 6 +----- tests/integration/cluster/pom.xml | 6 +----- tests/integration/pom.xml | 6 +----- tests/integration/smoke/pom.xml | 6 +----- tests/integration/standalone/pom.xml | 6 +----- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +----- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +----- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +----- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +----- tests/shaded/pom.xml | 6 +----- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +----- tools/framework/pom.xml | 6 +----- tools/ledger/pom.xml | 6 +----- tools/perf/pom.xml | 6 +----- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +----- 90 files changed, 93 insertions(+), 353 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index f14e8d47310..a57a98e83c3 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 4101dbcb2e1..6b5863b5271 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index cb757dcf4fa..14142494a7a 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index f6b97913aae..e5068a134d4 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -154,8 +154,4 @@ - - - v4.16.2-rc1 - diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index c290c7491a2..ea15539574d 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -79,8 +79,4 @@ - - - v4.16.2-rc1 - diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 530c89cf403..c14ce7b1045 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index f25bcc1b4a4..f321db66741 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -129,8 +129,4 @@ - - - v4.16.2-rc1 - diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index e5285b67e92..8cda12cdc31 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index de6950c07d1..acd80a6e6c1 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 8c623476a4e..89bf227f0c9 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 0c22a98ea38..b9acc2fe618 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index cac53b61364..93b00f6d055 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index d752f0bc9e3..50d7e96f486 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index e4e39bc3a9b..a38d755310c 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,14 +18,10 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API - - - v4.16.2-rc1 - diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 90f4889d878..563a95ee62d 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index b106c52d43a..be7b5b5ab0d 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -31,8 +31,4 @@ ${project.parent.version} - - - v4.16.2-rc1 - diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 890211c5197..da55a2a2593 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.2 + 4.16.2-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 7c3042aa510..e04841259ad 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 31669535be4..5d5c5db8088 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index d5fa712137e..f2d23a699d1 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.2 + 4.16.2-SNAPSHOT .. 4.0.0 @@ -158,8 +158,4 @@ - - - v4.16.2-rc1 - diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 21223c2d491..46e92f2d141 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 7c280f13be8..9b85c86af79 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index afde4f76401..a65c2cfc541 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 5a622c03d9d..d8b161165d2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.2-rc1 + branch-4.13 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index fd5a3b8bf5f..4777e0f5111 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2 + 4.16.2-SNAPSHOT .. bookkeeper-server-shaded @@ -126,8 +126,4 @@ - - - v4.16.2-rc1 - diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 2a22ed8c381..97b804e4e5d 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2 + 4.16.2-SNAPSHOT .. bookkeeper-server-tests-shaded @@ -144,8 +144,4 @@ - - - v4.16.2-rc1 - diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 232c6e63fbc..1958db3841e 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.distributedlog @@ -238,8 +238,4 @@ - - - v4.16.2-rc1 - diff --git a/shaded/pom.xml b/shaded/pom.xml index 793aabc3c0b..8456e3119fd 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index de6a0861367..65015c656ce 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,8 +59,4 @@ - - - v4.16.2-rc1 - diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 1fe9075cecd..2f9d1546bba 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,8 +53,4 @@ guava - - - v4.16.2-rc1 - diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 76741e81d40..7af8c59448e 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 bookkeeper-stats-providers @@ -29,8 +29,4 @@ codahale-metrics-provider prometheus-metrics-provider - - - v4.16.2-rc1 - diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 802ce70b9cd..c61096d21bb 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,8 +72,4 @@ - - - v4.16.2-rc1 - diff --git a/stats/pom.xml b/stats/pom.xml index e224b3bbb20..655a782313a 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 674675e6732..6fca97615c3 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,8 +50,4 @@ jackson-annotations - - - v4.16.2-rc1 - diff --git a/stream/api/pom.xml b/stream/api/pom.xml index b35215d0dbc..376ddc763dd 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -46,8 +46,4 @@ freebuilder - - - v4.16.2-rc1 - diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 5f96775fb3f..d88e6968ac9 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -77,8 +77,4 @@ test - - - v4.16.2-rc1 - diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 5bd07d4230e..97c41d2035f 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2 + 4.16.2-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,8 +112,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 4acb0da1810..cf05c876066 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2 + 4.16.2-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,8 +59,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index ea1fe71e885..208893aa610 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2 + 4.16.2-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,8 +47,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 5441d1d2795..ffebbb01683 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.2 + 4.16.2-SNAPSHOT .. stream-storage-java-client-parent @@ -31,8 +31,4 @@ kv all - - - v4.16.2-rc1 - diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 2826c773e25..a3103a27cb3 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2 + 4.16.2-SNAPSHOT .. stream-storage-clients-parent @@ -47,8 +47,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 33d1d4dc7d0..367743c34d0 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -82,8 +82,4 @@ test - - - v4.16.2-rc1 - diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index b6de58f9128..8dd4656c267 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2 + 4.16.2-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,8 +106,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 862e428f40d..514ba9e8c2e 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2 + 4.16.2-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,8 +138,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 2a36aaf9a73..ed3f5e0e9dd 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.2 + 4.16.2-SNAPSHOT ../.. org.apache.distributedlog @@ -100,8 +100,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 48bade374d2..d6a518cad5f 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 distributedlog-io @@ -28,8 +28,4 @@ dlfs - - - v4.16.2-rc1 - diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index c5b09c4e528..f43ac614b0e 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 5a46d6eb24c..36943dc6cf5 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2 + 4.16.2-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,8 +61,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/pom.xml b/stream/pom.xml index 12865e22d44..64f6c1cc747 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 45ec03c24d2..d1a92241eab 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -118,8 +118,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/server/pom.xml b/stream/server/pom.xml index b89edf010bc..24fb15ddf11 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2 + 4.16.2-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,8 +82,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 49ee15d5a84..e838dfbb219 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper @@ -130,8 +130,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 7e3ef650724..50366c29042 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.2 + 4.16.2-SNAPSHOT .. stream-storage-service-api @@ -55,8 +55,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index c31238ede3d..5825e1f90f8 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.2 + 4.16.2-SNAPSHOT .. stream-storage-service-impl @@ -121,8 +121,4 @@ - - - v4.16.2-rc1 - diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index b7f68ae129c..71d9f951a88 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2 + 4.16.2-SNAPSHOT .. stream-storage-service-parent @@ -30,8 +30,4 @@ api impl - - - v4.16.2-rc1 - diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index ab1bd354b2a..23bdf7b64ae 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper.tests @@ -123,8 +123,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 9ac03376f6b..2fc4a23372a 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -76,8 +76,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 390b01dcc00..99173acfcd9 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server - - - v4.16.2-rc1 - diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 8c3b0d49b84..81965f7f468 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager - - - v4.16.2-rc1 - diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index a345da56d0b..3a2bc2484f6 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) - - - v4.16.2-rc1 - diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 9e3dc8daecd..5600bede76f 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies - - - v4.16.2-rc1 - diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 827207fdde8..c838cf8da1e 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.2 + 4.16.2-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,8 +49,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 0f9e09dd23c..9224c156e5e 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -36,8 +36,4 @@ ${project.version} - - - v4.16.2-rc1 - diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index d81ebb8b60b..26184b68605 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version - - - v4.16.2-rc1 - diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 403e0de04fc..0457f7b08ed 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version - - - v4.16.2-rc1 - diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index d0a304c07bf..8c79dafd824 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -28,8 +28,4 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current - - - v4.16.2-rc1 - diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 24606043d67..698d07c354b 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -68,8 +68,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index aab96465f60..1ef7c54d9be 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.2 + 4.16.2-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -108,8 +108,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 8094618ff86..fe21a8d89a5 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests docker-images @@ -30,8 +30,4 @@ all-released-versions-image all-versions-image - - - v4.16.2-rc1 - diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index fe7244f7952..e2c3a5676c5 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.2 + 4.16.2-SNAPSHOT ../integration-tests-base @@ -109,8 +109,4 @@ test - - - v4.16.2-rc1 - diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 58acfa89667..91317041618 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 3dc7139fd74..c1da5d8c0bf 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests @@ -45,8 +45,4 @@ ${project.version} - - - v4.16.2-rc1 - diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 68cdc0a9d86..a9558064a52 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index e69ef53ace6..16e6a8a8ef4 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -83,8 +83,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index afc74f33c1a..19c1f4b9acd 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests integration @@ -70,8 +70,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 90761d6ce45..65c292ca5f9 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -72,8 +72,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index d6d12a6df49..1473757fff1 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.2 + 4.16.2-SNAPSHOT .. @@ -68,8 +68,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/pom.xml b/tests/pom.xml index 6ce53127096..4ea58800a63 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index e107a749754..9b16d2a32fa 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT org.apache.bookkeeper.tests @@ -73,8 +73,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 4e637d058f8..c43ef97f197 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2 + 4.16.2-SNAPSHOT .. bookkeeper-server-shaded-test @@ -59,8 +59,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index b660dd8ebac..dac250c8c5c 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2 + 4.16.2-SNAPSHOT .. bookkeeper-server-tests-shaded-test @@ -75,8 +75,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index c68f863928b..6f9d3966a32 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2 + 4.16.2-SNAPSHOT .. distributedlog-core-shaded-test @@ -84,8 +84,4 @@ - - - v4.16.2-rc1 - diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index da814361cde..d4803b69432 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2 + 4.16.2-SNAPSHOT .. org.apache.bookkeeper.tests.shaded @@ -32,8 +32,4 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test - - - v4.16.2-rc1 - diff --git a/testtools/pom.xml b/testtools/pom.xml index fc29b1849fd..df0407471f4 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.2 + 4.16.2-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 781fe2e9546..15f05ecff7e 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools @@ -79,8 +79,4 @@ - - - v4.16.2-rc1 - diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index a924657b018..dbe3c38539f 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,8 +41,4 @@ test - - - v4.16.2-rc1 - diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 0de0db30ae8..08303ad43b4 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,8 +71,4 @@ test - - - v4.16.2-rc1 - diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 05a14f77ab3..a13fd897523 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,8 +48,4 @@ HdrHistogram - - - v4.16.2-rc1 - diff --git a/tools/pom.xml b/tools/pom.xml index ecbdf2ce4c9..b8c4f5dbefc 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2 + 4.16.2-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index acffc004ac4..0c69b5b9600 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.2 + 4.16.2-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,8 +48,4 @@ ${project.version} - - - v4.16.2-rc1 - From a05688fc50ec1a886f1f96d267ca959882783414 Mon Sep 17 00:00:00 2001 From: zymap Date: Mon, 3 Jul 2023 20:35:31 +0800 Subject: [PATCH 060/233] Bump to next version --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/clients/python/setup.py | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 91 files changed, 93 insertions(+), 93 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index a57a98e83c3..420dd71bf78 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 6b5863b5271..dedcaa751d3 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 14142494a7a..af8aa26af2f 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index e5068a134d4..a2cefdca5f1 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index ea15539574d..4b98b04b8e4 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index c14ce7b1045..e0c3bfb6f54 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index f321db66741..b7e76206f0c 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 8cda12cdc31..dd6bc258de9 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index acd80a6e6c1..451687c9efa 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 89bf227f0c9..7ef79ff7f7e 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index b9acc2fe618..cc7ddad5826 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 93b00f6d055..1e8ee8cdd54 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 50d7e96f486..ef4989b01d7 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index a38d755310c..663da53b870 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 563a95ee62d..5cf82c0a70f 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index be7b5b5ab0d..e20dbd714c2 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index da55a2a2593..fa2ea05244a 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index e04841259ad..02a98f7f378 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 5d5c5db8088..8ae78bfc79f 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index f2d23a699d1..e3d6063afad 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 46e92f2d141..830e2d3e97b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 9b85c86af79..588db1e400a 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index a65c2cfc541..ffb0450f847 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index d8b161165d2..853f03bc10a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 4777e0f5111..e5c553255dc 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 97b804e4e5d..ac44b7d10a2 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 1958db3841e..9a0d92ff458 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 8456e3119fd..99d14d26dfc 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 65015c656ce..6a06b79d3d7 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 2f9d1546bba..e96ac8688bc 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 7af8c59448e..ae996ad6b15 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index c61096d21bb..b7a75fd38a4 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 655a782313a..3bfa47a8518 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 6fca97615c3..24d79b6201f 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 376ddc763dd..a60f866cbfb 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index d88e6968ac9..c697939f8bb 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 97c41d2035f..0ffc48fc597 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index cf05c876066..13fb1181498 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 208893aa610..e2ea0e3386c 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index ffebbb01683..378a8d7595c 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index a3103a27cb3..bf672922e7c 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/clients/python/setup.py b/stream/clients/python/setup.py index bea58c7de83..b3dfa970a19 100644 --- a/stream/clients/python/setup.py +++ b/stream/clients/python/setup.py @@ -19,7 +19,7 @@ name = 'apache-bookkeeper-client' description = 'Apache BookKeeper client library' -version = '4.16.2' +version = '4.16.3' # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta' diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 367743c34d0..12b48656a36 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 8dd4656c267..b34ba4c62b4 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 514ba9e8c2e..8f4aed6ea76 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index ed3f5e0e9dd..e4d50fa09f9 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index d6a518cad5f..e6fe3801f4a 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f43ac614b0e..86cc7faa984 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 36943dc6cf5..bbe645bc20e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 64f6c1cc747..30cfa3c831d 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index d1a92241eab..b4aa71d36f1 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 24fb15ddf11..ed168f5f850 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index e838dfbb219..a17c29cd0b1 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 50366c29042..c045d252c16 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 5825e1f90f8..3cc8a15066c 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 71d9f951a88..adcd2d91a7d 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 23bdf7b64ae..bb9ec0f169e 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 2fc4a23372a..7fab2cb3252 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 99173acfcd9..e7160dbce40 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 81965f7f468..81fdee4b36d 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 3a2bc2484f6..43d89a558f9 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 5600bede76f..2442531108b 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index c838cf8da1e..4372c8ebce3 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 9224c156e5e..dee7e3bf45d 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 26184b68605..0e93631e0ce 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 0457f7b08ed..f560b5ccda2 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 8c79dafd824..0adf3078b4e 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 698d07c354b..efb4ab47c6f 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 1ef7c54d9be..48cdacd22dc 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index fe21a8d89a5..72feeda0f7d 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index e2c3a5676c5..e6abf2b58f0 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 91317041618..bed5f9cf522 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index c1da5d8c0bf..9d21fe7596a 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index a9558064a52..985027ef0cf 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 16e6a8a8ef4..a3efb470baf 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 19c1f4b9acd..df06044317b 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 65c292ca5f9..db36ff1d284 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 1473757fff1..9b71a441aed 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 4ea58800a63..4b5d2d2492e 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 9b16d2a32fa..d06fbeef62c 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index c43ef97f197..53dd9a6a0df 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index dac250c8c5c..a961b65a4f8 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 6f9d3966a32..ab74a4633bd 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d4803b69432..671d40ac608 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index df0407471f4..85b223eb0cf 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 15f05ecff7e..1f406c32658 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index dbe3c38539f..d836d111ebc 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 08303ad43b4..420047d0480 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index a13fd897523..795ba4c0bae 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index b8c4f5dbefc..0af628c8232 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 0c69b5b9600..940485efeac 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.2-SNAPSHOT + 4.16.3-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From 7240bde1877e9680b4ed26e94e7372baeecbd87e Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 19 Jun 2023 19:40:50 +0800 Subject: [PATCH 061/233] Support skip invalid journal record in replying journal stage (#3956) Co-authored-by: zhiyuanlei (cherry picked from commit 5e9fdc2f81a7add645bba43f90ef630dffc1993f) --- .../apache/bookkeeper/bookie/BookieImpl.java | 2 +- .../org/apache/bookkeeper/bookie/Journal.java | 16 ++- .../storage/ldb/LedgersIndexRebuildOp.java | 2 +- .../bookkeeper/conf/ServerConfiguration.java | 21 ++++ .../commands/bookie/ReadJournalCommand.java | 2 +- .../bookkeeper/bookie/BookieJournalTest.java | 117 +++++++++++++++++- 6 files changed, 151 insertions(+), 9 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java index e5520185f3c..6aac4ecf68a 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java @@ -631,7 +631,7 @@ private void replay(Journal journal, JournalScanner scanner) throws IOException logPosition = markedLog.getLogFileOffset(); } LOG.info("Replaying journal {} from position {}", id, logPosition); - long scanOffset = journal.scanJournal(id, logPosition, scanner); + long scanOffset = journal.scanJournal(id, logPosition, scanner, conf.isSkipReplayJournalInvalidRecord()); // Update LastLogMark after completely replaying journal // scanOffset will point to EOF position // After LedgerStorage flush, SyncThread should persist this to disk diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java index 9a056ca67b0..9735e137179 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java @@ -792,13 +792,14 @@ public void checkpointComplete(Checkpoint checkpoint, boolean compact) throws IO /** * Scan the journal. * - * @param journalId Journal Log Id - * @param journalPos Offset to start scanning - * @param scanner Scanner to handle entries + * @param journalId Journal Log Id + * @param journalPos Offset to start scanning + * @param scanner Scanner to handle entries + * @param skipInvalidRecord when invalid record,should we skip it or not * @return scanOffset - represents the byte till which journal was read * @throws IOException */ - public long scanJournal(long journalId, long journalPos, JournalScanner scanner) + public long scanJournal(long journalId, long journalPos, JournalScanner scanner, boolean skipInvalidRecord) throws IOException { JournalChannel recLog; if (journalPos <= 0) { @@ -862,6 +863,13 @@ public long scanJournal(long journalId, long journalPos, JournalScanner scanner) } } return recLog.fc.position(); + } catch (IOException e) { + if (skipInvalidRecord) { + LOG.warn("Failed to parse journal file, and skipInvalidRecord is true, skip this journal file reply"); + } else { + throw e; + } + return recLog.fc.position(); } finally { recLog.close(); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgersIndexRebuildOp.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgersIndexRebuildOp.java index f6969237b85..2725897e804 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgersIndexRebuildOp.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgersIndexRebuildOp.java @@ -222,7 +222,7 @@ public void process(int journalVersion, long offset, ByteBuffer entry) { LOG.info("Found ledger {} in journal", ledgerId); } } - }); + }, false); } private void delete(Path path) { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java index cf74f6af01c..2849d3fd66e 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java @@ -338,6 +338,8 @@ public class ServerConfiguration extends AbstractConfiguration journalIds = Journal.listJournalIds(journal.getJournalDirectory(), null); + assertEquals(journalIds.size(), 1); + try { + journal.scanJournal(journalIds.get(0), 0, journalScanner, conf.isSkipReplayJournalInvalidRecord()); + } catch (Exception e) { + fail("Should pass the journal scanning because we enabled skip flag by default."); + } + } + + b.shutdown(); + + // Disabled skip broken journal files by default + conf = TestBKConfiguration.newServerConfiguration(); + conf.setJournalDirName(journalDir.getPath()) + .setLedgerDirNames(new String[] { ledgerDir.getPath() }) + .setMetadataServiceUri(null); + + journalScanner = new DummyJournalScan(); + + b = new TestBookieImpl(conf); + + for (Journal journal : b.journals) { + List journalIds = Journal.listJournalIds(journal.getJournalDirectory(), null); + assertEquals(journalIds.size(), 1); + try { + journal.scanJournal(journalIds.get(0), 0, journalScanner, conf.isSkipReplayJournalInvalidRecord()); + fail("Should fail the journal scanning because of disabled skip flag"); + } catch (Exception e) { + // expected. + } + } + + b.shutdown(); + } + + + static class DummyJournalScan implements Journal.JournalScanner { @Override public void process(int journalVersion, long offset, ByteBuffer entry) throws IOException { From 2060f9fb2919a630c07584a09cf10651d269b7f8 Mon Sep 17 00:00:00 2001 From: houxiaoyu Date: Mon, 19 Jun 2023 17:06:25 +0800 Subject: [PATCH 062/233] Change pendingDeletedLedgers as ConcurrentHashSet (#3989) (cherry picked from commit 2baee3629f8d0bde1ae66fb3cade2ed0326a1d88) --- .../bookie/storage/ldb/LedgerMetadataIndex.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java index c93bc0b7db3..cf6cbfcdc2d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java @@ -22,6 +22,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import io.netty.buffer.ByteBuf; import java.io.Closeable; @@ -29,6 +30,7 @@ import java.util.AbstractMap.SimpleEntry; import java.util.Arrays; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; @@ -63,7 +65,7 @@ public class LedgerMetadataIndex implements Closeable { private final ConcurrentLinkedQueue> pendingLedgersUpdates; // Holds ledger ids that were delete from memory map, and pending to be flushed on db - private final ConcurrentLinkedQueue pendingDeletedLedgers; + private final Set pendingDeletedLedgers; private final ReentrantLock[] locks = new ReentrantLock[16]; public LedgerMetadataIndex(ServerConfiguration conf, KeyValueStorageFactory storageFactory, String basePath, @@ -90,7 +92,7 @@ public LedgerMetadataIndex(ServerConfiguration conf, KeyValueStorageFactory stor } this.pendingLedgersUpdates = new ConcurrentLinkedQueue>(); - this.pendingDeletedLedgers = new ConcurrentLinkedQueue(); + this.pendingDeletedLedgers = Sets.newConcurrentHashSet(); this.stats = new LedgerMetadataIndexStats( stats, @@ -318,8 +320,7 @@ public void removeDeletedLedgers() throws IOException { LongWrapper key = LongWrapper.get(); int deletedLedgers = 0; - Long ledgerId; - while ((ledgerId = pendingDeletedLedgers.poll()) != null) { + for (Long ledgerId : pendingDeletedLedgers) { key.set(ledgerId); ledgersDb.delete(key.array); } From 760644b1342a05df11b65b95cd3a42e07513c201 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Sat, 1 Jul 2023 06:16:53 +0300 Subject: [PATCH 063/233] Upgrade Netty to 4.1.94.Final (#3999) ### Motivation OWASP dependency check fails because of CVE-2023-34462 ``` Error: netty-handler-4.1.93.Final.jar: CVE-2023-34462(8.8) ``` ### Changes Upgrade Netty to 4.1.94.Final Release notes: https://netty.io/news/2023/06/19/4-1-94-Final.html (cherry picked from commit 1fbf791ae891ca9f696f52596f03b5bccd6a8630) --- bookkeeper-dist/src/assemble/bin-all.xml | 2 +- bookkeeper-dist/src/assemble/bin-server.xml | 2 +- bookkeeper-dist/src/assemble/bkctl.xml | 2 +- .../src/main/resources/LICENSE-all.bin.txt | 144 +++++++++--------- .../src/main/resources/LICENSE-bkctl.bin.txt | 140 ++++++++--------- .../src/main/resources/LICENSE-server.bin.txt | 144 +++++++++--------- .../src/main/resources/NOTICE-all.bin.txt | 30 ++-- .../src/main/resources/NOTICE-bkctl.bin.txt | 26 ++-- .../src/main/resources/NOTICE-server.bin.txt | 30 ++-- .../LICENSE.aalto-xml.txt | 0 .../LICENSE.base64.txt | 0 .../LICENSE.bouncycastle.txt | 0 .../LICENSE.caliper.txt | 0 .../LICENSE.commons-lang.txt | 0 .../LICENSE.commons-logging.txt | 0 .../LICENSE.compress-lzf.txt | 0 .../LICENSE.dnsinfo.txt | 0 .../LICENSE.harmony.txt | 0 .../LICENSE.hpack.txt | 0 .../LICENSE.hyper-hpack.txt | 0 .../LICENSE.jboss-marshalling.txt | 0 .../LICENSE.jbzip2.txt | 0 .../LICENSE.jctools.txt | 0 .../LICENSE.jfastlz.txt | 0 .../LICENSE.jsr166y.txt | 0 .../LICENSE.jzlib.txt | 0 .../LICENSE.libdivsufsort.txt | 0 .../LICENSE.log4j.txt | 0 .../LICENSE.lz4.txt | 0 .../LICENSE.lzma-java.txt | 0 .../LICENSE.mvn-wrapper.txt | 0 .../LICENSE.nghttp2-hpack.txt | 0 .../LICENSE.protobuf.txt | 0 .../LICENSE.slf4j.txt | 0 .../LICENSE.snappy.txt | 0 .../LICENSE.webbit.txt | 0 .../NOTICE.harmony.txt | 0 pom.xml | 2 +- 38 files changed, 261 insertions(+), 261 deletions(-) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.aalto-xml.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.base64.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.bouncycastle.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.caliper.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.commons-lang.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.commons-logging.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.compress-lzf.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.dnsinfo.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.harmony.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.hpack.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.hyper-hpack.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.jboss-marshalling.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.jbzip2.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.jctools.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.jfastlz.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.jsr166y.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.jzlib.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.libdivsufsort.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.log4j.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.lz4.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.lzma-java.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.mvn-wrapper.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.nghttp2-hpack.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.protobuf.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.slf4j.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.snappy.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/LICENSE.webbit.txt (100%) rename bookkeeper-dist/src/main/resources/deps/{netty-4.1.93.Final => netty}/NOTICE.harmony.txt (100%) diff --git a/bookkeeper-dist/src/assemble/bin-all.xml b/bookkeeper-dist/src/assemble/bin-all.xml index 736233730b7..60bc2ca1536 100644 --- a/bookkeeper-dist/src/assemble/bin-all.xml +++ b/bookkeeper-dist/src/assemble/bin-all.xml @@ -64,7 +64,7 @@ javax.servlet-api-4.0.0/CDDL+GPL-1.1 bouncycastle-1.0.2.3/LICENSE.html jsr-305/LICENSE - netty-4.1.93.Final/* + netty/* paranamer-2.8/LICENSE.txt protobuf-3.14.0/LICENSE protobuf-3.12.0/LICENSE diff --git a/bookkeeper-dist/src/assemble/bin-server.xml b/bookkeeper-dist/src/assemble/bin-server.xml index aed894675d2..0c951adbedb 100644 --- a/bookkeeper-dist/src/assemble/bin-server.xml +++ b/bookkeeper-dist/src/assemble/bin-server.xml @@ -52,7 +52,7 @@ 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.93.Final/* + netty/* bouncycastle-1.0.2.3/LICENSE.html protobuf-3.14.0/LICENSE protobuf-3.12.0/LICENSE diff --git a/bookkeeper-dist/src/assemble/bkctl.xml b/bookkeeper-dist/src/assemble/bkctl.xml index f9fda8bccb1..623b56e505e 100644 --- a/bookkeeper-dist/src/assemble/bkctl.xml +++ b/bookkeeper-dist/src/assemble/bkctl.xml @@ -69,7 +69,7 @@ checker-qual-3.5.0/LICENSE google-auth-library-credentials-0.20.0/LICENSE - netty-4.1.93.Final/* + netty/* bouncycastle-1.0.2.3/LICENSE.html protobuf-3.14.0/LICENSE protobuf-3.12.0/LICENSE diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 06e582cd996..139d7d24987 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.93.Final.jar [11] -- lib/io.netty-netty-codec-4.1.93.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.93.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.93.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.93.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.93.Final.jar [11] -- lib/io.netty-netty-common-4.1.93.Final.jar [11] -- lib/io.netty-netty-handler-4.1.93.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.93.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.93.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.94.Final.jar [11] +- lib/io.netty-netty-common-4.1.94.Final.jar [11] +- lib/io.netty-netty-handler-4.1.94.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.94.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] @@ -235,13 +235,13 @@ Apache Software License, Version 2. - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar [11] -- lib/io.netty-netty-transport-4.1.93.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-transport-4.1.94.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.21.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.93.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.94.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] @@ -332,7 +332,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.93.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.94.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 @@ -373,229 +373,229 @@ Apache Software License, Version 2. [53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.93.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.94.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.93.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.jsr166y.txt (Public Domain) + * deps/netty/LICENSE.jsr166y.txt (Public Domain) * HOMEPAGE: * 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.93.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.base64.txt (Public Domain) + * deps/netty/LICENSE.base64.txt (Public Domain) * HOMEPAGE: * http://iharder.sourceforge.net/current/java/base64/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.webbit.txt (BSD License) + * deps/netty/LICENSE.webbit.txt (BSD License) * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.slf4j.txt (MIT License) + * deps/netty/LICENSE.slf4j.txt (MIT License) * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: - * deps/netty-4.1.93.Final/NOTICE.harmony.txt + * deps/netty/NOTICE.harmony.txt * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.harmony.txt (Apache License 2.0) + * deps/netty/LICENSE.harmony.txt (Apache License 2.0) * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.jbzip2.txt (MIT License) + * deps/netty/LICENSE.jbzip2.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jbzip2/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.94.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: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.libdivsufsort.txt (MIT License) + * deps/netty/LICENSE.libdivsufsort.txt (MIT License) * HOMEPAGE: * https://github.com/y-256/libdivsufsort -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.jctools.txt (ASL2 License) + * deps/netty/LICENSE.jctools.txt (ASL2 License) * HOMEPAGE: * https://github.com/JCTools/JCTools -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.jzlib.txt (BSD style License) + * deps/netty/LICENSE.jzlib.txt (BSD style License) * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.compress-lzf.txt (Apache License 2.0) + * deps/netty/LICENSE.compress-lzf.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/ning/compress -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.lz4.txt (Apache License 2.0) + * deps/netty/LICENSE.lz4.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jpountz/lz4-java -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.lzma-java.txt (Apache License 2.0) + * deps/netty/LICENSE.lzma-java.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.jfastlz.txt (MIT License) + * deps/netty/LICENSE.jfastlz.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jfastlz/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.protobuf.txt (New BSD License) + * deps/netty/LICENSE.protobuf.txt (New BSD License) * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.94.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: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.bouncycastle.txt (MIT License) + * deps/netty/LICENSE.bouncycastle.txt (MIT License) * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.snappy.txt (New BSD License) + * deps/netty/LICENSE.snappy.txt (New BSD License) * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.jboss-marshalling.txt (Apache License 2.0) + * deps/netty/LICENSE.jboss-marshalling.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.caliper.txt (Apache License 2.0) + * deps/netty/LICENSE.caliper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.commons-logging.txt (Apache License 2.0) + * deps/netty/LICENSE.commons-logging.txt (Apache License 2.0) * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.log4j.txt (Apache License 2.0) + * deps/netty/LICENSE.log4j.txt (Apache License 2.0) * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.aalto-xml.txt (Apache License 2.0) + * deps/netty/LICENSE.aalto-xml.txt (Apache License 2.0) * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.hpack.txt (Apache License 2.0) + * deps/netty/LICENSE.hpack.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/twitter/hpack -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.hyper-hpack.txt (MIT License) + * deps/netty/LICENSE.hyper-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/python-hyper/hpack/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.nghttp2-hpack.txt (MIT License) + * deps/netty/LICENSE.nghttp2-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/nghttp2/nghttp2/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.commons-lang.txt (Apache License 2.0) + * deps/netty/LICENSE.commons-lang.txt (Apache License 2.0) * HOMEPAGE: * https://commons.apache.org/proper/commons-lang/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.mvn-wrapper.txt (Apache License 2.0) + * deps/netty/LICENSE.mvn-wrapper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/takari/maven-wrapper -lib/io.netty-netty-codec-4.1.93.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.94.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/). * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.dnsinfo.txt (Apache License 2.0) + * deps/netty/LICENSE.dnsinfo.txt (Apache License 2.0) * HOMEPAGE: * http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index d635e89c6ee..d48f589b774 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.93.Final.jar [11] -- lib/io.netty-netty-codec-4.1.93.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.93.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.93.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.93.Final.jar [11] -- lib/io.netty-netty-common-4.1.93.Final.jar [11] -- lib/io.netty-netty-handler-4.1.93.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.93.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.94.Final.jar [11] +- lib/io.netty-netty-common-4.1.94.Final.jar [11] +- lib/io.netty-netty-handler-4.1.94.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.94.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] @@ -233,13 +233,13 @@ Apache Software License, Version 2. - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar [11] -- lib/io.netty-netty-transport-4.1.93.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-transport-4.1.94.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.21.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.93.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar [11] - lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16] @@ -303,7 +303,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.93.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.94.Final [16] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.18.0 [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 @@ -335,229 +335,229 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.93.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.94.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.93.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.jsr166y.txt (Public Domain) + * deps/netty/LICENSE.jsr166y.txt (Public Domain) * HOMEPAGE: * 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.93.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.base64.txt (Public Domain) + * deps/netty/LICENSE.base64.txt (Public Domain) * HOMEPAGE: * http://iharder.sourceforge.net/current/java/base64/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.webbit.txt (BSD License) + * deps/netty/LICENSE.webbit.txt (BSD License) * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.slf4j.txt (MIT License) + * deps/netty/LICENSE.slf4j.txt (MIT License) * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: - * deps/netty-4.1.93.Final/NOTICE.harmony.txt + * deps/netty/NOTICE.harmony.txt * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.harmony.txt (Apache License 2.0) + * deps/netty/LICENSE.harmony.txt (Apache License 2.0) * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.jbzip2.txt (MIT License) + * deps/netty/LICENSE.jbzip2.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jbzip2/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.94.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: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.libdivsufsort.txt (MIT License) + * deps/netty/LICENSE.libdivsufsort.txt (MIT License) * HOMEPAGE: * https://github.com/y-256/libdivsufsort -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.jctools.txt (ASL2 License) + * deps/netty/LICENSE.jctools.txt (ASL2 License) * HOMEPAGE: * https://github.com/JCTools/JCTools -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.jzlib.txt (BSD style License) + * deps/netty/LICENSE.jzlib.txt (BSD style License) * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.compress-lzf.txt (Apache License 2.0) + * deps/netty/LICENSE.compress-lzf.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/ning/compress -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.lz4.txt (Apache License 2.0) + * deps/netty/LICENSE.lz4.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jpountz/lz4-java -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.lzma-java.txt (Apache License 2.0) + * deps/netty/LICENSE.lzma-java.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.jfastlz.txt (MIT License) + * deps/netty/LICENSE.jfastlz.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jfastlz/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.protobuf.txt (New BSD License) + * deps/netty/LICENSE.protobuf.txt (New BSD License) * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.94.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: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.bouncycastle.txt (MIT License) + * deps/netty/LICENSE.bouncycastle.txt (MIT License) * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.snappy.txt (New BSD License) + * deps/netty/LICENSE.snappy.txt (New BSD License) * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.jboss-marshalling.txt (Apache License 2.0) + * deps/netty/LICENSE.jboss-marshalling.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.caliper.txt (Apache License 2.0) + * deps/netty/LICENSE.caliper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.commons-logging.txt (Apache License 2.0) + * deps/netty/LICENSE.commons-logging.txt (Apache License 2.0) * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.log4j.txt (Apache License 2.0) + * deps/netty/LICENSE.log4j.txt (Apache License 2.0) * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.aalto-xml.txt (Apache License 2.0) + * deps/netty/LICENSE.aalto-xml.txt (Apache License 2.0) * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.hpack.txt (Apache License 2.0) + * deps/netty/LICENSE.hpack.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/twitter/hpack -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.hyper-hpack.txt (MIT License) + * deps/netty/LICENSE.hyper-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/python-hyper/hpack/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.nghttp2-hpack.txt (MIT License) + * deps/netty/LICENSE.nghttp2-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/nghttp2/nghttp2/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.commons-lang.txt (Apache License 2.0) + * deps/netty/LICENSE.commons-lang.txt (Apache License 2.0) * HOMEPAGE: * https://commons.apache.org/proper/commons-lang/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.mvn-wrapper.txt (Apache License 2.0) + * deps/netty/LICENSE.mvn-wrapper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/takari/maven-wrapper -lib/io.netty-netty-codec-4.1.93.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.94.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/). * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.dnsinfo.txt (Apache License 2.0) + * deps/netty/LICENSE.dnsinfo.txt (Apache License 2.0) * HOMEPAGE: * http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index ae5e848b67b..3f757a83f9c 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.93.Final.jar [11] -- lib/io.netty-netty-codec-4.1.93.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.93.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.93.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.93.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.93.Final.jar [11] -- lib/io.netty-netty-common-4.1.93.Final.jar [11] -- lib/io.netty-netty-handler-4.1.93.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.93.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.93.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.94.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.94.Final.jar [11] +- lib/io.netty-netty-common-4.1.94.Final.jar [11] +- lib/io.netty-netty-handler-4.1.94.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.94.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] @@ -235,13 +235,13 @@ Apache Software License, Version 2. - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar [11] -- lib/io.netty-netty-transport-4.1.93.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-transport-4.1.94.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.21.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.93.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.94.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] @@ -328,7 +328,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.93.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.94.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 @@ -368,229 +368,229 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.93.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.94.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.93.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.jsr166y.txt (Public Domain) + * deps/netty/LICENSE.jsr166y.txt (Public Domain) * HOMEPAGE: * 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.93.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.base64.txt (Public Domain) + * deps/netty/LICENSE.base64.txt (Public Domain) * HOMEPAGE: * http://iharder.sourceforge.net/current/java/base64/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.webbit.txt (BSD License) + * deps/netty/LICENSE.webbit.txt (BSD License) * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.slf4j.txt (MIT License) + * deps/netty/LICENSE.slf4j.txt (MIT License) * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: - * deps/netty-4.1.93.Final/NOTICE.harmony.txt + * deps/netty/NOTICE.harmony.txt * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.harmony.txt (Apache License 2.0) + * deps/netty/LICENSE.harmony.txt (Apache License 2.0) * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.jbzip2.txt (MIT License) + * deps/netty/LICENSE.jbzip2.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jbzip2/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.94.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: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.libdivsufsort.txt (MIT License) + * deps/netty/LICENSE.libdivsufsort.txt (MIT License) * HOMEPAGE: * https://github.com/y-256/libdivsufsort -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.jctools.txt (ASL2 License) + * deps/netty/LICENSE.jctools.txt (ASL2 License) * HOMEPAGE: * https://github.com/JCTools/JCTools -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.jzlib.txt (BSD style License) + * deps/netty/LICENSE.jzlib.txt (BSD style License) * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.compress-lzf.txt (Apache License 2.0) + * deps/netty/LICENSE.compress-lzf.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/ning/compress -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.lz4.txt (Apache License 2.0) + * deps/netty/LICENSE.lz4.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jpountz/lz4-java -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.lzma-java.txt (Apache License 2.0) + * deps/netty/LICENSE.lzma-java.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.jfastlz.txt (MIT License) + * deps/netty/LICENSE.jfastlz.txt (MIT License) * HOMEPAGE: * https://code.google.com/p/jfastlz/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.protobuf.txt (New BSD License) + * deps/netty/LICENSE.protobuf.txt (New BSD License) * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.94.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: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.bouncycastle.txt (MIT License) + * deps/netty/LICENSE.bouncycastle.txt (MIT License) * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.snappy.txt (New BSD License) + * deps/netty/LICENSE.snappy.txt (New BSD License) * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.jboss-marshalling.txt (Apache License 2.0) + * deps/netty/LICENSE.jboss-marshalling.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.caliper.txt (Apache License 2.0) + * deps/netty/LICENSE.caliper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.commons-logging.txt (Apache License 2.0) + * deps/netty/LICENSE.commons-logging.txt (Apache License 2.0) * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.log4j.txt (Apache License 2.0) + * deps/netty/LICENSE.log4j.txt (Apache License 2.0) * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.93.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.aalto-xml.txt (Apache License 2.0) + * deps/netty/LICENSE.aalto-xml.txt (Apache License 2.0) * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.hpack.txt (Apache License 2.0) + * deps/netty/LICENSE.hpack.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/twitter/hpack -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.hyper-hpack.txt (MIT License) + * deps/netty/LICENSE.hyper-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/python-hyper/hpack/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.nghttp2-hpack.txt (MIT License) + * deps/netty/LICENSE.nghttp2-hpack.txt (MIT License) * HOMEPAGE: * https://github.com/nghttp2/nghttp2/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.commons-lang.txt (Apache License 2.0) + * deps/netty/LICENSE.commons-lang.txt (Apache License 2.0) * HOMEPAGE: * https://commons.apache.org/proper/commons-lang/ -lib/io.netty-netty-codec-4.1.93.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.94.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: - * deps/netty-4.1.93.Final/LICENSE.mvn-wrapper.txt (Apache License 2.0) + * deps/netty/LICENSE.mvn-wrapper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/takari/maven-wrapper -lib/io.netty-netty-codec-4.1.93.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.94.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/). * LICENSE: - * deps/netty-4.1.93.Final/LICENSE.dnsinfo.txt (Apache License 2.0) + * deps/netty/LICENSE.dnsinfo.txt (Apache License 2.0) * HOMEPAGE: * http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index 668f47495e9..4b824280528 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.93.Final.jar -- lib/io.netty-netty-codec-4.1.93.Final.jar -- lib/io.netty-netty-codec-dns-4.1.93.Final.jar -- lib/io.netty-netty-codec-http-4.1.93.Final.jar -- lib/io.netty-netty-codec-http2-4.1.93.Final.jar -- lib/io.netty-netty-codec-socks-4.1.93.Final.jar -- lib/io.netty-netty-common-4.1.93.Final.jar -- lib/io.netty-netty-handler-4.1.93.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar -- lib/io.netty-netty-resolver-4.1.93.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.93.Final.jar +- lib/io.netty-netty-buffer-4.1.94.Final.jar +- lib/io.netty-netty-codec-4.1.94.Final.jar +- lib/io.netty-netty-codec-dns-4.1.94.Final.jar +- lib/io.netty-netty-codec-http-4.1.94.Final.jar +- lib/io.netty-netty-codec-http2-4.1.94.Final.jar +- lib/io.netty-netty-codec-socks-4.1.94.Final.jar +- lib/io.netty-netty-common-4.1.94.Final.jar +- lib/io.netty-netty-handler-4.1.94.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar +- lib/io.netty-netty-resolver-4.1.94.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] @@ -41,12 +41,12 @@ LongAdder), which was released with the following comments: - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar -- lib/io.netty-netty-transport-4.1.93.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar +- lib/io.netty-netty-transport-4.1.94.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.93.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.94.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 ee19aca7a51..99c563a0ae8 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.93.Final.jar -- lib/io.netty-netty-codec-4.1.93.Final.jar -- lib/io.netty-netty-codec-http-4.1.93.Final.jar -- lib/io.netty-netty-codec-http2-4.1.93.Final.jar -- lib/io.netty-netty-codec-socks-4.1.93.Final.jar -- lib/io.netty-netty-common-4.1.93.Final.jar -- lib/io.netty-netty-handler-4.1.93.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar -- lib/io.netty-netty-resolver-4.1.93.Final.jar +- lib/io.netty-netty-buffer-4.1.94.Final.jar +- lib/io.netty-netty-codec-4.1.94.Final.jar +- lib/io.netty-netty-codec-http-4.1.94.Final.jar +- lib/io.netty-netty-codec-http2-4.1.94.Final.jar +- lib/io.netty-netty-codec-socks-4.1.94.Final.jar +- lib/io.netty-netty-common-4.1.94.Final.jar +- lib/io.netty-netty-handler-4.1.94.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar +- lib/io.netty-netty-resolver-4.1.94.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] @@ -21,12 +21,12 @@ The Apache Software Foundation (http://www.apache.org/). - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar -- lib/io.netty-netty-transport-4.1.93.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar +- lib/io.netty-netty-transport-4.1.94.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.93.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.94.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 028ae6eb2a1..b061617e6b6 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.93.Final.jar -- lib/io.netty-netty-codec-4.1.93.Final.jar -- lib/io.netty-netty-codec-dns-4.1.93.Final.jar -- lib/io.netty-netty-codec-http-4.1.93.Final.jar -- lib/io.netty-netty-codec-http2-4.1.93.Final.jar -- lib/io.netty-netty-codec-socks-4.1.93.Final.jar -- lib/io.netty-netty-common-4.1.93.Final.jar -- lib/io.netty-netty-handler-4.1.93.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.93.Final.jar -- lib/io.netty-netty-resolver-4.1.93.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.93.Final.jar +- lib/io.netty-netty-buffer-4.1.94.Final.jar +- lib/io.netty-netty-codec-4.1.94.Final.jar +- lib/io.netty-netty-codec-dns-4.1.94.Final.jar +- lib/io.netty-netty-codec-http-4.1.94.Final.jar +- lib/io.netty-netty-codec-http2-4.1.94.Final.jar +- lib/io.netty-netty-codec-socks-4.1.94.Final.jar +- lib/io.netty-netty-common-4.1.94.Final.jar +- lib/io.netty-netty-handler-4.1.94.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar +- lib/io.netty-netty-resolver-4.1.94.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] @@ -23,12 +23,12 @@ The Apache Software Foundation (http://www.apache.org/). - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar -- lib/io.netty-netty-transport-4.1.93.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.93.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar +- lib/io.netty-netty-transport-4.1.94.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.93.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar The Netty Project diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.aalto-xml.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.aalto-xml.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.aalto-xml.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.aalto-xml.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.base64.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.base64.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.base64.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.base64.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.bouncycastle.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.bouncycastle.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.bouncycastle.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.bouncycastle.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.caliper.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.caliper.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.caliper.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.caliper.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.commons-lang.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.commons-lang.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.commons-lang.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.commons-lang.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.commons-logging.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.commons-logging.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.commons-logging.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.commons-logging.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.compress-lzf.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.compress-lzf.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.compress-lzf.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.compress-lzf.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.dnsinfo.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.dnsinfo.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.dnsinfo.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.dnsinfo.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.harmony.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.harmony.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.harmony.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.harmony.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.hpack.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.hpack.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.hpack.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.hpack.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.hyper-hpack.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.hyper-hpack.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.hyper-hpack.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.hyper-hpack.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jboss-marshalling.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jboss-marshalling.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jboss-marshalling.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jboss-marshalling.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jbzip2.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jbzip2.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jbzip2.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jbzip2.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jctools.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jctools.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jctools.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jctools.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jfastlz.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jfastlz.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jfastlz.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jfastlz.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jsr166y.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jsr166y.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jsr166y.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jsr166y.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jzlib.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jzlib.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.jzlib.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.jzlib.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.libdivsufsort.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.libdivsufsort.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.libdivsufsort.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.libdivsufsort.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.log4j.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.log4j.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.log4j.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.log4j.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.lz4.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.lz4.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.lz4.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.lz4.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.lzma-java.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.lzma-java.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.lzma-java.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.lzma-java.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.mvn-wrapper.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.mvn-wrapper.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.mvn-wrapper.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.mvn-wrapper.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.nghttp2-hpack.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.nghttp2-hpack.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.nghttp2-hpack.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.nghttp2-hpack.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.protobuf.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.protobuf.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.protobuf.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.protobuf.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.slf4j.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.slf4j.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.slf4j.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.slf4j.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.snappy.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.snappy.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.snappy.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.snappy.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.webbit.txt b/bookkeeper-dist/src/main/resources/deps/netty/LICENSE.webbit.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/LICENSE.webbit.txt rename to bookkeeper-dist/src/main/resources/deps/netty/LICENSE.webbit.txt diff --git a/bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/NOTICE.harmony.txt b/bookkeeper-dist/src/main/resources/deps/netty/NOTICE.harmony.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/netty-4.1.93.Final/NOTICE.harmony.txt rename to bookkeeper-dist/src/main/resources/deps/netty/NOTICE.harmony.txt diff --git a/pom.xml b/pom.xml index 853f03bc10a..f7a4bdda8c3 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 2.18.0 1.3.0 3.12.4 - 4.1.93.Final + 4.1.94.Final 2.0.61.Final 0.0.21.Final 9.1.3 From b519cf9053c8cd2718010fdb8b4628a1f183fd66 Mon Sep 17 00:00:00 2001 From: houxiaoyu Date: Mon, 10 Jul 2023 10:29:19 +0800 Subject: [PATCH 064/233] Recycle LongWrapper finally (#4007) (cherry picked from commit 528f373aac0afd5bfe71baa2922cbeab4fedf4ac) --- .../storage/ldb/LedgerMetadataIndex.java | 52 +++++++++++-------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java index cf6cbfcdc2d..235b554988c 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java @@ -299,38 +299,44 @@ public void setMasterKey(long ledgerId, byte[] masterKey) throws IOException { public void flush() throws IOException { LongWrapper key = LongWrapper.get(); - int updatedLedgers = 0; - Entry entry; - while ((entry = pendingLedgersUpdates.poll()) != null) { - key.set(entry.getKey()); - byte[] value = entry.getValue().toByteArray(); - ledgersDb.put(key.array, value); - ++updatedLedgers; - } + try { + int updatedLedgers = 0; + Entry entry; + while ((entry = pendingLedgersUpdates.poll()) != null) { + key.set(entry.getKey()); + byte[] value = entry.getValue().toByteArray(); + ledgersDb.put(key.array, value); + ++updatedLedgers; + } - if (log.isDebugEnabled()) { - log.debug("Persisting updates to {} ledgers", updatedLedgers); - } + if (log.isDebugEnabled()) { + log.debug("Persisting updates to {} ledgers", updatedLedgers); + } - ledgersDb.sync(); - key.recycle(); + ledgersDb.sync(); + } finally { + key.recycle(); + } } public void removeDeletedLedgers() throws IOException { LongWrapper key = LongWrapper.get(); - int deletedLedgers = 0; - for (Long ledgerId : pendingDeletedLedgers) { - key.set(ledgerId); - ledgersDb.delete(key.array); - } + try { + int deletedLedgers = 0; + for (Long ledgerId : pendingDeletedLedgers) { + key.set(ledgerId); + ledgersDb.delete(key.array); + } - if (log.isDebugEnabled()) { - log.debug("Persisting deletes of ledgers {}", deletedLedgers); - } + if (log.isDebugEnabled()) { + log.debug("Persisting deletes of ledgers {}", deletedLedgers); + } - ledgersDb.sync(); - key.recycle(); + ledgersDb.sync(); + } finally { + key.recycle(); + } } private ReentrantLock lockForLedger(long ledgerId) { From 4c87a1793cf9ff53407f591eaf7026a43138c203 Mon Sep 17 00:00:00 2001 From: houxiaoyu Date: Fri, 21 Jul 2023 10:33:46 +0800 Subject: [PATCH 065/233] Fix deletedLedgers count (#4026) (cherry picked from commit 3bf08fef12979bf3cff49ee953899f26c6281ad9) --- .../bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java index 235b554988c..20e0dd09ade 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java @@ -327,6 +327,7 @@ public void removeDeletedLedgers() throws IOException { for (Long ledgerId : pendingDeletedLedgers) { key.set(ledgerId); ledgersDb.delete(key.array); + ++deletedLedgers; } if (log.isDebugEnabled()) { From e531fd1806ce37cdfbdcd56b29c4c8d46b5fd2ca Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Mon, 14 Aug 2023 08:49:27 +0800 Subject: [PATCH 066/233] Allow to set max operation numbers in a single rocksdb batch (#4044) --- ## Motivation In rocksdb, the memory usage is related to the batch size. The more operations in a single batch, the more memory is consumed. Expose the configuration to allow control the batch size. (cherry picked from commit ad0ed213c0d3abf971441c7160334af99d94159c) --- .../bookie/storage/ldb/KeyValueStorage.java | 4 ++ .../storage/ldb/KeyValueStorageRocksDB.java | 28 +++++++++++++- .../bookkeeper/conf/ServerConfiguration.java | 24 ++++++++++++ .../storage/ldb/KeyValueStorageTest.java | 37 +++++++++++++++++++ 4 files changed, 92 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorage.java index ab724d73bb5..8e18148c085 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorage.java @@ -178,5 +178,9 @@ public interface Batch extends Closeable { void clear(); void flush() throws IOException; + + default int batchCount() { + return -1; + } } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java index fd870506939..a77a0a18f7c 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java @@ -84,6 +84,7 @@ public class KeyValueStorageRocksDB implements KeyValueStorage { private final ReadOptions optionCache; private final ReadOptions optionDontCache; private final WriteBatch emptyBatch; + private final int writeBatchMaxSize; private String dbPath; @@ -143,6 +144,8 @@ public KeyValueStorageRocksDB(String basePath, String subPath, DbConfigType dbCo optionCache.setFillCache(true); optionDontCache.setFillCache(false); + + this.writeBatchMaxSize = conf.getMaxOperationNumbersInSingleRocksDBBatch(); } private RocksDB initializeRocksDBWithConfFile(String basePath, String subPath, DbConfigType dbConfigType, @@ -516,21 +519,29 @@ public long count() throws IOException { @Override public Batch newBatch() { - return new RocksDBBatch(); + return new RocksDBBatch(writeBatchMaxSize); } private class RocksDBBatch implements Batch { private final WriteBatch writeBatch = new WriteBatch(); + private final int batchSize; + private int batchCount = 0; + + RocksDBBatch(int batchSize) { + this.batchSize = batchSize; + } @Override public void close() { writeBatch.close(); + batchCount = 0; } @Override public void put(byte[] key, byte[] value) throws IOException { try { writeBatch.put(key, value); + countBatchAndFlushIfNeeded(); } catch (RocksDBException e) { throw new IOException("Failed to flush RocksDB batch", e); } @@ -540,6 +551,7 @@ public void put(byte[] key, byte[] value) throws IOException { public void remove(byte[] key) throws IOException { try { writeBatch.delete(key); + countBatchAndFlushIfNeeded(); } catch (RocksDBException e) { throw new IOException("Failed to flush RocksDB batch", e); } @@ -548,17 +560,31 @@ public void remove(byte[] key) throws IOException { @Override public void clear() { writeBatch.clear(); + batchCount = 0; } @Override public void deleteRange(byte[] beginKey, byte[] endKey) throws IOException { try { writeBatch.deleteRange(beginKey, endKey); + countBatchAndFlushIfNeeded(); } catch (RocksDBException e) { throw new IOException("Failed to flush RocksDB batch", e); } } + private void countBatchAndFlushIfNeeded() throws IOException { + if (++batchCount >= batchSize) { + flush(); + clear(); + } + } + + @Override + public int batchCount() { + return batchCount; + } + @Override public void flush() throws IOException { try { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java index 2849d3fd66e..019144e9942 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java @@ -338,6 +338,9 @@ public class ServerConfiguration extends AbstractConfiguration Date: Mon, 28 Aug 2023 21:39:21 +0800 Subject: [PATCH 067/233] [release] Force to use linux/amd64 to build release (#4060) --- ### Motivation Because we have a Native IO that needs to be built from cpp code. The build platform will impact the target library. People are using different laptop to execute the release process with docker, we need to force the image to use linux/amd64 platform to ensure the .so lib build out the correct platform lib. Since most of time we are using amd64 to run the bookie, making the dev docker image build from amd64. (cherry picked from commit 5a47c1d3a0d4357272776c3131bac896e60be5fa) --- dev/release/000-run-docker.sh | 2 +- dev/release/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/release/000-run-docker.sh b/dev/release/000-run-docker.sh index 4ce19c07d11..7854dc49dd3 100755 --- a/dev/release/000-run-docker.sh +++ b/dev/release/000-run-docker.sh @@ -48,7 +48,7 @@ else # boot2docker uid and gid fi docker build -t "${IMAGE_NAME}-${USER_NAME}" - < Date: Mon, 3 Jul 2023 11:06:28 +0800 Subject: [PATCH 068/233] Bump guava version from 31.0.1-jre to 32.0.1-jre (#4008) ### Motivation Bump guava version from 31.0.1-jre to 32.0.1-jre, Fix CVE-2023-2976 (cherry picked from commit 52e780f326c6cb5f303b51aa6ab5363c8e94b074) --- bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 8 ++++---- bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 8 ++++---- bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 8 ++++---- pom.xml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 139d7d24987..2e2bd767af3 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -208,7 +208,7 @@ Apache Software License, Version 2. - lib/com.fasterxml.jackson.core-jackson-annotations-2.13.4.jar [1] - lib/com.fasterxml.jackson.core-jackson-core-2.13.4.jar [2] - lib/com.fasterxml.jackson.core-jackson-databind-2.13.4.2.jar [3] -- lib/com.google.guava-guava-31.0.1-jre.jar [4] +- lib/com.google.guava-guava-32.0.1-jre.jar [4] - lib/com.google.guava-failureaccess-1.0.1.jar [4] - lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4] - lib/commons-cli-commons-cli-1.2.jar [5] @@ -309,7 +309,7 @@ Apache Software License, Version 2. - lib/com.google.http-client-google-http-client-1.41.0.jar [43] - lib/com.google.http-client-google-http-client-gson-1.41.0.jar [43] - lib/com.google.auto.value-auto-value-annotations-1.9.jar [44] -- lib/com.google.j2objc-j2objc-annotations-1.3.jar [45] +- lib/com.google.j2objc-j2objc-annotations-2.8.jar [45] - lib/com.google.re2j-re2j-1.6.jar [46] - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47] - lib/io.dropwizard.metrics-metrics-graphite-4.1.12.1.jar [47] @@ -325,7 +325,7 @@ Apache Software License, Version 2. [1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.13.4 [2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.13.4 [3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.13.4.2 -[4] Source available at https://github.com/google/guava/tree/v31.0.1 +[4] Source available at https://github.com/google/guava/tree/v32.0.1 [5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2 [6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2 [7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10 @@ -681,7 +681,7 @@ This product uses the annotations from The Checker Framework, which are licensed MIT License. For details, see deps/checker-qual-3.5.0/LICENSE Bundles as - - lib/org.checkerframework-checker-qual-3.12.0.jar + - lib/org.checkerframework-checker-qual-3.33.0.jar ------------------------------------------------------------------------------------ This product bundles the Reactive Streams library, which is licensed under Public Domain (CC0). For details, see deps/reactivestreams-1.0.3/LICENSE diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index d48f589b774..edda66b1c7b 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -208,7 +208,7 @@ Apache Software License, Version 2. - lib/com.fasterxml.jackson.core-jackson-annotations-2.13.4.jar [1] - lib/com.fasterxml.jackson.core-jackson-core-2.13.4.jar [2] - lib/com.fasterxml.jackson.core-jackson-databind-2.13.4.2.jar [3] -- lib/com.google.guava-guava-31.0.1-jre.jar [4] +- lib/com.google.guava-guava-32.0.1-jre.jar [4] - lib/com.google.guava-failureaccess-1.0.1.jar [4] - lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4] - lib/commons-cli-commons-cli-1.2.jar [5] @@ -284,7 +284,7 @@ Apache Software License, Version 2. - lib/com.google.auto.value-auto-value-annotations-1.9.jar [42] - lib/com.google.http-client-google-http-client-1.41.0.jar [43] - lib/com.google.http-client-google-http-client-gson-1.41.0.jar [43] -- lib/com.google.j2objc-j2objc-annotations-1.3.jar [44] +- lib/com.google.j2objc-j2objc-annotations-2.8.jar [44] - lib/com.google.re2j-re2j-1.6.jar [45] - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [46] - lib/io.perfmark-perfmark-api-0.25.0.jar [47] @@ -296,7 +296,7 @@ Apache Software License, Version 2. [1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.13.4 [2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.13.4 [3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.13.4.2 -[4] Source available at https://github.com/google/guava/tree/v31.0.1 +[4] Source available at https://github.com/google/guava/tree/v32.0.1 [5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2 [6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2 [7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10 @@ -601,7 +601,7 @@ This product uses the annotations from The Checker Framework, which are licensed MIT License. For details, see deps/checker-qual-3.5.0/LICENSE Bundles as - - lib/org.checkerframework-checker-qual-3.12.0.jar + - lib/org.checkerframework-checker-qual-3.33.0.jar ------------------------------------------------------------------------------------ This product bundles the Reactive Streams library, which is licensed under Public Domain (CC0). For details, see deps/reactivestreams-1.0.3/LICENSE diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index 3f757a83f9c..4274a00de6d 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -208,7 +208,7 @@ Apache Software License, Version 2. - lib/com.fasterxml.jackson.core-jackson-annotations-2.13.4.jar [1] - lib/com.fasterxml.jackson.core-jackson-core-2.13.4.jar [2] - lib/com.fasterxml.jackson.core-jackson-databind-2.13.4.2.jar [3] -- lib/com.google.guava-guava-31.0.1-jre.jar [4] +- lib/com.google.guava-guava-32.0.1-jre.jar [4] - lib/com.google.guava-failureaccess-1.0.1.jar [4] - lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4] - lib/commons-cli-commons-cli-1.2.jar [5] @@ -309,7 +309,7 @@ Apache Software License, Version 2. - lib/com.google.http-client-google-http-client-1.41.0.jar [43] - lib/com.google.http-client-google-http-client-gson-1.41.0.jar [43] - lib/com.google.auto.value-auto-value-annotations-1.9.jar [44] -- lib/com.google.j2objc-j2objc-annotations-1.3.jar [45] +- lib/com.google.j2objc-j2objc-annotations-2.8.jar [45] - lib/com.google.re2j-re2j-1.6.jar [46] - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47] - lib/io.perfmark-perfmark-api-0.25.0.jar [48] @@ -321,7 +321,7 @@ Apache Software License, Version 2. [1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.13.4 [2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.13.4 [3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.13.4.2 -[4] Source available at https://github.com/google/guava/tree/v31.0.1 +[4] Source available at https://github.com/google/guava/tree/v32.0.1 [5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2 [6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2 [7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10 @@ -670,7 +670,7 @@ This product uses the annotations from The Checker Framework, which are licensed MIT License. For details, see deps/checker-qual-3.5.0/LICENSE Bundles as - - lib/org.checkerframework-checker-qual-3.12.0.jar + - lib/org.checkerframework-checker-qual-3.33.0.jar ------------------------------------------------------------------------------------ This product bundles the Reactive Streams library, which is licensed under Public Domain (CC0). For details, see deps/reactivestreams-1.0.3/LICENSE diff --git a/pom.xml b/pom.xml index f7a4bdda8c3..aa2603bbba5 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ 3.0.2 2.9.0 1.54.1 - 31.0.1-jre + 32.0.1-jre 1.1.1 3.3.5 1.3 From 762740c5e6de9799780c7642bcb5af6ce0116d03 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Tue, 29 Aug 2023 14:51:16 +0800 Subject: [PATCH 069/233] Enable kv logs in log4j configuration (#3986) ### Motivation We introduced DirectIO since BookKeeper 4.16.0, and the DirectIO classes use KV-based Slf4jSlogger. https://github.com/apache/bookkeeper/blob/master/bookkeeper-slogger/slf4j/src/main/java/org/apache/bookkeeper/slogger/slf4j/Slf4jSlogger.java In order to print the KV out, we need to add `%X` flag in log4j2.yaml, otherwise the log will miss the detailed key and values. ### Modifications In order to reduce the impact on current logger appenders, I add MDC-based appenders for `CONSOLE`, `TRACEFILE`, and `ROLLINGFILE` by adding `%X` for log4j2.yaml Appender PatternLayout. Only classes under `org.apache.bookkeeper.bookie.storage.directentrylogger` will enable MDC-based appender logger. If the key value has items, the log will look like: ``` 2023-06-19T16:01:56,685+0800 [main] INFO org.apache.bookkeeper.bookie.storage.directentrylogger.EntryLogIdsImpl {dirs=[data/bookkeeper/ledgers/current], durationMs=0, event=ENTRYLOG_IDS_CANDIDATES_SELECTED, maxId=21474836 47, nextId=0} - ENTRYLOG_IDS_CANDIDATES_SELECTED 2023-06-19T16:01:56,721+0800 [main] INFO org.apache.bookkeeper.bookie.storage.directentrylogger.DirectEntryLogger {directory=data/bookkeeper/ledgers/current, event=ENTRYLOGGER_CREATED, maxCachedReaders=32, maxCachedReader sPerThread=4, maxFileSize=1073741824, maxSaneEntrySize=5252620, perThreadBufferSize=33554432, readBufferSize=8388608, singleWriteBufferSize=33554432, totalReadBufferSize=268435456, totalWriteBufferSize=268435456} - ENTRYLO GGER_CREATED ``` (cherry picked from commit da1d8eb7c0626850bb921f770a4c880bfdc0a0f2) --- conf/log4j2.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/conf/log4j2.xml b/conf/log4j2.xml index 61c92a59353..08d5d5613c1 100644 --- a/conf/log4j2.xml +++ b/conf/log4j2.xml @@ -30,9 +30,15 @@ + + + + + + @@ -40,10 +46,20 @@ + + + + + + + + + + From 25c5e7f47be1c2d1b4b8ebefffb475d7b803eba7 Mon Sep 17 00:00:00 2001 From: lifepuzzlefun Date: Tue, 29 Aug 2023 14:52:16 +0800 Subject: [PATCH 070/233] fix read write request leak when executor full. (#4024) Co-authored-by: wangjinlong (cherry picked from commit 0b0fe0bb42b535c9b447b6ed95b961899832f76b) --- .../org/apache/bookkeeper/proto/BookieRequestProcessor.java | 4 ++++ .../java/org/apache/bookkeeper/proto/ReadEntryProcessor.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java index 7ebd8c90a7a..a77b3d7bb5b 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java @@ -667,6 +667,9 @@ private void processAddRequest(final BookieProtocol.ParsedAddRequest r, final Bo BookieProtocol.ETOOMANYREQUESTS, ResponseBuilder.buildErrorResponse(BookieProtocol.ETOOMANYREQUESTS, r), requestStats.getAddRequestStats()); + r.release(); + r.recycle(); + write.recycle(); } } } @@ -703,6 +706,7 @@ private void processReadRequest(final BookieProtocol.ReadRequest r, final Bookie ResponseBuilder.buildErrorResponse(BookieProtocol.ETOOMANYREQUESTS, r), requestStats.getReadRequestStats()); onReadRequestFinish(); + read.recycle(); } } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java index 4c9c1c9440f..04efd9634b2 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java @@ -189,7 +189,7 @@ public String toString() { return String.format("ReadEntry(%d, %d)", request.getLedgerId(), request.getEntryId()); } - private void recycle() { + void recycle() { request.recycle(); super.reset(); this.recyclerHandle.recycle(this); From e63f647a8b017110ff9d45864a85d839c505559a Mon Sep 17 00:00:00 2001 From: houxiaoyu Date: Tue, 29 Aug 2023 14:53:29 +0800 Subject: [PATCH 071/233] fix AutoCloseableLifecycleComponent close exception log (#4042) Descriptions of the changes in this PR: ### Motivation If closed with exception, the log will always be `failed to close AutoCloseableLifecycleComponent`. It will be better to print the `componentName` instead of the class name. ### Changes Print the `componentName` instead of `AutoCloseableLifecycleComponent` class name if closed with exception (cherry picked from commit 269374fe5318a435c0591cc462af63ead61f3f8c) --- .../common/component/AbstractLifecycleComponent.java | 2 +- .../component/AutoCloseableLifecycleComponent.java | 2 +- .../org/apache/bookkeeper/server/EmbeddedServer.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/component/AbstractLifecycleComponent.java b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/component/AbstractLifecycleComponent.java index 5b6f19ee35b..534c952f337 100644 --- a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/component/AbstractLifecycleComponent.java +++ b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/component/AbstractLifecycleComponent.java @@ -122,7 +122,7 @@ public void close() { try { doClose(); } catch (IOException e) { - log.warn("failed to close {}", getClass().getName(), e); + log.warn("failed to close {}", componentName, e); } listeners.forEach(LifecycleListener::afterClose); } diff --git a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/component/AutoCloseableLifecycleComponent.java b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/component/AutoCloseableLifecycleComponent.java index f741cbac3cd..ded3707a058 100644 --- a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/component/AutoCloseableLifecycleComponent.java +++ b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/component/AutoCloseableLifecycleComponent.java @@ -100,7 +100,7 @@ public void close() { try { closeable.close(); } catch (Exception e) { - LOG.warn("failed to close {}", getClass().getName(), e); + LOG.warn("failed to close {}", componentName, e); } listeners.forEach(LifecycleListener::afterClose); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/EmbeddedServer.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/EmbeddedServer.java index bfa80246f56..92e6462b2b0 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/EmbeddedServer.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/EmbeddedServer.java @@ -295,7 +295,7 @@ public EmbeddedServer build() throws Exception { StatsProviderService statsProviderService = new StatsProviderService(conf); statsProvider = statsProviderService.getStatsProvider(); serverBuilder.addComponent(statsProviderService); - log.info("Load lifecycle component : {}", StatsProviderService.class.getName()); + log.info("Load lifecycle component : {}", statsProviderService.getName()); } StatsLogger rootStatsLogger = statsProvider.getStatsLogger(""); @@ -431,7 +431,7 @@ public EmbeddedServer build() throws Exception { new BookieService(conf, bookie, rootStatsLogger, allocatorWithOomHandler, uncleanShutdownDetection); serverBuilder.addComponent(bookieService); - log.info("Load lifecycle component : {}", BookieService.class.getName()); + log.info("Load lifecycle component : {}", bookieService.getName()); if (conf.getServerConf().isLocalScrubEnabled()) { serverBuilder.addComponent( @@ -446,7 +446,7 @@ public EmbeddedServer build() throws Exception { autoRecoveryService = new AutoRecoveryService(conf, rootStatsLogger.scope(REPLICATION_SCOPE)); serverBuilder.addComponent(autoRecoveryService); - log.info("Load lifecycle component : {}", AutoRecoveryService.class.getName()); + log.info("Load lifecycle component : {}", autoRecoveryService.getName()); } // 7. build data integrity check service @@ -456,7 +456,7 @@ public EmbeddedServer build() throws Exception { dataIntegrityService = new DataIntegrityService(conf, rootStatsLogger.scope(REPLICATION_SCOPE), integCheck); serverBuilder.addComponent(dataIntegrityService); - log.info("Load lifecycle component : {}", DataIntegrityService.class.getName()); + log.info("Load lifecycle component : {}", dataIntegrityService.getName()); } // 8. build http service @@ -470,7 +470,7 @@ public EmbeddedServer build() throws Exception { .build(); httpService = new HttpService(provider, conf, rootStatsLogger); serverBuilder.addComponent(httpService); - log.info("Load lifecycle component : {}", HttpService.class.getName()); + log.info("Load lifecycle component : {}", httpService.getName()); } // 9. build extra services @@ -483,7 +483,7 @@ public EmbeddedServer build() throws Exception { rootStatsLogger); for (ServerLifecycleComponent component : components) { serverBuilder.addComponent(component); - log.info("Load lifecycle component : {}", component.getClass().getName()); + log.info("Load lifecycle component : {}", component.getName()); } } catch (Exception e) { if (conf.getServerConf().getIgnoreExtraServerComponentsStartupFailures()) { From 4052dc0f8f482b238f58fecbfb15eb222dbc109f Mon Sep 17 00:00:00 2001 From: Zhangao Date: Tue, 29 Aug 2023 14:59:27 +0800 Subject: [PATCH 072/233] Optimize getEntryLogMetadata (#3948) ###Motivation In the `getEntryLogMetadata` method, the `FileNotFoundException` exception is caught before the more general Exception. This modification ensures that if the log file is not found, there is no need to proceed with the `extractEntryLogMetadataByScanning(entryLogId, throttler)` method call. This enhancement improves the code's error handling by distinguishing between different exceptions that may occur during the retrieval of entry log metadata. It ensures that unnecessary operations, scanning the log, are skipped when the log file is not found. (cherry picked from commit 69f27b71c6a6ef051b5aba718cca0c209e9e17db) --- .../java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java index b6321c6f38a..26b62fa9d71 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java @@ -1036,6 +1036,9 @@ public EntryLogMetadata getEntryLogMetadata(long entryLogId, AbstractLogCompacto // entry log try { return extractEntryLogMetadataFromIndex(entryLogId); + } catch (FileNotFoundException fne) { + LOG.warn("Cannot find entry log file {}.log : {}", Long.toHexString(entryLogId), fne.getMessage()); + throw fne; } catch (Exception e) { LOG.info("Failed to get ledgers map index from: {}.log : {}", entryLogId, e.getMessage()); From f8a0501939fc5131e4c817e3d5a693c662bdb2d9 Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Wed, 30 Aug 2023 13:24:16 +0800 Subject: [PATCH 073/233] Make compatible between DefaultEntryLogger and DirectEntryLogger (#4041) Descriptions of the changes in this PR: Fixes #4040 Upgrade guide: If the user already uses the DirectEntryLogger in production, can not disable DirectEntryLogger directly. There are two ways: 1. Upgrade to the version with this PR, and disable DirectEntryLogger. Then restart, and the data won't be lost. 2. If you don't want to upgrade to the bookie version, you should stop the bookie first, then find the entry log which has the biggest log id. Modify the `lastLogId` file content using the biggest log id. (Not recommend) --------- Co-authored-by: zymap (cherry picked from commit 2e8be78ab8ac1011646e40b3e4bb299fd5b3ff1e) --- .../bookkeeper/bookie/DefaultEntryLogger.java | 27 ++++- .../bookie/EntryLoggerAllocator.java | 4 +- .../directentrylogger/DirectEntryLogger.java | 5 +- .../directentrylogger/EntryLogIdsImpl.java | 83 +------------- .../apache/bookkeeper/util/LedgerDirUtil.java | 104 ++++++++++++++++++ .../bookkeeper/bookie/CreateNewLogTest.java | 40 +++++++ .../directentrylogger/TestEntryLogIds.java | 13 ++- 7 files changed, 187 insertions(+), 89 deletions(-) create mode 100644 bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LedgerDirUtil.java diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java index 26b62fa9d71..406f332a90d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java @@ -66,8 +66,10 @@ import org.apache.bookkeeper.util.DiskChecker; import org.apache.bookkeeper.util.HardLink; import org.apache.bookkeeper.util.IOUtils; +import org.apache.bookkeeper.util.LedgerDirUtil; import org.apache.bookkeeper.util.collections.ConcurrentLongLongHashMap; import org.apache.bookkeeper.util.collections.ConcurrentLongLongHashMap.BiConsumerLong; +import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -342,7 +344,17 @@ public DefaultEntryLogger(ServerConfiguration conf, throw new FileNotFoundException( "Entry log directory '" + dir + "' does not exist"); } - long lastLogId = getLastLogId(dir); + long lastLogId; + long lastLogFileFromFile = getLastLogIdFromFile(dir); + long lastLogIdInDir = getLastLogIdInDir(dir); + if (lastLogFileFromFile < lastLogIdInDir) { + LOG.info("The lastLogFileFromFile is {}, the lastLogIdInDir is {}, " + + "use lastLogIdInDir as the lastLogId.", lastLogFileFromFile, lastLogIdInDir); + lastLogId = lastLogIdInDir; + } else { + lastLogId = lastLogFileFromFile; + } + if (lastLogId > logId) { logId = lastLogId; } @@ -532,7 +544,7 @@ public boolean removeEntryLog(long entryLogId) { return true; } - private long getLastLogId(File dir) { + private long getLastLogIdFromFile(File dir) { long id = readLastLogId(dir); // read success if (id > 0) { @@ -556,6 +568,17 @@ private long getLastLogId(File dir) { return logs.get(logs.size() - 1); } + private long getLastLogIdInDir(File dir) { + List currentIds = new ArrayList(); + currentIds.addAll(LedgerDirUtil.logIdsInDirectory(dir)); + currentIds.addAll(LedgerDirUtil.compactedLogIdsInDirectory(dir)); + if (currentIds.isEmpty()) { + return -1; + } + Pair largestGap = LedgerDirUtil.findLargestGap(currentIds); + return largestGap.getLeft() - 1; + } + /** * reads id from the "lastId" file in the given directory. */ diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java index fdcd44d7d7d..68fc1eb3caf 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java @@ -24,6 +24,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.bookkeeper.bookie.TransactionalEntryLogCompactor.COMPACTING_SUFFIX; +import com.google.common.annotations.VisibleForTesting; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.Unpooled; @@ -202,7 +203,8 @@ private synchronized void closePreAllocateLog() { /** * writes the given id to the "lastId" file in the given directory. */ - private void setLastLogId(File dir, long logId) throws IOException { + @VisibleForTesting + void setLastLogId(File dir, long logId) throws IOException { FileOutputStream fos; fos = new FileOutputStream(new File(dir, "lastId")); BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(fos, UTF_8)); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java index 0d2d509598f..323727217d6 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java @@ -58,6 +58,7 @@ import org.apache.bookkeeper.common.util.nativeio.NativeIO; import org.apache.bookkeeper.slogger.Slogger; import org.apache.bookkeeper.stats.StatsLogger; +import org.apache.bookkeeper.util.LedgerDirUtil; /** * DirectEntryLogger. @@ -365,7 +366,7 @@ public void close() throws IOException { @Override public Collection getFlushedLogIds() { - return EntryLogIdsImpl.logIdsInDirectory(ledgerDir).stream() + return LedgerDirUtil.logIdsInDirectory(ledgerDir).stream() .filter(logId -> !unflushedLogs.contains(logId)) .map(i -> Long.valueOf(i)) .collect(Collectors.toList()); @@ -492,7 +493,7 @@ public Collection incompleteCompactionLogs() { } } - Matcher m = EntryLogIdsImpl.COMPACTED_FILE_PATTERN.matcher(f.getName()); + Matcher m = LedgerDirUtil.COMPACTED_FILE_PATTERN.matcher(f.getName()); if (m.matches()) { int dstLogId = Integer.parseUnsignedInt(m.group(1), 16); int srcLogId = Integer.parseUnsignedInt(m.group(2), 16); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/EntryLogIdsImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/EntryLogIdsImpl.java index 6b43fca47aa..2b63ec74f28 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/EntryLogIdsImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/EntryLogIdsImpl.java @@ -23,22 +23,18 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.bookkeeper.bookie.LedgerDirsManager; import org.apache.bookkeeper.bookie.storage.EntryLogIds; import org.apache.bookkeeper.slogger.Slogger; +import org.apache.bookkeeper.util.LedgerDirUtil; import org.apache.commons.lang3.tuple.Pair; /** * EntryLogIdsImpl. */ public class EntryLogIdsImpl implements EntryLogIds { - public static final Pattern FILE_PATTERN = Pattern.compile("^([0-9a-fA-F]+)\\.log$"); - public static final Pattern COMPACTED_FILE_PATTERN = - Pattern.compile("^([0-9a-fA-F]+)\\.log\\.([0-9a-fA-F]+)\\.compacted$"); + private final LedgerDirsManager ledgerDirsManager; private final Slogger slog; @@ -72,11 +68,10 @@ private void findLargestGap() throws IOException { List currentIds = new ArrayList(); for (File ledgerDir : ledgerDirsManager.getAllLedgerDirs()) { - currentIds.addAll(logIdsInDirectory(ledgerDir)); - currentIds.addAll(compactedLogIdsInDirectory(ledgerDir)); + currentIds.addAll(LedgerDirUtil.logIdsInDirectory(ledgerDir)); + currentIds.addAll(LedgerDirUtil.compactedLogIdsInDirectory(ledgerDir)); } - - Pair gap = findLargestGap(currentIds); + Pair gap = LedgerDirUtil.findLargestGap(currentIds); nextId = gap.getLeft(); maxId = gap.getRight(); slog.kv("dirs", ledgerDirsManager.getAllLedgerDirs()) @@ -85,72 +80,4 @@ private void findLargestGap() throws IOException { .kv("durationMs", TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start)) .info(Events.ENTRYLOG_IDS_CANDIDATES_SELECTED); } - - /** - * O(nlogn) algorithm to find largest contiguous gap between - * integers in a passed list. n should be relatively small. - * Entry logs should be about 1GB in size, so even if the node - * stores a PB, there should be only 1000000 entry logs. - */ - static Pair findLargestGap(List currentIds) { - if (currentIds.isEmpty()) { - return Pair.of(0, Integer.MAX_VALUE); - } - - Collections.sort(currentIds); - - int nextIdCandidate = 0; - int maxIdCandidate = currentIds.get(0); - int maxGap = maxIdCandidate - nextIdCandidate; - for (int i = 0; i < currentIds.size(); i++) { - int gapStart = currentIds.get(i) + 1; - int j = i + 1; - int gapEnd = Integer.MAX_VALUE; - if (j < currentIds.size()) { - gapEnd = currentIds.get(j); - } - int gapSize = gapEnd - gapStart; - if (gapSize > maxGap) { - maxGap = gapSize; - nextIdCandidate = gapStart; - maxIdCandidate = gapEnd; - } - } - return Pair.of(nextIdCandidate, maxIdCandidate); - } - - public static List logIdsInDirectory(File directory) { - List ids = new ArrayList<>(); - if (directory.exists() && directory.isDirectory()) { - File[] files = directory.listFiles(); - if (files != null && files.length > 0) { - for (File f : files) { - Matcher m = FILE_PATTERN.matcher(f.getName()); - if (m.matches()) { - int logId = Integer.parseUnsignedInt(m.group(1), 16); - ids.add(logId); - } - } - } - } - return ids; - } - - private static List compactedLogIdsInDirectory(File directory) { - List ids = new ArrayList<>(); - if (directory.exists() && directory.isDirectory()) { - File[] files = directory.listFiles(); - if (files != null && files.length > 0) { - for (File f : files) { - Matcher m = COMPACTED_FILE_PATTERN.matcher(f.getName()); - if (m.matches()) { - int logId = Integer.parseUnsignedInt(m.group(1), 16); - ids.add(logId); - } - } - } - } - return ids; - - } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LedgerDirUtil.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LedgerDirUtil.java new file mode 100644 index 00000000000..d7711bbb1a3 --- /dev/null +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LedgerDirUtil.java @@ -0,0 +1,104 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.bookkeeper.util; + + +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.apache.commons.lang3.tuple.Pair; + +public class LedgerDirUtil { + + public static final Pattern FILE_PATTERN = Pattern.compile("^([0-9a-fA-F]+)\\.log$"); + public static final Pattern COMPACTED_FILE_PATTERN = + Pattern.compile("^([0-9a-fA-F]+)\\.log\\.([0-9a-fA-F]+)\\.compacted$"); + + public static List logIdsInDirectory(File directory) { + List ids = new ArrayList<>(); + if (directory.exists() && directory.isDirectory()) { + File[] files = directory.listFiles(); + if (files != null && files.length > 0) { + for (File f : files) { + Matcher m = FILE_PATTERN.matcher(f.getName()); + if (m.matches()) { + int logId = Integer.parseUnsignedInt(m.group(1), 16); + ids.add(logId); + } + } + } + } + return ids; + } + + public static List compactedLogIdsInDirectory(File directory) { + List ids = new ArrayList<>(); + if (directory.exists() && directory.isDirectory()) { + File[] files = directory.listFiles(); + if (files != null && files.length > 0) { + for (File f : files) { + Matcher m = COMPACTED_FILE_PATTERN.matcher(f.getName()); + if (m.matches()) { + int logId = Integer.parseUnsignedInt(m.group(1), 16); + ids.add(logId); + } + } + } + } + return ids; + } + + /** + * O(nlogn) algorithm to find largest contiguous gap between + * integers in a passed list. n should be relatively small. + * Entry logs should be about 1GB in size, so even if the node + * stores a PB, there should be only 1000000 entry logs. + */ + public static Pair findLargestGap(List currentIds) { + if (currentIds.isEmpty()) { + return Pair.of(0, Integer.MAX_VALUE); + } + + Collections.sort(currentIds); + + int nextIdCandidate = 0; + int maxIdCandidate = currentIds.get(0); + int maxGap = maxIdCandidate - nextIdCandidate; + for (int i = 0; i < currentIds.size(); i++) { + int gapStart = currentIds.get(i) + 1; + int j = i + 1; + int gapEnd = Integer.MAX_VALUE; + if (j < currentIds.size()) { + gapEnd = currentIds.get(j); + } + int gapSize = gapEnd - gapStart; + if (gapSize > maxGap) { + maxGap = gapSize; + nextIdCandidate = gapStart; + maxIdCandidate = gapEnd; + } + } + return Pair.of(nextIdCandidate, maxIdCandidate); + } +} diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java index 31553432240..4d7015876b7 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java @@ -525,6 +525,46 @@ public void testCreateNewLogAndCompactionLog() throws Exception { el.getPreviousAllocatedEntryLogId()); } + @Test + public void testLastIdCompatibleBetweenDefaultAndDirectEntryLogger() throws Exception { + ServerConfiguration conf = TestBKConfiguration.newServerConfiguration(); + + // Creating a new configuration with a number of + // ledger directories. + conf.setLedgerDirNames(ledgerDirs); + conf.setEntryLogFilePreAllocationEnabled(false); + LedgerDirsManager ledgerDirsManager = new LedgerDirsManager(conf, conf.getLedgerDirs(), + new DiskChecker(conf.getDiskUsageThreshold(), conf.getDiskUsageWarnThreshold())); + + DefaultEntryLogger el = new DefaultEntryLogger(conf, ledgerDirsManager); + EntryLogManagerBase entryLogManagerBase = (EntryLogManagerBase) el.getEntryLogManager(); + for (int i = 0; i < 10; i++) { + entryLogManagerBase.createNewLog(i); + } + + Assert.assertEquals(9, el.getPreviousAllocatedEntryLogId()); + + //Mock half ledgerDirs lastId is 3. + for (int i = 0; i < ledgerDirsManager.getAllLedgerDirs().size() / 2; i++) { + File dir = ledgerDirsManager.getAllLedgerDirs().get(i); + LOG.info("Picked this directory: {}", dir); + el.getEntryLoggerAllocator().setLastLogId(dir, 3); + } + + el = new DefaultEntryLogger(conf, ledgerDirsManager); + Assert.assertEquals(9, el.getPreviousAllocatedEntryLogId()); + + //Mock all ledgerDirs lastId is 3. + for (int i = 0; i < ledgerDirsManager.getAllLedgerDirs().size(); i++) { + File dir = ledgerDirsManager.getAllLedgerDirs().get(i); + LOG.info("Picked this directory: {}", dir); + el.getEntryLoggerAllocator().setLastLogId(dir, 3); + } + + el = new DefaultEntryLogger(conf, ledgerDirsManager); + Assert.assertEquals(9, el.getPreviousAllocatedEntryLogId()); + } + /* * In this testcase entrylogs for ledgers are tried to create concurrently. */ diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestEntryLogIds.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestEntryLogIds.java index 787a0514be1..092583b08f6 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestEntryLogIds.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestEntryLogIds.java @@ -37,6 +37,7 @@ import org.apache.bookkeeper.bookie.storage.EntryLogger; import org.apache.bookkeeper.slogger.Slogger; import org.apache.bookkeeper.test.TmpDirs; +import org.apache.bookkeeper.util.LedgerDirUtil; import org.apache.commons.lang3.tuple.Pair; import org.junit.After; import org.junit.Test; @@ -259,16 +260,16 @@ public void testCompactedLogsConsidered() throws Exception { @Test public void testGapSelection() throws Exception { - assertEquals(EntryLogIdsImpl.findLargestGap(Lists.newArrayList()), Pair.of(0, Integer.MAX_VALUE)); - assertEquals(EntryLogIdsImpl.findLargestGap(Lists.newArrayList(0)), + assertEquals(LedgerDirUtil.findLargestGap(Lists.newArrayList()), Pair.of(0, Integer.MAX_VALUE)); + assertEquals(LedgerDirUtil.findLargestGap(Lists.newArrayList(0)), Pair.of(1, Integer.MAX_VALUE)); - assertEquals(EntryLogIdsImpl.findLargestGap(Lists.newArrayList(1, 2, 3, 4, 5, 6)), + assertEquals(LedgerDirUtil.findLargestGap(Lists.newArrayList(1, 2, 3, 4, 5, 6)), Pair.of(7, Integer.MAX_VALUE)); - assertEquals(EntryLogIdsImpl.findLargestGap(Lists.newArrayList(Integer.MAX_VALUE)), + assertEquals(LedgerDirUtil.findLargestGap(Lists.newArrayList(Integer.MAX_VALUE)), Pair.of(0, Integer.MAX_VALUE)); - assertEquals(EntryLogIdsImpl.findLargestGap(Lists.newArrayList(Integer.MAX_VALUE / 2)), + assertEquals(LedgerDirUtil.findLargestGap(Lists.newArrayList(Integer.MAX_VALUE / 2)), Pair.of(0, Integer.MAX_VALUE / 2)); - assertEquals(EntryLogIdsImpl.findLargestGap(Lists.newArrayList(Integer.MAX_VALUE / 2 - 1)), + assertEquals(LedgerDirUtil.findLargestGap(Lists.newArrayList(Integer.MAX_VALUE / 2 - 1)), Pair.of(Integer.MAX_VALUE / 2, Integer.MAX_VALUE)); } From ffa15645a04bc091abe59de61b735a8c6dfdcdcd Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Tue, 29 Aug 2023 16:37:44 +0800 Subject: [PATCH 074/233] Remove underreplicaiton callback (#4058) ### Motivation Address https://lists.apache.org/thread/1xl3hr2cpyd5xh9kozbx5xlfsjsg3f4h Deprecate underreplicaiton callback to relieve zookeeper pressure. (cherry picked from commit 84a80f5998363aff10b8f294c2b639aa80f334e2) --- .../meta/LedgerUnderreplicationManager.java | 5 ++-- .../bookkeeper/replication/Auditor.java | 17 ------------- .../bookkeeper/replication/AuditorStats.java | 25 ------------------- .../replication/ReplicationStats.java | 2 -- 4 files changed, 3 insertions(+), 46 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerUnderreplicationManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerUnderreplicationManager.java index 3cd1ceb4b15..256f7814d73 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerUnderreplicationManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerUnderreplicationManager.java @@ -240,8 +240,9 @@ boolean initializeLostBookieRecoveryDelay(int lostBookieRecoveryDelay) * @param cb * @throws ReplicationException.UnavailableException */ - void notifyUnderReplicationLedgerChanged(GenericCallback cb) - throws ReplicationException.UnavailableException; + @Deprecated + default void notifyUnderReplicationLedgerChanged(GenericCallback cb) + throws ReplicationException.UnavailableException {} /** * Receive notification asynchronously when the lostBookieRecoveryDelay value is Changed. diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java index 220d52d8e55..93810280189 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java @@ -21,14 +21,12 @@ package org.apache.bookkeeper.replication; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.util.concurrent.SettableFuture; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.concurrent.Executors; @@ -46,7 +44,6 @@ import org.apache.bookkeeper.meta.LedgerManager; import org.apache.bookkeeper.meta.LedgerManagerFactory; import org.apache.bookkeeper.meta.LedgerUnderreplicationManager; -import org.apache.bookkeeper.meta.UnderreplicatedLedger; import org.apache.bookkeeper.net.BookieId; import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GenericCallback; import org.apache.bookkeeper.replication.ReplicationException.BKAuditException; @@ -183,7 +180,6 @@ public Auditor(final String bookieIdentifier, conf, auditorStats, admin, ledgerManager, ledgerUnderreplicationManager, shutdownTaskHandler, hasAuditCheckTask); allAuditorTasks.add(auditorReplicasCheckTask); - executor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() { @Override public Thread newThread(Runnable r) { @@ -393,8 +389,6 @@ public void start() { knownBookies = getAvailableBookies(); this.ledgerUnderreplicationManager .notifyLostBookieRecoveryDelayChanged(new LostBookieRecoveryDelayChangedCb()); - this.ledgerUnderreplicationManager.notifyUnderReplicationLedgerChanged( - new UnderReplicatedLedgersChangedCb()); } catch (BKException bke) { LOG.error("Couldn't get bookie list, so exiting", bke); submitShutdownTask(); @@ -404,7 +398,6 @@ public void start() { submitShutdownTask(); return; } - scheduleBookieCheckTask(); scheduleCheckAllLedgersTask(); schedulePlacementPolicyCheckTask(); @@ -558,16 +551,6 @@ private void scheduleReplicasCheckTask() { executor.scheduleAtFixedRate(auditorReplicasCheckTask, initialDelay, interval, TimeUnit.SECONDS); } - private class UnderReplicatedLedgersChangedCb implements GenericCallback { - @Override - public void operationComplete(int rc, Void result) { - Iterator underreplicatedLedgersInfo = ledgerUnderreplicationManager - .listLedgersToRereplicate(null); - auditorStats.getUnderReplicatedLedgersGuageValue().set(Iterators.size(underreplicatedLedgersInfo)); - auditorStats.getNumReplicatedLedgers().inc(); - } - } - private class LostBookieRecoveryDelayChangedCb implements GenericCallback { @Override public void operationComplete(int rc, Void result) { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorStats.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorStats.java index 558d3097069..14e82892acb 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorStats.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorStats.java @@ -31,10 +31,8 @@ import static org.apache.bookkeeper.replication.ReplicationStats.NUM_LEDGERS_HAVING_NO_REPLICA_OF_AN_ENTRY; import static org.apache.bookkeeper.replication.ReplicationStats.NUM_LEDGERS_NOT_ADHERING_TO_PLACEMENT_POLICY; import static org.apache.bookkeeper.replication.ReplicationStats.NUM_LEDGERS_SOFTLY_ADHERING_TO_PLACEMENT_POLICY; -import static org.apache.bookkeeper.replication.ReplicationStats.NUM_REPLICATED_LEDGERS; import static org.apache.bookkeeper.replication.ReplicationStats.NUM_UNDERREPLICATED_LEDGERS_ELAPSED_RECOVERY_GRACE_PERIOD; import static org.apache.bookkeeper.replication.ReplicationStats.NUM_UNDER_REPLICATED_LEDGERS; -import static org.apache.bookkeeper.replication.ReplicationStats.NUM_UNDER_REPLICATED_LEDGERS_GUAGE; import static org.apache.bookkeeper.replication.ReplicationStats.PLACEMENT_POLICY_CHECK_TIME; import static org.apache.bookkeeper.replication.ReplicationStats.REPLICAS_CHECK_TIME; import static org.apache.bookkeeper.replication.ReplicationStats.UNDER_REPLICATED_LEDGERS_TOTAL_SIZE; @@ -129,11 +127,6 @@ public class AuditorStats { help = "the number of delayed-bookie-audits cancelled" ) private final Counter numDelayedBookieAuditsCancelled; - @StatsDoc( - name = NUM_REPLICATED_LEDGERS, - help = "the number of replicated ledgers" - ) - private final Counter numReplicatedLedgers; @StatsDoc( name = NUM_LEDGERS_NOT_ADHERING_TO_PLACEMENT_POLICY, help = "Gauge for number of ledgers not adhering to placement policy found in placement policy check" @@ -166,11 +159,6 @@ public class AuditorStats { + ", this doesn't include ledgers counted towards numLedgersHavingLessThanAQReplicasOfAnEntry" ) private final Gauge numLedgersHavingLessThanWQReplicasOfAnEntry; - @StatsDoc( - name = NUM_UNDER_REPLICATED_LEDGERS_GUAGE, - help = "Gauge for num of underreplicated ledgers" - ) - private final Gauge numUnderReplicatedLedgers; public AuditorStats(StatsLogger statsLogger) { this.statsLogger = statsLogger; @@ -197,7 +185,6 @@ public AuditorStats(StatsLogger statsLogger) { numBookieAuditsDelayed = this.statsLogger.getCounter(ReplicationStats.NUM_BOOKIE_AUDITS_DELAYED); numDelayedBookieAuditsCancelled = this.statsLogger .getCounter(ReplicationStats.NUM_DELAYED_BOOKIE_AUDITS_DELAYES_CANCELLED); - numReplicatedLedgers = this.statsLogger.getCounter(NUM_REPLICATED_LEDGERS); numLedgersNotAdheringToPlacementPolicy = new Gauge() { @Override public Integer getDefaultValue() { @@ -278,17 +265,5 @@ public Integer getSample() { }; this.statsLogger.registerGauge(ReplicationStats.NUM_LEDGERS_HAVING_LESS_THAN_WQ_REPLICAS_OF_AN_ENTRY, numLedgersHavingLessThanWQReplicasOfAnEntry); - numUnderReplicatedLedgers = new Gauge() { - @Override - public Integer getDefaultValue() { - return 0; - } - - @Override - public Integer getSample() { - return underReplicatedLedgersGuageValue.get(); - } - }; - this.statsLogger.registerGauge(NUM_UNDER_REPLICATED_LEDGERS_GUAGE, numUnderReplicatedLedgers); } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationStats.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationStats.java index 3580e1688d0..e87c9f1101b 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationStats.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationStats.java @@ -64,7 +64,5 @@ public interface ReplicationStats { String REPLICATE_EXCEPTION = "exceptions"; String NUM_DEFER_LEDGER_LOCK_RELEASE_OF_FAILED_LEDGER = "NUM_DEFER_LEDGER_LOCK_RELEASE_OF_FAILED_LEDGER"; String NUM_ENTRIES_UNABLE_TO_READ_FOR_REPLICATION = "NUM_ENTRIES_UNABLE_TO_READ_FOR_REPLICATION"; - String NUM_UNDER_REPLICATED_LEDGERS_GUAGE = "NUM_UNDER_REPLICATED_LEDGERS_GUAGE"; - String NUM_REPLICATED_LEDGERS = "NUM_REPLICATED_LEDGERS"; String NUM_NOT_ADHERING_PLACEMENT_LEDGERS_REPLICATED = "NUM_NOT_ADHERING_PLACEMENT_LEDGERS_REPLICATED"; } From e7722b0a705a78742e55d4aa57054db0bdac36ff Mon Sep 17 00:00:00 2001 From: zymap Date: Thu, 31 Aug 2023 06:55:51 +0000 Subject: [PATCH 075/233] [maven-release-plugin] prepare release v4.16.3-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +++++- bookkeeper-dist/bkctl/pom.xml | 6 +++++- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +++++- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +++++- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +++++- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +++++- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +++++- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +++++- shaded/distributedlog-core-shaded/pom.xml | 6 +++++- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +++++- .../codahale-metrics-provider/pom.xml | 6 +++++- stats/bookkeeper-stats-providers/pom.xml | 6 +++++- .../prometheus-metrics-provider/pom.xml | 6 +++++- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +++++- stream/api/pom.xml | 6 +++++- stream/bk-grpc-name-resolver/pom.xml | 6 +++++- stream/clients/java/all/pom.xml | 6 +++++- stream/clients/java/base/pom.xml | 6 +++++- stream/clients/java/kv/pom.xml | 6 +++++- stream/clients/java/pom.xml | 6 +++++- stream/clients/pom.xml | 6 +++++- stream/common/pom.xml | 6 +++++- stream/distributedlog/common/pom.xml | 6 +++++- stream/distributedlog/core/pom.xml | 6 +++++- stream/distributedlog/io/dlfs/pom.xml | 6 +++++- stream/distributedlog/io/pom.xml | 6 +++++- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +++++- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +++++- stream/server/pom.xml | 6 +++++- stream/statelib/pom.xml | 6 +++++- stream/storage/api/pom.xml | 6 +++++- stream/storage/impl/pom.xml | 6 +++++- stream/storage/pom.xml | 6 +++++- stream/tests-common/pom.xml | 6 +++++- tests/backward-compat/bc-non-fips/pom.xml | 6 +++++- tests/backward-compat/current-server-old-clients/pom.xml | 6 +++++- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +++++- tests/backward-compat/hostname-bookieid/pom.xml | 6 +++++- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +++++- tests/backward-compat/pom.xml | 6 +++++- tests/backward-compat/recovery-no-password/pom.xml | 6 +++++- tests/backward-compat/upgrade-direct/pom.xml | 6 +++++- tests/backward-compat/upgrade/pom.xml | 6 +++++- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +++++- tests/docker-images/all-released-versions-image/pom.xml | 6 +++++- tests/docker-images/all-versions-image/pom.xml | 6 +++++- tests/docker-images/pom.xml | 6 +++++- tests/integration-tests-base-groovy/pom.xml | 6 +++++- tests/integration-tests-base/pom.xml | 6 +++++- tests/integration-tests-topologies/pom.xml | 6 +++++- tests/integration-tests-utils/pom.xml | 6 +++++- tests/integration/cluster/pom.xml | 6 +++++- tests/integration/pom.xml | 6 +++++- tests/integration/smoke/pom.xml | 6 +++++- tests/integration/standalone/pom.xml | 6 +++++- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +++++- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +++++- tests/shaded/pom.xml | 6 +++++- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +++++- tools/framework/pom.xml | 6 +++++- tools/ledger/pom.xml | 6 +++++- tools/perf/pom.xml | 6 +++++- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +++++- 90 files changed, 353 insertions(+), 93 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 420dd71bf78..43ea7dff634 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index dedcaa751d3..c9ad0eef670 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index af8aa26af2f..5cd871f3f29 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index a2cefdca5f1..c732d04cf7d 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -154,4 +154,8 @@ + + + v4.16.3-rc0 + diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 4b98b04b8e4..a8bed70aab0 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -79,4 +79,8 @@ + + + v4.16.3-rc0 + diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index e0c3bfb6f54..7c45e7dc056 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index b7e76206f0c..ff66576be3d 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -129,4 +129,8 @@ + + + v4.16.3-rc0 + diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index dd6bc258de9..6820a86401d 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 451687c9efa..c4544e0d9c3 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 7ef79ff7f7e..07e4b03a8b4 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index cc7ddad5826..d01ef2a0bcc 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 1e8ee8cdd54..f1153a9b925 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index ef4989b01d7..7b0251bfaab 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 663da53b870..72092eec65e 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,10 +18,14 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API + + + v4.16.3-rc0 + diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 5cf82c0a70f..22dad55f1f2 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index e20dbd714c2..4aaac36cafc 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -31,4 +31,8 @@ ${project.parent.version} + + + v4.16.3-rc0 + diff --git a/buildtools/pom.xml b/buildtools/pom.xml index fa2ea05244a..f7f61dd4caa 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 buildtools Apache BookKeeper :: Build Tools - 4.16.3-SNAPSHOT + 4.16.3 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 02a98f7f378..3f4a8fd44aa 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 8ae78bfc79f..0be3c38dcff 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index e3d6063afad..9372122242e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.3-SNAPSHOT + 4.16.3 .. 4.0.0 @@ -158,4 +158,8 @@ + + + v4.16.3-rc0 + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 830e2d3e97b..2d5a3640476 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 588db1e400a..828fda6884a 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index ffb0450f847..6beec8582e4 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. diff --git a/pom.xml b/pom.xml index aa2603bbba5..2ca770bd66e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.13 + v4.16.3-rc0 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index e5c553255dc..58f07daabf3 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3-SNAPSHOT + 4.16.3 .. bookkeeper-server-shaded @@ -126,4 +126,8 @@ + + + v4.16.3-rc0 + diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index ac44b7d10a2..30dca9a1535 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3-SNAPSHOT + 4.16.3 .. bookkeeper-server-tests-shaded @@ -144,4 +144,8 @@ + + + v4.16.3-rc0 + diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 9a0d92ff458..3d7afdb6bf2 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.distributedlog @@ -238,4 +238,8 @@ + + + v4.16.3-rc0 + diff --git a/shaded/pom.xml b/shaded/pom.xml index 99d14d26dfc..84d02e665cb 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 6a06b79d3d7..70364dd7551 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,4 +59,8 @@ + + + v4.16.3-rc0 + diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index e96ac8688bc..a036f2fbe1c 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,4 +53,8 @@ guava + + + v4.16.3-rc0 + diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index ae996ad6b15..b539d5471ac 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 bookkeeper-stats-providers @@ -29,4 +29,8 @@ codahale-metrics-provider prometheus-metrics-provider + + + v4.16.3-rc0 + diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index b7a75fd38a4..453f199e445 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,4 +72,8 @@ + + + v4.16.3-rc0 + diff --git a/stats/pom.xml b/stats/pom.xml index 3bfa47a8518..3ebdad57f34 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 24d79b6201f..44bf8f787b1 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,4 +50,8 @@ jackson-annotations + + + v4.16.3-rc0 + diff --git a/stream/api/pom.xml b/stream/api/pom.xml index a60f866cbfb..6a2ddb59cb3 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -46,4 +46,8 @@ freebuilder + + + v4.16.3-rc0 + diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index c697939f8bb..dfe058f335a 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -77,4 +77,8 @@ test + + + v4.16.3-rc0 + diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 0ffc48fc597..ce78f4fbe26 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3-SNAPSHOT + 4.16.3 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,4 +112,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 13fb1181498..73f508b03cc 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3-SNAPSHOT + 4.16.3 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,4 +59,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index e2ea0e3386c..b0758dbfcfc 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3-SNAPSHOT + 4.16.3 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,4 +47,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 378a8d7595c..bf93c2dcc96 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.3-SNAPSHOT + 4.16.3 .. stream-storage-java-client-parent @@ -31,4 +31,8 @@ kv all + + + v4.16.3-rc0 + diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index bf672922e7c..46fe499a7b9 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.3 .. stream-storage-clients-parent @@ -47,4 +47,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 12b48656a36..c89440b8f2e 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -82,4 +82,8 @@ test + + + v4.16.3-rc0 + diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index b34ba4c62b4..71e6683250c 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.3 distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,4 +106,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 8f4aed6ea76..f226adfdef0 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.3 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,4 +138,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index e4d50fa09f9..a8ece2185a3 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.3-SNAPSHOT + 4.16.3 ../.. org.apache.distributedlog @@ -100,4 +100,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index e6fe3801f4a..ac0a6cb3132 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 distributedlog-io @@ -28,4 +28,8 @@ dlfs + + + v4.16.3-rc0 + diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 86cc7faa984..e06f261037b 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index bbe645bc20e..3fc62d8dcfd 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.3 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,4 +61,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/pom.xml b/stream/pom.xml index 30cfa3c831d..a907e278ce8 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index b4aa71d36f1..0326d4620c0 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -118,4 +118,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/server/pom.xml b/stream/server/pom.xml index ed168f5f850..a5abc8c05d9 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.3 stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,4 +82,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index a17c29cd0b1..350d522ff7f 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -130,4 +130,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index c045d252c16..54251269fa8 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.3-SNAPSHOT + 4.16.3 .. stream-storage-service-api @@ -55,4 +55,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 3cc8a15066c..d31a20b3d3a 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.3-SNAPSHOT + 4.16.3 .. stream-storage-service-impl @@ -121,4 +121,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index adcd2d91a7d..7a833c81cbf 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.3 .. stream-storage-service-parent @@ -30,4 +30,8 @@ api impl + + + v4.16.3-rc0 + diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index bb9ec0f169e..058f19db773 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper.tests @@ -123,4 +123,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 7fab2cb3252..d852abfa55b 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -76,4 +76,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index e7160dbce40..bab35e55b55 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 81fdee4b36d..5291234854c 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 43d89a558f9..d67bf57d5c2 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 2442531108b..34322a3160b 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 4372c8ebce3..0e8bcb4ba6b 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.3-SNAPSHOT + 4.16.3 ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,4 +49,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index dee7e3bf45d..342030f1380 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -36,4 +36,8 @@ ${project.version} + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 0e93631e0ce..ee2d2cbe54b 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index f560b5ccda2..6832f932c30 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 0adf3078b4e..c59bef828b6 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current + + + v4.16.3-rc0 + diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index efb4ab47c6f..8660a88b685 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 org.apache.bookkeeper.tests @@ -68,4 +68,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 48cdacd22dc..4613aecd379 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 org.apache.bookkeeper.tests @@ -108,4 +108,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 72feeda0f7d..a4dde412cca 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests docker-images @@ -30,4 +30,8 @@ all-released-versions-image all-versions-image + + + v4.16.3-rc0 + diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index e6abf2b58f0..8209929cd98 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.3-SNAPSHOT + 4.16.3 ../integration-tests-base @@ -109,4 +109,8 @@ test + + + v4.16.3-rc0 + diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index bed5f9cf522..e1320f700f8 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 9d21fe7596a..a13e0175fb2 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests @@ -45,4 +45,8 @@ ${project.version} + + + v4.16.3-rc0 + diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 985027ef0cf..943b763c115 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index a3efb470baf..82ba7857c55 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -83,4 +83,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index df06044317b..09318072aa0 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests integration @@ -70,4 +70,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index db36ff1d284..9b6c752ee12 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -72,4 +72,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 9b71a441aed..44ad8d460b3 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -68,4 +68,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/pom.xml b/tests/pom.xml index 4b5d2d2492e..f75c12b1f6f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index d06fbeef62c..c2bc73195d7 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests @@ -73,4 +73,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 53dd9a6a0df..2fc5f22bb8d 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3-SNAPSHOT + 4.16.3 .. bookkeeper-server-shaded-test @@ -59,4 +59,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index a961b65a4f8..3e96fd4dc4e 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3-SNAPSHOT + 4.16.3 .. bookkeeper-server-tests-shaded-test @@ -75,4 +75,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index ab74a4633bd..8d6e8cb8916 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3-SNAPSHOT + 4.16.3 .. distributedlog-core-shaded-test @@ -84,4 +84,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 671d40ac608..8fb06547ece 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper.tests.shaded @@ -32,4 +32,8 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test + + + v4.16.3-rc0 + diff --git a/testtools/pom.xml b/testtools/pom.xml index 85b223eb0cf..0307c634300 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 testtools Apache BookKeeper :: Test Tools - 4.16.3-SNAPSHOT + 4.16.3 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 1f406c32658..b09dd84ed27 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-tools Apache BookKeeper :: Tools @@ -79,4 +79,8 @@ + + + v4.16.3-rc0 + diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index d836d111ebc..6680bd21dc0 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,4 +41,8 @@ test + + + v4.16.3-rc0 + diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 420047d0480..471a08b2539 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,4 +71,8 @@ test + + + v4.16.3-rc0 + diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 795ba4c0bae..aafb1ef5f89 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,4 +48,8 @@ HdrHistogram + + + v4.16.3-rc0 + diff --git a/tools/pom.xml b/tools/pom.xml index 0af628c8232..c5fa625bd0f 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 940485efeac..307ed166ace 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.3-SNAPSHOT + 4.16.3 stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,4 +48,8 @@ ${project.version} + + + v4.16.3-rc0 + From 143bcbb028e8edc682f6256f409d49204012a8cc Mon Sep 17 00:00:00 2001 From: zymap Date: Thu, 31 Aug 2023 06:56:03 +0000 Subject: [PATCH 076/233] [maven-release-plugin] rollback changes from release preparation of v4.16.3-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +----- bookkeeper-dist/bkctl/pom.xml | 6 +----- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +----- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +----- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +----- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +----- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +----- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +----- shaded/distributedlog-core-shaded/pom.xml | 6 +----- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +----- .../codahale-metrics-provider/pom.xml | 6 +----- stats/bookkeeper-stats-providers/pom.xml | 6 +----- .../prometheus-metrics-provider/pom.xml | 6 +----- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +----- stream/api/pom.xml | 6 +----- stream/bk-grpc-name-resolver/pom.xml | 6 +----- stream/clients/java/all/pom.xml | 6 +----- stream/clients/java/base/pom.xml | 6 +----- stream/clients/java/kv/pom.xml | 6 +----- stream/clients/java/pom.xml | 6 +----- stream/clients/pom.xml | 6 +----- stream/common/pom.xml | 6 +----- stream/distributedlog/common/pom.xml | 6 +----- stream/distributedlog/core/pom.xml | 6 +----- stream/distributedlog/io/dlfs/pom.xml | 6 +----- stream/distributedlog/io/pom.xml | 6 +----- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +----- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +----- stream/server/pom.xml | 6 +----- stream/statelib/pom.xml | 6 +----- stream/storage/api/pom.xml | 6 +----- stream/storage/impl/pom.xml | 6 +----- stream/storage/pom.xml | 6 +----- stream/tests-common/pom.xml | 6 +----- tests/backward-compat/bc-non-fips/pom.xml | 6 +----- tests/backward-compat/current-server-old-clients/pom.xml | 6 +----- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +----- tests/backward-compat/hostname-bookieid/pom.xml | 6 +----- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +----- tests/backward-compat/pom.xml | 6 +----- tests/backward-compat/recovery-no-password/pom.xml | 6 +----- tests/backward-compat/upgrade-direct/pom.xml | 6 +----- tests/backward-compat/upgrade/pom.xml | 6 +----- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +----- tests/docker-images/all-released-versions-image/pom.xml | 6 +----- tests/docker-images/all-versions-image/pom.xml | 6 +----- tests/docker-images/pom.xml | 6 +----- tests/integration-tests-base-groovy/pom.xml | 6 +----- tests/integration-tests-base/pom.xml | 6 +----- tests/integration-tests-topologies/pom.xml | 6 +----- tests/integration-tests-utils/pom.xml | 6 +----- tests/integration/cluster/pom.xml | 6 +----- tests/integration/pom.xml | 6 +----- tests/integration/smoke/pom.xml | 6 +----- tests/integration/standalone/pom.xml | 6 +----- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +----- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +----- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +----- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +----- tests/shaded/pom.xml | 6 +----- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +----- tools/framework/pom.xml | 6 +----- tools/ledger/pom.xml | 6 +----- tools/perf/pom.xml | 6 +----- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +----- 90 files changed, 93 insertions(+), 353 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 43ea7dff634..420dd71bf78 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index c9ad0eef670..dedcaa751d3 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 5cd871f3f29..af8aa26af2f 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index c732d04cf7d..a2cefdca5f1 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -154,8 +154,4 @@ - - - v4.16.3-rc0 - diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index a8bed70aab0..4b98b04b8e4 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -79,8 +79,4 @@ - - - v4.16.3-rc0 - diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 7c45e7dc056..e0c3bfb6f54 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index ff66576be3d..b7e76206f0c 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -129,8 +129,4 @@ - - - v4.16.3-rc0 - diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 6820a86401d..dd6bc258de9 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index c4544e0d9c3..451687c9efa 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 07e4b03a8b4..7ef79ff7f7e 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index d01ef2a0bcc..cc7ddad5826 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index f1153a9b925..1e8ee8cdd54 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 7b0251bfaab..ef4989b01d7 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 72092eec65e..663da53b870 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,14 +18,10 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API - - - v4.16.3-rc0 - diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 22dad55f1f2..5cf82c0a70f 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 4aaac36cafc..e20dbd714c2 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -31,8 +31,4 @@ ${project.parent.version} - - - v4.16.3-rc0 - diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f7f61dd4caa..fa2ea05244a 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.3 + 4.16.3-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 3f4a8fd44aa..02a98f7f378 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 0be3c38dcff..8ae78bfc79f 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 9372122242e..e3d6063afad 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.3 + 4.16.3-SNAPSHOT .. 4.0.0 @@ -158,8 +158,4 @@ - - - v4.16.3-rc0 - diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 2d5a3640476..830e2d3e97b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 828fda6884a..588db1e400a 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 6beec8582e4..ffb0450f847 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 2ca770bd66e..aa2603bbba5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.3-rc0 + branch-4.13 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 58f07daabf3..e5c553255dc 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3 + 4.16.3-SNAPSHOT .. bookkeeper-server-shaded @@ -126,8 +126,4 @@ - - - v4.16.3-rc0 - diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 30dca9a1535..ac44b7d10a2 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3 + 4.16.3-SNAPSHOT .. bookkeeper-server-tests-shaded @@ -144,8 +144,4 @@ - - - v4.16.3-rc0 - diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 3d7afdb6bf2..9a0d92ff458 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.distributedlog @@ -238,8 +238,4 @@ - - - v4.16.3-rc0 - diff --git a/shaded/pom.xml b/shaded/pom.xml index 84d02e665cb..99d14d26dfc 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 70364dd7551..6a06b79d3d7 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,8 +59,4 @@ - - - v4.16.3-rc0 - diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index a036f2fbe1c..e96ac8688bc 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,8 +53,4 @@ guava - - - v4.16.3-rc0 - diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index b539d5471ac..ae996ad6b15 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 bookkeeper-stats-providers @@ -29,8 +29,4 @@ codahale-metrics-provider prometheus-metrics-provider - - - v4.16.3-rc0 - diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 453f199e445..b7a75fd38a4 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,8 +72,4 @@ - - - v4.16.3-rc0 - diff --git a/stats/pom.xml b/stats/pom.xml index 3ebdad57f34..3bfa47a8518 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 44bf8f787b1..24d79b6201f 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,8 +50,4 @@ jackson-annotations - - - v4.16.3-rc0 - diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 6a2ddb59cb3..a60f866cbfb 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -46,8 +46,4 @@ freebuilder - - - v4.16.3-rc0 - diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index dfe058f335a..c697939f8bb 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -77,8 +77,4 @@ test - - - v4.16.3-rc0 - diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index ce78f4fbe26..0ffc48fc597 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3 + 4.16.3-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,8 +112,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 73f508b03cc..13fb1181498 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3 + 4.16.3-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,8 +59,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index b0758dbfcfc..e2ea0e3386c 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3 + 4.16.3-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,8 +47,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index bf93c2dcc96..378a8d7595c 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.3 + 4.16.3-SNAPSHOT .. stream-storage-java-client-parent @@ -31,8 +31,4 @@ kv all - - - v4.16.3-rc0 - diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 46fe499a7b9..bf672922e7c 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3 + 4.16.3-SNAPSHOT .. stream-storage-clients-parent @@ -47,8 +47,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/common/pom.xml b/stream/common/pom.xml index c89440b8f2e..12b48656a36 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -82,8 +82,4 @@ test - - - v4.16.3-rc0 - diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 71e6683250c..b34ba4c62b4 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3 + 4.16.3-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,8 +106,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index f226adfdef0..8f4aed6ea76 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3 + 4.16.3-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,8 +138,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index a8ece2185a3..e4d50fa09f9 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.3 + 4.16.3-SNAPSHOT ../.. org.apache.distributedlog @@ -100,8 +100,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index ac0a6cb3132..e6fe3801f4a 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 distributedlog-io @@ -28,8 +28,4 @@ dlfs - - - v4.16.3-rc0 - diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index e06f261037b..86cc7faa984 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 3fc62d8dcfd..bbe645bc20e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3 + 4.16.3-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,8 +61,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/pom.xml b/stream/pom.xml index a907e278ce8..30cfa3c831d 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 0326d4620c0..b4aa71d36f1 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -118,8 +118,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/server/pom.xml b/stream/server/pom.xml index a5abc8c05d9..ed168f5f850 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3 + 4.16.3-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,8 +82,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 350d522ff7f..a17c29cd0b1 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -130,8 +130,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 54251269fa8..c045d252c16 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.3 + 4.16.3-SNAPSHOT .. stream-storage-service-api @@ -55,8 +55,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index d31a20b3d3a..3cc8a15066c 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.3 + 4.16.3-SNAPSHOT .. stream-storage-service-impl @@ -121,8 +121,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 7a833c81cbf..adcd2d91a7d 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3 + 4.16.3-SNAPSHOT .. stream-storage-service-parent @@ -30,8 +30,4 @@ api impl - - - v4.16.3-rc0 - diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 058f19db773..bb9ec0f169e 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper.tests @@ -123,8 +123,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index d852abfa55b..7fab2cb3252 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -76,8 +76,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index bab35e55b55..e7160dbce40 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 5291234854c..81fdee4b36d 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index d67bf57d5c2..43d89a558f9 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 34322a3160b..2442531108b 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 0e8bcb4ba6b..4372c8ebce3 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.3 + 4.16.3-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,8 +49,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 342030f1380..dee7e3bf45d 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -36,8 +36,4 @@ ${project.version} - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index ee2d2cbe54b..0e93631e0ce 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 6832f932c30..f560b5ccda2 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index c59bef828b6..0adf3078b4e 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current - - - v4.16.3-rc0 - diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 8660a88b685..efb4ab47c6f 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -68,8 +68,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 4613aecd379..48cdacd22dc 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -108,8 +108,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index a4dde412cca..72feeda0f7d 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests docker-images @@ -30,8 +30,4 @@ all-released-versions-image all-versions-image - - - v4.16.3-rc0 - diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 8209929cd98..e6abf2b58f0 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.3 + 4.16.3-SNAPSHOT ../integration-tests-base @@ -109,8 +109,4 @@ test - - - v4.16.3-rc0 - diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index e1320f700f8..bed5f9cf522 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index a13e0175fb2..9d21fe7596a 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests @@ -45,8 +45,4 @@ ${project.version} - - - v4.16.3-rc0 - diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 943b763c115..985027ef0cf 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 82ba7857c55..a3efb470baf 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -83,8 +83,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 09318072aa0..df06044317b 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests integration @@ -70,8 +70,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 9b6c752ee12..db36ff1d284 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -72,8 +72,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 44ad8d460b3..9b71a441aed 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -68,8 +68,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/pom.xml b/tests/pom.xml index f75c12b1f6f..4b5d2d2492e 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index c2bc73195d7..d06fbeef62c 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests @@ -73,8 +73,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 2fc5f22bb8d..53dd9a6a0df 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3 + 4.16.3-SNAPSHOT .. bookkeeper-server-shaded-test @@ -59,8 +59,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 3e96fd4dc4e..a961b65a4f8 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3 + 4.16.3-SNAPSHOT .. bookkeeper-server-tests-shaded-test @@ -75,8 +75,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 8d6e8cb8916..ab74a4633bd 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3 + 4.16.3-SNAPSHOT .. distributedlog-core-shaded-test @@ -84,8 +84,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 8fb06547ece..671d40ac608 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper.tests.shaded @@ -32,8 +32,4 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test - - - v4.16.3-rc0 - diff --git a/testtools/pom.xml b/testtools/pom.xml index 0307c634300..85b223eb0cf 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.3 + 4.16.3-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index b09dd84ed27..1f406c32658 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools @@ -79,8 +79,4 @@ - - - v4.16.3-rc0 - diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 6680bd21dc0..d836d111ebc 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,8 +41,4 @@ test - - - v4.16.3-rc0 - diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 471a08b2539..420047d0480 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,8 +71,4 @@ test - - - v4.16.3-rc0 - diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index aafb1ef5f89..795ba4c0bae 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,8 +48,4 @@ HdrHistogram - - - v4.16.3-rc0 - diff --git a/tools/pom.xml b/tools/pom.xml index c5fa625bd0f..0af628c8232 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 307ed166ace..940485efeac 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.3 + 4.16.3-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,8 +48,4 @@ ${project.version} - - - v4.16.3-rc0 - From 5ca147b4a85a1044967002b3f389d17e468a264d Mon Sep 17 00:00:00 2001 From: zymap Date: Thu, 31 Aug 2023 07:33:48 +0000 Subject: [PATCH 077/233] [maven-release-plugin] prepare release v4.16.3-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +++++- bookkeeper-dist/bkctl/pom.xml | 6 +++++- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +++++- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +++++- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +++++- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +++++- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +++++- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +++++- shaded/distributedlog-core-shaded/pom.xml | 6 +++++- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +++++- .../codahale-metrics-provider/pom.xml | 6 +++++- stats/bookkeeper-stats-providers/pom.xml | 6 +++++- .../prometheus-metrics-provider/pom.xml | 6 +++++- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +++++- stream/api/pom.xml | 6 +++++- stream/bk-grpc-name-resolver/pom.xml | 6 +++++- stream/clients/java/all/pom.xml | 6 +++++- stream/clients/java/base/pom.xml | 6 +++++- stream/clients/java/kv/pom.xml | 6 +++++- stream/clients/java/pom.xml | 6 +++++- stream/clients/pom.xml | 6 +++++- stream/common/pom.xml | 6 +++++- stream/distributedlog/common/pom.xml | 6 +++++- stream/distributedlog/core/pom.xml | 6 +++++- stream/distributedlog/io/dlfs/pom.xml | 6 +++++- stream/distributedlog/io/pom.xml | 6 +++++- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +++++- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +++++- stream/server/pom.xml | 6 +++++- stream/statelib/pom.xml | 6 +++++- stream/storage/api/pom.xml | 6 +++++- stream/storage/impl/pom.xml | 6 +++++- stream/storage/pom.xml | 6 +++++- stream/tests-common/pom.xml | 6 +++++- tests/backward-compat/bc-non-fips/pom.xml | 6 +++++- tests/backward-compat/current-server-old-clients/pom.xml | 6 +++++- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +++++- tests/backward-compat/hostname-bookieid/pom.xml | 6 +++++- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +++++- tests/backward-compat/pom.xml | 6 +++++- tests/backward-compat/recovery-no-password/pom.xml | 6 +++++- tests/backward-compat/upgrade-direct/pom.xml | 6 +++++- tests/backward-compat/upgrade/pom.xml | 6 +++++- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +++++- tests/docker-images/all-released-versions-image/pom.xml | 6 +++++- tests/docker-images/all-versions-image/pom.xml | 6 +++++- tests/docker-images/pom.xml | 6 +++++- tests/integration-tests-base-groovy/pom.xml | 6 +++++- tests/integration-tests-base/pom.xml | 6 +++++- tests/integration-tests-topologies/pom.xml | 6 +++++- tests/integration-tests-utils/pom.xml | 6 +++++- tests/integration/cluster/pom.xml | 6 +++++- tests/integration/pom.xml | 6 +++++- tests/integration/smoke/pom.xml | 6 +++++- tests/integration/standalone/pom.xml | 6 +++++- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +++++- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +++++- tests/shaded/pom.xml | 6 +++++- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +++++- tools/framework/pom.xml | 6 +++++- tools/ledger/pom.xml | 6 +++++- tools/perf/pom.xml | 6 +++++- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +++++- 90 files changed, 353 insertions(+), 93 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 420dd71bf78..43ea7dff634 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index dedcaa751d3..c9ad0eef670 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index af8aa26af2f..5cd871f3f29 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index a2cefdca5f1..c732d04cf7d 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -154,4 +154,8 @@ + + + v4.16.3-rc0 + diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 4b98b04b8e4..a8bed70aab0 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -79,4 +79,8 @@ + + + v4.16.3-rc0 + diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index e0c3bfb6f54..7c45e7dc056 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index b7e76206f0c..ff66576be3d 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -129,4 +129,8 @@ + + + v4.16.3-rc0 + diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index dd6bc258de9..6820a86401d 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 451687c9efa..c4544e0d9c3 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 7ef79ff7f7e..07e4b03a8b4 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index cc7ddad5826..d01ef2a0bcc 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 1e8ee8cdd54..f1153a9b925 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index ef4989b01d7..7b0251bfaab 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 663da53b870..72092eec65e 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,10 +18,14 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API + + + v4.16.3-rc0 + diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 5cf82c0a70f..22dad55f1f2 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index e20dbd714c2..4aaac36cafc 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -31,4 +31,8 @@ ${project.parent.version} + + + v4.16.3-rc0 + diff --git a/buildtools/pom.xml b/buildtools/pom.xml index fa2ea05244a..f7f61dd4caa 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 buildtools Apache BookKeeper :: Build Tools - 4.16.3-SNAPSHOT + 4.16.3 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 02a98f7f378..3f4a8fd44aa 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 8ae78bfc79f..0be3c38dcff 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index e3d6063afad..9372122242e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.3-SNAPSHOT + 4.16.3 .. 4.0.0 @@ -158,4 +158,8 @@ + + + v4.16.3-rc0 + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 830e2d3e97b..2d5a3640476 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 588db1e400a..828fda6884a 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index ffb0450f847..6beec8582e4 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. diff --git a/pom.xml b/pom.xml index aa2603bbba5..2ca770bd66e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.13 + v4.16.3-rc0 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index e5c553255dc..58f07daabf3 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3-SNAPSHOT + 4.16.3 .. bookkeeper-server-shaded @@ -126,4 +126,8 @@ + + + v4.16.3-rc0 + diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index ac44b7d10a2..30dca9a1535 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3-SNAPSHOT + 4.16.3 .. bookkeeper-server-tests-shaded @@ -144,4 +144,8 @@ + + + v4.16.3-rc0 + diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 9a0d92ff458..3d7afdb6bf2 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.distributedlog @@ -238,4 +238,8 @@ + + + v4.16.3-rc0 + diff --git a/shaded/pom.xml b/shaded/pom.xml index 99d14d26dfc..84d02e665cb 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 6a06b79d3d7..70364dd7551 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,4 +59,8 @@ + + + v4.16.3-rc0 + diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index e96ac8688bc..a036f2fbe1c 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,4 +53,8 @@ guava + + + v4.16.3-rc0 + diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index ae996ad6b15..b539d5471ac 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 bookkeeper-stats-providers @@ -29,4 +29,8 @@ codahale-metrics-provider prometheus-metrics-provider + + + v4.16.3-rc0 + diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index b7a75fd38a4..453f199e445 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,4 +72,8 @@ + + + v4.16.3-rc0 + diff --git a/stats/pom.xml b/stats/pom.xml index 3bfa47a8518..3ebdad57f34 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 24d79b6201f..44bf8f787b1 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,4 +50,8 @@ jackson-annotations + + + v4.16.3-rc0 + diff --git a/stream/api/pom.xml b/stream/api/pom.xml index a60f866cbfb..6a2ddb59cb3 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -46,4 +46,8 @@ freebuilder + + + v4.16.3-rc0 + diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index c697939f8bb..dfe058f335a 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -77,4 +77,8 @@ test + + + v4.16.3-rc0 + diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 0ffc48fc597..ce78f4fbe26 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3-SNAPSHOT + 4.16.3 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,4 +112,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 13fb1181498..73f508b03cc 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3-SNAPSHOT + 4.16.3 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,4 +59,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index e2ea0e3386c..b0758dbfcfc 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3-SNAPSHOT + 4.16.3 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,4 +47,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 378a8d7595c..bf93c2dcc96 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.3-SNAPSHOT + 4.16.3 .. stream-storage-java-client-parent @@ -31,4 +31,8 @@ kv all + + + v4.16.3-rc0 + diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index bf672922e7c..46fe499a7b9 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.3 .. stream-storage-clients-parent @@ -47,4 +47,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 12b48656a36..c89440b8f2e 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -82,4 +82,8 @@ test + + + v4.16.3-rc0 + diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index b34ba4c62b4..71e6683250c 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.3 distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,4 +106,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 8f4aed6ea76..f226adfdef0 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.3 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,4 +138,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index e4d50fa09f9..a8ece2185a3 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.3-SNAPSHOT + 4.16.3 ../.. org.apache.distributedlog @@ -100,4 +100,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index e6fe3801f4a..ac0a6cb3132 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 distributedlog-io @@ -28,4 +28,8 @@ dlfs + + + v4.16.3-rc0 + diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 86cc7faa984..e06f261037b 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index bbe645bc20e..3fc62d8dcfd 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.3 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,4 +61,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/pom.xml b/stream/pom.xml index 30cfa3c831d..a907e278ce8 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index b4aa71d36f1..0326d4620c0 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -118,4 +118,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/server/pom.xml b/stream/server/pom.xml index ed168f5f850..a5abc8c05d9 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.3 stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,4 +82,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index a17c29cd0b1..350d522ff7f 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper @@ -130,4 +130,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index c045d252c16..54251269fa8 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.3-SNAPSHOT + 4.16.3 .. stream-storage-service-api @@ -55,4 +55,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 3cc8a15066c..d31a20b3d3a 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.3-SNAPSHOT + 4.16.3 .. stream-storage-service-impl @@ -121,4 +121,8 @@ + + + v4.16.3-rc0 + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index adcd2d91a7d..7a833c81cbf 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.3 .. stream-storage-service-parent @@ -30,4 +30,8 @@ api impl + + + v4.16.3-rc0 + diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index bb9ec0f169e..058f19db773 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper.tests @@ -123,4 +123,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 7fab2cb3252..d852abfa55b 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -76,4 +76,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index e7160dbce40..bab35e55b55 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 81fdee4b36d..5291234854c 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 43d89a558f9..d67bf57d5c2 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 2442531108b..34322a3160b 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 4372c8ebce3..0e8bcb4ba6b 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.3-SNAPSHOT + 4.16.3 ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,4 +49,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index dee7e3bf45d..342030f1380 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -36,4 +36,8 @@ ${project.version} + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 0e93631e0ce..ee2d2cbe54b 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index f560b5ccda2..6832f932c30 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version + + + v4.16.3-rc0 + diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 0adf3078b4e..c59bef828b6 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -28,4 +28,8 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current + + + v4.16.3-rc0 + diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index efb4ab47c6f..8660a88b685 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 org.apache.bookkeeper.tests @@ -68,4 +68,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 48cdacd22dc..4613aecd379 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.3-SNAPSHOT + 4.16.3 4.0.0 org.apache.bookkeeper.tests @@ -108,4 +108,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 72feeda0f7d..a4dde412cca 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests docker-images @@ -30,4 +30,8 @@ all-released-versions-image all-versions-image + + + v4.16.3-rc0 + diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index e6abf2b58f0..8209929cd98 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.3-SNAPSHOT + 4.16.3 ../integration-tests-base @@ -109,4 +109,8 @@ test + + + v4.16.3-rc0 + diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index bed5f9cf522..e1320f700f8 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 9d21fe7596a..a13e0175fb2 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests @@ -45,4 +45,8 @@ ${project.version} + + + v4.16.3-rc0 + diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 985027ef0cf..943b763c115 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index a3efb470baf..82ba7857c55 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -83,4 +83,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index df06044317b..09318072aa0 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests integration @@ -70,4 +70,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index db36ff1d284..9b6c752ee12 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -72,4 +72,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 9b71a441aed..44ad8d460b3 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.3-SNAPSHOT + 4.16.3 .. @@ -68,4 +68,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/pom.xml b/tests/pom.xml index 4b5d2d2492e..f75c12b1f6f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index d06fbeef62c..c2bc73195d7 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 org.apache.bookkeeper.tests @@ -73,4 +73,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 53dd9a6a0df..2fc5f22bb8d 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3-SNAPSHOT + 4.16.3 .. bookkeeper-server-shaded-test @@ -59,4 +59,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index a961b65a4f8..3e96fd4dc4e 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3-SNAPSHOT + 4.16.3 .. bookkeeper-server-tests-shaded-test @@ -75,4 +75,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index ab74a4633bd..8d6e8cb8916 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3-SNAPSHOT + 4.16.3 .. distributedlog-core-shaded-test @@ -84,4 +84,8 @@ + + + v4.16.3-rc0 + diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 671d40ac608..8fb06547ece 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.3 .. org.apache.bookkeeper.tests.shaded @@ -32,4 +32,8 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test + + + v4.16.3-rc0 + diff --git a/testtools/pom.xml b/testtools/pom.xml index 85b223eb0cf..0307c634300 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 testtools Apache BookKeeper :: Test Tools - 4.16.3-SNAPSHOT + 4.16.3 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 1f406c32658..b09dd84ed27 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-tools Apache BookKeeper :: Tools @@ -79,4 +79,8 @@ + + + v4.16.3-rc0 + diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index d836d111ebc..6680bd21dc0 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,4 +41,8 @@ test + + + v4.16.3-rc0 + diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 420047d0480..471a08b2539 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,4 +71,8 @@ test + + + v4.16.3-rc0 + diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 795ba4c0bae..aafb1ef5f89 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,4 +48,8 @@ HdrHistogram + + + v4.16.3-rc0 + diff --git a/tools/pom.xml b/tools/pom.xml index 0af628c8232..c5fa625bd0f 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.3 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 940485efeac..307ed166ace 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.3-SNAPSHOT + 4.16.3 stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,4 +48,8 @@ ${project.version} + + + v4.16.3-rc0 + From 520b06522209bd5629f645cf11ac662ca3553fc4 Mon Sep 17 00:00:00 2001 From: zymap Date: Thu, 31 Aug 2023 07:33:58 +0000 Subject: [PATCH 078/233] [maven-release-plugin] rollback changes from release preparation of v4.16.3-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +----- bookkeeper-dist/bkctl/pom.xml | 6 +----- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +----- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +----- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +----- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +----- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +----- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +----- shaded/distributedlog-core-shaded/pom.xml | 6 +----- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +----- .../codahale-metrics-provider/pom.xml | 6 +----- stats/bookkeeper-stats-providers/pom.xml | 6 +----- .../prometheus-metrics-provider/pom.xml | 6 +----- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +----- stream/api/pom.xml | 6 +----- stream/bk-grpc-name-resolver/pom.xml | 6 +----- stream/clients/java/all/pom.xml | 6 +----- stream/clients/java/base/pom.xml | 6 +----- stream/clients/java/kv/pom.xml | 6 +----- stream/clients/java/pom.xml | 6 +----- stream/clients/pom.xml | 6 +----- stream/common/pom.xml | 6 +----- stream/distributedlog/common/pom.xml | 6 +----- stream/distributedlog/core/pom.xml | 6 +----- stream/distributedlog/io/dlfs/pom.xml | 6 +----- stream/distributedlog/io/pom.xml | 6 +----- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +----- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +----- stream/server/pom.xml | 6 +----- stream/statelib/pom.xml | 6 +----- stream/storage/api/pom.xml | 6 +----- stream/storage/impl/pom.xml | 6 +----- stream/storage/pom.xml | 6 +----- stream/tests-common/pom.xml | 6 +----- tests/backward-compat/bc-non-fips/pom.xml | 6 +----- tests/backward-compat/current-server-old-clients/pom.xml | 6 +----- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +----- tests/backward-compat/hostname-bookieid/pom.xml | 6 +----- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +----- tests/backward-compat/pom.xml | 6 +----- tests/backward-compat/recovery-no-password/pom.xml | 6 +----- tests/backward-compat/upgrade-direct/pom.xml | 6 +----- tests/backward-compat/upgrade/pom.xml | 6 +----- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +----- tests/docker-images/all-released-versions-image/pom.xml | 6 +----- tests/docker-images/all-versions-image/pom.xml | 6 +----- tests/docker-images/pom.xml | 6 +----- tests/integration-tests-base-groovy/pom.xml | 6 +----- tests/integration-tests-base/pom.xml | 6 +----- tests/integration-tests-topologies/pom.xml | 6 +----- tests/integration-tests-utils/pom.xml | 6 +----- tests/integration/cluster/pom.xml | 6 +----- tests/integration/pom.xml | 6 +----- tests/integration/smoke/pom.xml | 6 +----- tests/integration/standalone/pom.xml | 6 +----- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +----- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +----- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +----- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +----- tests/shaded/pom.xml | 6 +----- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +----- tools/framework/pom.xml | 6 +----- tools/ledger/pom.xml | 6 +----- tools/perf/pom.xml | 6 +----- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +----- 90 files changed, 93 insertions(+), 353 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 43ea7dff634..420dd71bf78 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index c9ad0eef670..dedcaa751d3 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 5cd871f3f29..af8aa26af2f 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index c732d04cf7d..a2cefdca5f1 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -154,8 +154,4 @@ - - - v4.16.3-rc0 - diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index a8bed70aab0..4b98b04b8e4 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -79,8 +79,4 @@ - - - v4.16.3-rc0 - diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 7c45e7dc056..e0c3bfb6f54 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index ff66576be3d..b7e76206f0c 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -129,8 +129,4 @@ - - - v4.16.3-rc0 - diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 6820a86401d..dd6bc258de9 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index c4544e0d9c3..451687c9efa 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 07e4b03a8b4..7ef79ff7f7e 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index d01ef2a0bcc..cc7ddad5826 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index f1153a9b925..1e8ee8cdd54 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 7b0251bfaab..ef4989b01d7 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 72092eec65e..663da53b870 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,14 +18,10 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API - - - v4.16.3-rc0 - diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 22dad55f1f2..5cf82c0a70f 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 4aaac36cafc..e20dbd714c2 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -31,8 +31,4 @@ ${project.parent.version} - - - v4.16.3-rc0 - diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f7f61dd4caa..fa2ea05244a 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.3 + 4.16.3-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 3f4a8fd44aa..02a98f7f378 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 0be3c38dcff..8ae78bfc79f 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 9372122242e..e3d6063afad 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.3 + 4.16.3-SNAPSHOT .. 4.0.0 @@ -158,8 +158,4 @@ - - - v4.16.3-rc0 - diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 2d5a3640476..830e2d3e97b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 828fda6884a..588db1e400a 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 6beec8582e4..ffb0450f847 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 2ca770bd66e..aa2603bbba5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.3-rc0 + branch-4.13 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 58f07daabf3..e5c553255dc 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3 + 4.16.3-SNAPSHOT .. bookkeeper-server-shaded @@ -126,8 +126,4 @@ - - - v4.16.3-rc0 - diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 30dca9a1535..ac44b7d10a2 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3 + 4.16.3-SNAPSHOT .. bookkeeper-server-tests-shaded @@ -144,8 +144,4 @@ - - - v4.16.3-rc0 - diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 3d7afdb6bf2..9a0d92ff458 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.distributedlog @@ -238,8 +238,4 @@ - - - v4.16.3-rc0 - diff --git a/shaded/pom.xml b/shaded/pom.xml index 84d02e665cb..99d14d26dfc 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 70364dd7551..6a06b79d3d7 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,8 +59,4 @@ - - - v4.16.3-rc0 - diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index a036f2fbe1c..e96ac8688bc 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,8 +53,4 @@ guava - - - v4.16.3-rc0 - diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index b539d5471ac..ae996ad6b15 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 bookkeeper-stats-providers @@ -29,8 +29,4 @@ codahale-metrics-provider prometheus-metrics-provider - - - v4.16.3-rc0 - diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 453f199e445..b7a75fd38a4 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,8 +72,4 @@ - - - v4.16.3-rc0 - diff --git a/stats/pom.xml b/stats/pom.xml index 3ebdad57f34..3bfa47a8518 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 44bf8f787b1..24d79b6201f 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,8 +50,4 @@ jackson-annotations - - - v4.16.3-rc0 - diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 6a2ddb59cb3..a60f866cbfb 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -46,8 +46,4 @@ freebuilder - - - v4.16.3-rc0 - diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index dfe058f335a..c697939f8bb 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -77,8 +77,4 @@ test - - - v4.16.3-rc0 - diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index ce78f4fbe26..0ffc48fc597 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3 + 4.16.3-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,8 +112,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 73f508b03cc..13fb1181498 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3 + 4.16.3-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,8 +59,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index b0758dbfcfc..e2ea0e3386c 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3 + 4.16.3-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,8 +47,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index bf93c2dcc96..378a8d7595c 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.3 + 4.16.3-SNAPSHOT .. stream-storage-java-client-parent @@ -31,8 +31,4 @@ kv all - - - v4.16.3-rc0 - diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 46fe499a7b9..bf672922e7c 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3 + 4.16.3-SNAPSHOT .. stream-storage-clients-parent @@ -47,8 +47,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/common/pom.xml b/stream/common/pom.xml index c89440b8f2e..12b48656a36 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -82,8 +82,4 @@ test - - - v4.16.3-rc0 - diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 71e6683250c..b34ba4c62b4 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3 + 4.16.3-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,8 +106,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index f226adfdef0..8f4aed6ea76 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3 + 4.16.3-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,8 +138,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index a8ece2185a3..e4d50fa09f9 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.3 + 4.16.3-SNAPSHOT ../.. org.apache.distributedlog @@ -100,8 +100,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index ac0a6cb3132..e6fe3801f4a 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 distributedlog-io @@ -28,8 +28,4 @@ dlfs - - - v4.16.3-rc0 - diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index e06f261037b..86cc7faa984 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 3fc62d8dcfd..bbe645bc20e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3 + 4.16.3-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,8 +61,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/pom.xml b/stream/pom.xml index a907e278ce8..30cfa3c831d 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 0326d4620c0..b4aa71d36f1 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -118,8 +118,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/server/pom.xml b/stream/server/pom.xml index a5abc8c05d9..ed168f5f850 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3 + 4.16.3-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,8 +82,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 350d522ff7f..a17c29cd0b1 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper @@ -130,8 +130,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 54251269fa8..c045d252c16 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.3 + 4.16.3-SNAPSHOT .. stream-storage-service-api @@ -55,8 +55,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index d31a20b3d3a..3cc8a15066c 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.3 + 4.16.3-SNAPSHOT .. stream-storage-service-impl @@ -121,8 +121,4 @@ - - - v4.16.3-rc0 - diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 7a833c81cbf..adcd2d91a7d 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3 + 4.16.3-SNAPSHOT .. stream-storage-service-parent @@ -30,8 +30,4 @@ api impl - - - v4.16.3-rc0 - diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 058f19db773..bb9ec0f169e 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper.tests @@ -123,8 +123,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index d852abfa55b..7fab2cb3252 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -76,8 +76,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index bab35e55b55..e7160dbce40 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 5291234854c..81fdee4b36d 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index d67bf57d5c2..43d89a558f9 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 34322a3160b..2442531108b 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 0e8bcb4ba6b..4372c8ebce3 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.3 + 4.16.3-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,8 +49,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 342030f1380..dee7e3bf45d 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -36,8 +36,4 @@ ${project.version} - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index ee2d2cbe54b..0e93631e0ce 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 6832f932c30..f560b5ccda2 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version - - - v4.16.3-rc0 - diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index c59bef828b6..0adf3078b4e 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -28,8 +28,4 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current - - - v4.16.3-rc0 - diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 8660a88b685..efb4ab47c6f 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -68,8 +68,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 4613aecd379..48cdacd22dc 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.3 + 4.16.3-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -108,8 +108,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index a4dde412cca..72feeda0f7d 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests docker-images @@ -30,8 +30,4 @@ all-released-versions-image all-versions-image - - - v4.16.3-rc0 - diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 8209929cd98..e6abf2b58f0 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.3 + 4.16.3-SNAPSHOT ../integration-tests-base @@ -109,8 +109,4 @@ test - - - v4.16.3-rc0 - diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index e1320f700f8..bed5f9cf522 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index a13e0175fb2..9d21fe7596a 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests @@ -45,8 +45,4 @@ ${project.version} - - - v4.16.3-rc0 - diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 943b763c115..985027ef0cf 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 82ba7857c55..a3efb470baf 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -83,8 +83,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 09318072aa0..df06044317b 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests integration @@ -70,8 +70,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 9b6c752ee12..db36ff1d284 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -72,8 +72,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 44ad8d460b3..9b71a441aed 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.3 + 4.16.3-SNAPSHOT .. @@ -68,8 +68,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/pom.xml b/tests/pom.xml index f75c12b1f6f..4b5d2d2492e 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index c2bc73195d7..d06fbeef62c 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT org.apache.bookkeeper.tests @@ -73,8 +73,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 2fc5f22bb8d..53dd9a6a0df 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3 + 4.16.3-SNAPSHOT .. bookkeeper-server-shaded-test @@ -59,8 +59,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 3e96fd4dc4e..a961b65a4f8 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3 + 4.16.3-SNAPSHOT .. bookkeeper-server-tests-shaded-test @@ -75,8 +75,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 8d6e8cb8916..ab74a4633bd 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3 + 4.16.3-SNAPSHOT .. distributedlog-core-shaded-test @@ -84,8 +84,4 @@ - - - v4.16.3-rc0 - diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 8fb06547ece..671d40ac608 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3 + 4.16.3-SNAPSHOT .. org.apache.bookkeeper.tests.shaded @@ -32,8 +32,4 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test - - - v4.16.3-rc0 - diff --git a/testtools/pom.xml b/testtools/pom.xml index 0307c634300..85b223eb0cf 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.3 + 4.16.3-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index b09dd84ed27..1f406c32658 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools @@ -79,8 +79,4 @@ - - - v4.16.3-rc0 - diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 6680bd21dc0..d836d111ebc 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,8 +41,4 @@ test - - - v4.16.3-rc0 - diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 471a08b2539..420047d0480 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,8 +71,4 @@ test - - - v4.16.3-rc0 - diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index aafb1ef5f89..795ba4c0bae 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,8 +48,4 @@ HdrHistogram - - - v4.16.3-rc0 - diff --git a/tools/pom.xml b/tools/pom.xml index c5fa625bd0f..0af628c8232 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3 + 4.16.3-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 307ed166ace..940485efeac 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.3 + 4.16.3-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,8 +48,4 @@ ${project.version} - - - v4.16.3-rc0 - From da216519a5408f4c657867da78bf7f7dbcab3023 Mon Sep 17 00:00:00 2001 From: zymap Date: Wed, 13 Sep 2023 10:05:37 +0800 Subject: [PATCH 079/233] Bump version to 4.16.4-SNAPSHOT --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 90 files changed, 92 insertions(+), 92 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 420dd71bf78..bdb82cb5647 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index dedcaa751d3..eac95eef2ec 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index af8aa26af2f..25d0f1604bc 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index a2cefdca5f1..47d91e6b68d 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 4b98b04b8e4..222a9192c67 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index e0c3bfb6f54..892b185044f 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index b7e76206f0c..52c40121ba3 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index dd6bc258de9..b8923105be2 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 451687c9efa..729115a0e5d 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 7ef79ff7f7e..eef6d199d1e 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index cc7ddad5826..f2601e5a953 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 1e8ee8cdd54..b56a17f5699 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index ef4989b01d7..ebf4772b959 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 663da53b870..8d936a5f844 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 5cf82c0a70f..ddb67bf6d28 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index e20dbd714c2..34d25cb1610 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index fa2ea05244a..f29f77df900 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 02a98f7f378..5a5b85ee11c 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 8ae78bfc79f..bf4e83b9043 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index e3d6063afad..a85f033d7d9 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 830e2d3e97b..5c2a0748225 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 588db1e400a..63c9400cd4a 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index ffb0450f847..40e428d0577 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index aa2603bbba5..4f88958e52a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index e5c553255dc..85a3408fd6d 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index ac44b7d10a2..f9ccbc1bd6c 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 9a0d92ff458..f66b3c15bff 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 99d14d26dfc..6a3680ca5dc 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 6a06b79d3d7..2423b007b8e 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index e96ac8688bc..5a177e97ef5 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index ae996ad6b15..2255ddeee60 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index b7a75fd38a4..0edc2704dbf 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 3bfa47a8518..d5cc4f2ccc3 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 24d79b6201f..39710f59788 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index a60f866cbfb..761f0f44b43 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index c697939f8bb..912c9c06741 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 0ffc48fc597..9ee0082b776 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 13fb1181498..a6f028b0b38 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index e2ea0e3386c..936621fba83 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 378a8d7595c..3cbca66086b 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index bf672922e7c..6f72e1f835c 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 12b48656a36..d7f63439df9 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index b34ba4c62b4..24fc27e764e 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 8f4aed6ea76..2cbdde34c36 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index e4d50fa09f9..c102819feda 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index e6fe3801f4a..7d58702f080 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 86cc7faa984..08e5ed3d88d 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index bbe645bc20e..289ed4f0889 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 30cfa3c831d..bb960504b0f 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index b4aa71d36f1..99639e46a87 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index ed168f5f850..514bce17c11 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index a17c29cd0b1..b0bc7706509 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index c045d252c16..0d6d352cea6 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 3cc8a15066c..cb9b00dd890 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index adcd2d91a7d..be326a996f6 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index bb9ec0f169e..4349f73c5f0 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 7fab2cb3252..3bd0fa870cb 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index e7160dbce40..59692e55fdf 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 81fdee4b36d..dde37c87246 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 43d89a558f9..befc066d751 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 2442531108b..1241fc732a2 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 4372c8ebce3..692cca42c1c 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index dee7e3bf45d..deda6a66428 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 0e93631e0ce..2f54fc1a24d 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index f560b5ccda2..43e601d51b3 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 0adf3078b4e..3eebc908f3b 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index efb4ab47c6f..d89fd3100ac 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 48cdacd22dc..057dc6db3c8 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 72feeda0f7d..fad8e528a3f 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index e6abf2b58f0..5c02d9966c1 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index bed5f9cf522..65cc9ca012c 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 9d21fe7596a..42c9069b845 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 985027ef0cf..e8a87f87cb8 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index a3efb470baf..c4696604416 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index df06044317b..03419ec4b33 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index db36ff1d284..5bdaa7da3a8 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 9b71a441aed..1ccfd94f5d7 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 4b5d2d2492e..900836365aa 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index d06fbeef62c..0efb891691c 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 53dd9a6a0df..00e791ef6f9 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index a961b65a4f8..3274c5a5214 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index ab74a4633bd..e6335c32534 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 671d40ac608..d510eba453c 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 85b223eb0cf..359dbf7ad6e 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 1f406c32658..28190a5f479 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index d836d111ebc..8b2f8988fcc 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 420047d0480..1b055e348ad 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 795ba4c0bae..1765770b485 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 0af628c8232..c111e75d93e 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 940485efeac..da62a144fdf 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.3-SNAPSHOT + 4.16.4-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From bdefd9977a314ef7213814f6f499bf05932691e4 Mon Sep 17 00:00:00 2001 From: zymap Date: Wed, 13 Sep 2023 10:07:42 +0800 Subject: [PATCH 080/233] Bump python to 4.16.4-alpha-0 --- stream/clients/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream/clients/python/setup.py b/stream/clients/python/setup.py index b3dfa970a19..e71934859ba 100644 --- a/stream/clients/python/setup.py +++ b/stream/clients/python/setup.py @@ -19,7 +19,7 @@ name = 'apache-bookkeeper-client' description = 'Apache BookKeeper client library' -version = '4.16.3' +version = '4.16.4-alpha-0' # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta' From 35b02c38527c65e73e329a920eea19846d39cad8 Mon Sep 17 00:00:00 2001 From: chenhang Date: Fri, 14 Oct 2022 17:41:56 +0800 Subject: [PATCH 081/233] cut branch-4.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4f88958e52a..fd1fd3f1aae 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.13 + branch-4.16 JIRA From a9f882b87244c407cbf33a21c522edf74d070c08 Mon Sep 17 00:00:00 2001 From: fengyubiao Date: Thu, 7 Dec 2023 13:49:32 +0800 Subject: [PATCH 082/233] fix calculate checkSum when using Java9IntHash (#4140) * fix calculate checkSum when using Java9IntHash * - * improve performence * add test * edit test * rename test * fix license * address comments --- .../circe/checksum/Java9IntHash.java | 12 +- .../circe/checksum/Java9IntHashTest.java | 121 ++++++++++++++++++ 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 circe-checksum/src/test/java/com/scurrilous/circe/checksum/Java9IntHashTest.java diff --git a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java index 622c66d9ee9..31af153666e 100644 --- a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java +++ b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java @@ -19,6 +19,7 @@ package com.scurrilous.circe.checksum; import io.netty.buffer.ByteBuf; +import io.netty.buffer.CompositeByteBuf; import io.netty.util.concurrent.FastThreadLocal; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -106,14 +107,23 @@ public int resume(int current, ByteBuf buffer, int offset, int len) { } else if (buffer.hasArray()) { int arrayOffset = buffer.arrayOffset() + offset; negCrc = resume(negCrc, buffer.array(), arrayOffset, len); + } else if (buffer instanceof CompositeByteBuf) { + CompositeByteBuf compositeByteBuf = (CompositeByteBuf) buffer; + int loopedCurrent = current; + for (int i = 0; i < compositeByteBuf.numComponents(); i ++) { + loopedCurrent = resume(loopedCurrent, compositeByteBuf.component(i)); + } + return loopedCurrent; } else { byte[] b = TL_BUFFER.get(); int toRead = len; + int loopOffset = offset; while (toRead > 0) { int length = Math.min(toRead, b.length); - buffer.slice(offset, len).readBytes(b, 0, length); + buffer.slice(loopOffset, length).readBytes(b, 0, length); negCrc = resume(negCrc, b, 0, length); toRead -= length; + loopOffset += length; } } diff --git a/circe-checksum/src/test/java/com/scurrilous/circe/checksum/Java9IntHashTest.java b/circe-checksum/src/test/java/com/scurrilous/circe/checksum/Java9IntHashTest.java new file mode 100644 index 00000000000..3fb57b4a1aa --- /dev/null +++ b/circe-checksum/src/test/java/com/scurrilous/circe/checksum/Java9IntHashTest.java @@ -0,0 +1,121 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.scurrilous.circe.checksum; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; +import io.netty.buffer.CompositeByteBuf; +import io.netty.buffer.DuplicatedByteBuf; +import java.util.Random; +import lombok.extern.slf4j.Slf4j; +import org.junit.Assert; +import org.junit.Test; + +@Slf4j +public class Java9IntHashTest { + + private ByteBuf[] generateByteBuffers() { + Random random = new Random(); + int hugeDataLen = 4096 * 3; + byte[] hugeData = new byte[hugeDataLen]; + for (int i = 0; i < hugeDataLen; i ++) { + hugeData[i] = (byte) (random.nextInt() % 127); + } + + // b_total = b1 + b2 + b3; + ByteBuf bTotal = ByteBufAllocator.DEFAULT.heapBuffer(6 + hugeDataLen); + bTotal.writeBytes(new byte[]{1,2,3,4,5,6}); + bTotal.writeBytes(hugeData); + ByteBuf b1 = ByteBufAllocator.DEFAULT.heapBuffer(3); + b1.writeBytes(new byte[]{1,2,3}); + ByteBuf b2 = ByteBufAllocator.DEFAULT.heapBuffer(3); + b2.writeBytes(new byte[]{4,5,6}); + ByteBuf b3 = ByteBufAllocator.DEFAULT.heapBuffer(hugeDataLen); + b3.writeBytes(hugeData); + + return new ByteBuf[]{bTotal, b1, new CompositeByteBuf(ByteBufAllocator.DEFAULT, false, 2, b2, b3)}; + } + + @Test + public void calculateCheckSumUsingCompositeByteBuf() { + // byteBuffers[0] = byteBuffers[1] + byteBuffers[2]. + // byteBuffers[2] is a composite ByteBuf. + ByteBuf[] byteBuffers = generateByteBuffers(); + ByteBuf bTotal = byteBuffers[0]; + ByteBuf b1 = byteBuffers[1]; + ByteBuf b2 = byteBuffers[2]; + + // Calculate: case-1. + int checksumRes1 = Crc32cIntChecksum.computeChecksum(bTotal); + + // Calculate: case-2. + int b1CheckSum = Crc32cIntChecksum.computeChecksum(b1); + int checksumRes2 = Crc32cIntChecksum.resumeChecksum(b1CheckSum, b2); + + // Verify: the results of both ways to calculate the checksum are same. + Assert.assertEquals(checksumRes1, checksumRes2); + + // cleanup. + bTotal.release(); + b1.release(); + b2.release(); + } + + @Test + public void calculateCheckSumUsingNoArrayNoMemoryAddrByteBuf() { + // byteBuffers[0] = byteBuffers[1] + byteBuffers[2]. + // byteBuffers[2] is a composite ByteBuf. + ByteBuf[] byteBuffers = generateByteBuffers(); + ByteBuf bTotal = byteBuffers[0]; + ByteBuf b1 = byteBuffers[1]; + ByteBuf b2 = new NoArrayNoMemoryAddrByteBuff(byteBuffers[2]); + + // Calculate: case-1. + int checksumRes1 = Crc32cIntChecksum.computeChecksum(bTotal); + + // Calculate: case-2. + int b1CheckSum = Crc32cIntChecksum.computeChecksum(b1); + int checksumRes2 = Crc32cIntChecksum.resumeChecksum(b1CheckSum, b2); + + // Verify: the results of both ways to calculate the checksum are same. + Assert.assertEquals(checksumRes1, checksumRes2); + + // cleanup. + bTotal.release(); + b1.release(); + b2.release(); + } + + public static class NoArrayNoMemoryAddrByteBuff extends DuplicatedByteBuf { + + public NoArrayNoMemoryAddrByteBuff(ByteBuf buffer) { + super(buffer); + } + + @Override + public boolean hasArray(){ + return false; + } + + @Override + public boolean hasMemoryAddress(){ + return false; + } + } +} \ No newline at end of file From 15c37b65f1c1c1c0c2d4c7ea00a90a6f7cdba1a4 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Thu, 11 Jan 2024 03:37:05 +0800 Subject: [PATCH 083/233] Chagne the method getUnderreplicatedFragments to the package private (#4174) --- ###Motivation Allow to override the getUnderreplicatedFragments to change the customize the behaviour. --- .../org/apache/bookkeeper/replication/ReplicationWorker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java index f22231c5676..cf1f2f2f598 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java @@ -600,7 +600,7 @@ private boolean isLastSegmentOpenAndMissingBookies(LedgerHandle lh) throws BKExc /** * Gets the under replicated fragments. */ - private Set getUnderreplicatedFragments(LedgerHandle lh, Long ledgerVerificationPercentage) + Set getUnderreplicatedFragments(LedgerHandle lh, Long ledgerVerificationPercentage) throws InterruptedException { //The data loss fragments is first to repair. If a fragment is data_loss and not_adhering_placement //at the same time, we only fix data_loss in this time. After fix data_loss, the fragment is still From a781a9e38a55115d74a515e827197fc43c008cbf Mon Sep 17 00:00:00 2001 From: Zhangao Date: Fri, 1 Sep 2023 12:16:34 +0800 Subject: [PATCH 084/233] Fix readEntry parameter order (#4059) Correct the parameters order of method readEntry (cherry picked from commit 104f3163f84e4033577938e629fec98b734ad777) --- .../bookkeeper/bookie/DefaultEntryLogger.java | 2 +- .../bookie/DefaultEntryLogTest.java | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java index 406f332a90d..66c7a56d3b0 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java @@ -839,7 +839,7 @@ public ByteBuf readEntry(long ledgerId, long entryId, long entryLocation) @Override public ByteBuf readEntry(long location) throws IOException, Bookie.NoEntryException { - return internalReadEntry(location, -1L, -1L, false /* validateEntry */); + return internalReadEntry(-1L, -1L, location, false /* validateEntry */); } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java index d18c9cf284d..38a9ebaf213 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java @@ -20,6 +20,8 @@ */ package org.apache.bookkeeper.bookie; +import static org.apache.bookkeeper.bookie.storage.EntryLogTestUtils.assertEntryEquals; +import static org.apache.bookkeeper.bookie.storage.EntryLogTestUtils.makeEntry; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -37,6 +39,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledByteBufAllocator; +import io.netty.util.ReferenceCountUtil; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -894,6 +897,29 @@ public void testFlushIntervalInBytes() throws Exception { Assert.assertEquals("EntryId", 1L, readEntryId); } + @Test + public void testReadEntryWithoutLedgerID() throws Exception { + List locations = new ArrayList<>(); + // `+ 1` is not a typo: create one more log file than the max number of o cached readers + for (int i = 0; i < 10; i++) { + ByteBuf e = makeEntry(1L, i, 100); + long loc = entryLogger.addEntry(1L, e.slice()); + locations.add(loc); + } + entryLogger.flush(); + for (Long loc : locations) { + int i = locations.indexOf(loc); + ByteBuf data = entryLogger.readEntry(loc); + assertEntryEquals(data, makeEntry(1L, i, 100)); + long readLedgerId = data.readLong(); + long readEntryId = data.readLong(); + Assert.assertEquals("LedgerId", 1L, readLedgerId); + Assert.assertEquals("EntryId", i, readEntryId); + ReferenceCountUtil.release(data); + } + } + + /* * tests basic logic of EntryLogManager interface for * EntryLogManagerForEntryLogPerLedger. From e299efb6ffa7d535ecd9ed99a142e18f496474ff Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Tue, 12 Sep 2023 14:43:30 +0800 Subject: [PATCH 085/233] Print compaction progress (#4071) ### Motivation When the garbage collection is triggered, we don't know the actual compaction progress, for example, the total entrylog files waiting to be compacted and how many entrylog files have been compacted. Without the information, we don't know when will the garbage collection will finish. ### Changes Print the garbage collection progress every one minutes, and the progress contains how many EntryLog files have been compaction and the total EntryLog files waiting to be compacted. (cherry picked from commit 056fe7b554bb66279c373df346495fa37d781584) --- .../bookie/GarbageCollectorThread.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java index 1dc7c4b5a5e..e865bbc3f25 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java @@ -35,6 +35,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import lombok.Getter; import org.apache.bookkeeper.bookie.BookieException.EntryLogMetadataMapException; @@ -58,6 +59,7 @@ public class GarbageCollectorThread implements Runnable { private static final Logger LOG = LoggerFactory.getLogger(GarbageCollectorThread.class); private static final int SECOND = 1000; + private static final long MINUTE = TimeUnit.MINUTES.toMillis(1); // Maps entry log files to the set of ledgers that comprise the file and the size usage per ledger private EntryLogMetadataMap entryLogMetaMap; @@ -588,6 +590,13 @@ void doCompactEntryLogs(double threshold, long maxTimeMillis) throws EntryLogMet entryLogUsageBuckets); final int maxBucket = calculateUsageIndex(numBuckets, threshold); + int totalEntryLogIds = 0; + for (int currBucket = 0; currBucket <= maxBucket; currBucket++) { + totalEntryLogIds += compactableBuckets.get(currBucket).size(); + } + long lastPrintTimestamp = 0; + AtomicInteger processedEntryLogCnt = new AtomicInteger(0); + stopCompaction: for (int currBucket = 0; currBucket <= maxBucket; currBucket++) { LinkedList entryLogIds = compactableBuckets.get(currBucket); @@ -605,7 +614,11 @@ void doCompactEntryLogs(double threshold, long maxTimeMillis) throws EntryLogMet final int bucketIndex = currBucket; final long logId = entryLogIds.remove(); - + if (System.currentTimeMillis() - lastPrintTimestamp >= MINUTE) { + lastPrintTimestamp = System.currentTimeMillis(); + LOG.info("Compaction progress {} / {}, current compaction entryLogId: {}", + processedEntryLogCnt.get(), totalEntryLogIds, logId); + } entryLogMetaMap.forKey(logId, (entryLogId, meta) -> { if (meta == null) { if (LOG.isDebugEnabled()) { @@ -622,6 +635,7 @@ void doCompactEntryLogs(double threshold, long maxTimeMillis) throws EntryLogMet compactEntryLog(meta); gcStats.getReclaimedSpaceViaCompaction().addCount(meta.getTotalSize() - priorRemainingSize); compactedBuckets[bucketIndex]++; + processedEntryLogCnt.getAndIncrement(); }); } } From ec7fb13815d19148af65dd0c459e71bd8d77c4ae Mon Sep 17 00:00:00 2001 From: atomchen <492672043@qq.com> Date: Wed, 20 Sep 2023 17:55:12 +0800 Subject: [PATCH 086/233] Fix NoSuchElementException when rereplicate empty ledgers (#4039) ### Motivation Master issue: #4036 ### Changes Set the `numberOfEntriesToReplicate` to 0 when ledger is empty (cherry picked from commit 95320f41cacd148dbfa83a64960d1a05e43aa292) --- .../client/LedgerFragmentReplicator.java | 2 +- .../client/TestLedgerFragmentReplication.java | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java index 6b439b0960d..b9dc4c32d2a 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java @@ -293,7 +293,7 @@ static Set splitIntoSubFragments(LedgerHandle lh, assert false; } - long numberOfEntriesToReplicate = (lastEntryId - firstEntryId) + 1; + long numberOfEntriesToReplicate = firstEntryId == INVALID_ENTRY_ID ? 0 : (lastEntryId - firstEntryId) + 1; long splitsWithFullEntries = numberOfEntriesToReplicate / rereplicationEntryBatchSize; diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java index a010930e065..b67caaae172 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java @@ -263,6 +263,8 @@ public void testSplitIntoSubFragmentsWithDifferentFragmentBoundaries() testSplitIntoSubFragments(22, 103, 11, 8, lh); testSplitIntoSubFragments(49, 51, 1, 3, lh); testSplitIntoSubFragments(11, 101, 3, 31, lh); + testSplitIntoSubFragments(0, -1, 1, 1, lh); + testSplitIntoSubFragments(0, -1, 10, 1, lh); } /** @@ -272,17 +274,7 @@ void testSplitIntoSubFragments(final long oriFragmentFirstEntry, final long oriFragmentLastEntry, long entriesPerSubFragment, long expectedSubFragments, LedgerHandle lh) { LedgerFragment fr = new LedgerFragment(lh, oriFragmentFirstEntry, - oriFragmentLastEntry, Sets.newHashSet(0)) { - @Override - public long getLastStoredEntryId() { - return oriFragmentLastEntry; - } - - @Override - public long getFirstStoredEntryId() { - return oriFragmentFirstEntry; - } - }; + oriFragmentLastEntry, Sets.newHashSet(0)); Set subFragments = LedgerFragmentReplicator .splitIntoSubFragments(lh, fr, entriesPerSubFragment); assertEquals(expectedSubFragments, subFragments.size()); From 3bbfaa9a1df457756b0a6f35458c882dc63e6dbd Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Wed, 18 Oct 2023 02:49:00 -0500 Subject: [PATCH 087/233] Ignore the empty `perRegionPlacement` when RegionAwareEnsemblePlacementPolicy#newEnsemble (#4106) Descriptions of the changes in this PR: If the `perRegionPlacement` available bookies are empty, do not pick a bookie from it. (cherry picked from commit 3221aa30924825cb4c1a5b00fb68dec44712946e) --- .../RegionAwareEnsemblePlacementPolicy.java | 7 +-- ...estRegionAwareEnsemblePlacementPolicy.java | 50 +++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java index 43969b8fde3..ef68e024672 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java @@ -321,10 +321,11 @@ public PlacementResult> newEnsemble(int ensembleSize, int writeQu excludedBookies); Set excludeNodes = convertBookiesToNodes(comprehensiveExclusionBookiesSet); List availableRegions = new ArrayList<>(); - for (String region: perRegionPlacement.keySet()) { - if ((null == disallowBookiePlacementInRegionFeatureName) + for (Map.Entry entry : perRegionPlacement.entrySet()) { + String region = entry.getKey(); + if (!entry.getValue().knownBookies.isEmpty() && (null == disallowBookiePlacementInRegionFeatureName || !featureProvider.scope(region).getFeature(disallowBookiePlacementInRegionFeatureName) - .isAvailable()) { + .isAvailable())) { availableRegions.add(region); } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java index ba9c4f862ff..9d8e36a350d 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java @@ -27,10 +27,15 @@ import static org.apache.bookkeeper.client.RegionAwareEnsemblePlacementPolicy.REPP_REGIONS_TO_WRITE; import static org.apache.bookkeeper.client.RoundRobinDistributionSchedule.writeSetFromValues; import static org.apache.bookkeeper.feature.SettableFeatureProvider.DISABLE_ALL; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import com.google.common.collect.Sets; import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.netty.util.HashedWheelTimer; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.net.InetAddress; import java.util.ArrayList; import java.util.HashMap; @@ -499,6 +504,51 @@ public void testNewEnsembleBookieWithNotEnoughBookies() throws Exception { } } + @Test + public void testNewEnsembleBookieWithOneEmptyRegion() throws Exception { + BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181); + BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.3", 3181); + BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.4", 3181); + BookieSocketAddress addr4 = new BookieSocketAddress("127.0.0.5", 3181); + // update dns mapping + StaticDNSResolver.addNodeToRack(addr1.getHostName(), NetworkTopology.DEFAULT_REGION_AND_RACK); + StaticDNSResolver.addNodeToRack(addr2.getHostName(), "/region2/r2"); + StaticDNSResolver.addNodeToRack(addr3.getHostName(), "/region3/r3"); + StaticDNSResolver.addNodeToRack(addr4.getHostName(), "/region4/r4"); + // Update cluster + Set addrs = new HashSet(); + addrs.add(addr1.toBookieId()); + addrs.add(addr2.toBookieId()); + addrs.add(addr3.toBookieId()); + addrs.add(addr4.toBookieId()); + + Field logField = repp.getClass().getDeclaredField("LOG"); + Logger mockLogger = mock(Logger.class); + + Field modifiers = Field.class.getDeclaredField("modifiers"); + modifiers.setAccessible(true); + modifiers.setInt(logField, logField.getModifiers() & ~Modifier.FINAL); + logField.setAccessible(true); + logField.set(null, mockLogger); + + repp.onClusterChanged(addrs, new HashSet()); + repp.newEnsemble(3, 3, 3, null, + new HashSet()).getResult(); + verify(mockLogger, times(0)).warn("Could not allocate {} bookies in region {}, try allocating {} bookies", + 1, "UnknownRegion", 0); + addrs = new HashSet(); + addrs.add(addr2.toBookieId()); + addrs.add(addr3.toBookieId()); + addrs.add(addr4.toBookieId()); + repp.onClusterChanged(addrs, new HashSet()); + + repp.newEnsemble(3, 3, 3, null, + new HashSet()).getResult(); + + verify(mockLogger, times(0)).warn("Could not allocate {} bookies in region {}, try allocating {} bookies", + 1, "UnknownRegion", 0); + } + @Test public void testReplaceBookieWithNotEnoughBookies() throws Exception { BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181); From 5fb34408cff51ca20785847e04859586f6cee439 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Mon, 23 Oct 2023 05:46:55 +0300 Subject: [PATCH 088/233] Upgrade Zookeeper to 3.8.3 to address CVE-2023-44981 (#4112) ### Motivation OWASP dependency check reports CVE-2023-44981 for Zookeeper. ### Changes Upgrade Zookeeper to 3.8.3. Release notes: https://zookeeper.apache.org/doc/r3.8.3/releasenotes.html Also upgrade snappy-java to 1.1.10.5 since Zookeeper depends on that library. (cherry picked from commit b33a0c9571d82149edd807e05c49c01d486d60a3) --- bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 10 +++++----- .../src/main/resources/LICENSE-bkctl.bin.txt | 10 +++++----- .../src/main/resources/LICENSE-server.bin.txt | 10 +++++----- pom.xml | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 2e2bd767af3..852936cbcb0 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -260,9 +260,9 @@ Apache Software License, Version 2. - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17] - 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.8.1.jar [21] -- lib/org.apache.zookeeper-zookeeper-jute-3.8.1.jar [21] -- lib/org.apache.zookeeper-zookeeper-3.8.1-tests.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.8.3.jar [21] +- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [21] - lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar [22] - lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar [22] - lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar [22] @@ -317,7 +317,7 @@ Apache Software License, Version 2. - lib/io.dropwizard.metrics-metrics-jvm-4.1.12.1.jar [47] - lib/io.perfmark-perfmark-api-0.25.0.jar [48] - lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49] -- lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] +- lib/org.xerial.snappy-snappy-java-1.1.10.5.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/org.hdrhistogram-HdrHistogram-2.1.10.jar [52] - lib/com.carrotsearch-hppc-0.9.1.jar [53] @@ -367,7 +367,7 @@ Apache Software License, Version 2. [47] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1 [48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.26.0 [49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.2 -[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.1 +[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5 [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/HdrHistogram/HdrHistogram/tree/HdrHistogram-2.1.10 [53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index edda66b1c7b..e71ef63f266 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -245,9 +245,9 @@ Apache Software License, Version 2. - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16] - 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.8.1.jar [20] -- lib/org.apache.zookeeper-zookeeper-jute-3.8.1.jar [20] -- lib/org.apache.zookeeper-zookeeper-3.8.1-tests.jar [20] +- lib/org.apache.zookeeper-zookeeper-3.8.3.jar [20] +- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [20] +- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [20] - lib/com.beust-jcommander-1.82.jar [23] - lib/net.jpountz.lz4-lz4-1.3.0.jar [25] - lib/com.google.api.grpc-proto-google-common-protos-2.9.0.jar [27] @@ -289,7 +289,7 @@ Apache Software License, Version 2. - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [46] - lib/io.perfmark-perfmark-api-0.25.0.jar [47] - lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49] -- lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] +- lib/org.xerial.snappy-snappy-java-1.1.10.5.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/com.carrotsearch-hppc-0.9.1.jar [52] @@ -330,7 +330,7 @@ Apache Software License, Version 2. [46] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1 [47] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.26.0 [49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.2 -[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.1 +[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5 [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index 4274a00de6d..d0c0c83b89a 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -260,9 +260,9 @@ Apache Software License, Version 2. - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17] - 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.8.1.jar [21] -- lib/org.apache.zookeeper-zookeeper-jute-3.8.1.jar [21] -- lib/org.apache.zookeeper-zookeeper-3.8.1-tests.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.8.3.jar [21] +- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [21] - lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar [22] - lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar [22] - lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar [22] @@ -314,7 +314,7 @@ Apache Software License, Version 2. - lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47] - lib/io.perfmark-perfmark-api-0.25.0.jar [48] - lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49] -- lib/org.xerial.snappy-snappy-java-1.1.10.1.jar [50] +- lib/org.xerial.snappy-snappy-java-1.1.10.5.jar [50] - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/com.carrotsearch-hppc-0.9.1.jar [52] @@ -363,7 +363,7 @@ Apache Software License, Version 2. [47] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1 [48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.26.0 [49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.2 -[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.1 +[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5 [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 diff --git a/pom.xml b/pom.xml index fd1fd3f1aae..7644587af7c 100644 --- a/pom.xml +++ b/pom.xml @@ -173,8 +173,8 @@ 1.3.2 1.17.6 4.3.8 - 3.8.1 - 1.1.10.1 + 3.8.3 + 1.1.10.5 2.1.2 0.9.1 From 636d8a3f10b46f0edd7100f70d974ab32826abc1 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Thu, 26 Oct 2023 18:06:25 +0800 Subject: [PATCH 089/233] Upgrade bc-fips to 1.0.2.4 to fix CVE-2022-45146 (#3915) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Motivation #### [CVE-2022-45146](https://www.cve.org/CVERecord?id=CVE-2022-45146) Detailed paths Introduced through: org.apache.distributedlog:dlfs@4.16.0-SNAPSHOT › org.apache.distributedlog:distributedlog-core@4.16.0-SNAPSHOT › org.apache.bookkeeper:bookkeeper-server@4.16.0-SNAPSHOT › org.bouncycastle:bc-fips@1.0.2.3 Fixed in org.bouncycastle:bc-fips@1.0.2.4 ### Changes Upgrade the org.bouncycastle:bc-fips dependency from 1.0.2.3 to 1.0.2.4 (cherry picked from commit 61c03adab754d6c7763ba9330e2ce02866879a3b) --- 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 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 852936cbcb0..3b2ed988bae 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -675,7 +675,7 @@ This product bundles the bouncycastle Library. For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html Bundled as - - lib/org.bouncycastle-bc-fips-1.0.2.3.jar + - lib/org.bouncycastle-bc-fips-1.0.2.4.jar ------------------------------------------------------------------------------------ This product uses the annotations from The Checker Framework, which are licensed under MIT License. For details, see deps/checker-qual-3.5.0/LICENSE diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index e71ef63f266..ba531f894f2 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -594,7 +594,7 @@ This product bundles the bouncycastle Library. For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html Bundled as - - lib/org.bouncycastle-bc-fips-1.0.2.3.jar + - lib/org.bouncycastle-bc-fips-1.0.2.4.jar ------------------------------------------------------------------------------------ This product uses the annotations from The Checker Framework, which are licensed under diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index d0c0c83b89a..c354d1bb8b4 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -664,7 +664,7 @@ This product bundles the bouncycastle Library. For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html Bundled as - - lib/org.bouncycastle-bc-fips-1.0.2.3.jar + - lib/org.bouncycastle-bc-fips-1.0.2.4.jar ------------------------------------------------------------------------------------ This product uses the annotations from The Checker Framework, which are licensed under MIT License. For details, see deps/checker-qual-3.5.0/LICENSE diff --git a/pom.xml b/pom.xml index 7644587af7c..1b15bc6ac6f 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ 2.6 3.6 2.7 - 1.0.2.3 + 1.0.2.4 5.1.0 4.1.12.1 0.5.11 From d9a11efcd6880483f459e0297c770ffc92a7336d Mon Sep 17 00:00:00 2001 From: XLzed <46588381+XLzed@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:50:56 +0800 Subject: [PATCH 090/233] Fix bug of negative JournalQueueSize (#4077) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Motivation While shouldRolloverJournal is true，the QueueEntry qe is not added to the toFlush queue but we decrease the JournalQueueSize incorrectly. ### Changes Decrease the JournalQueueSize after correct NonNull check of qe. (cherry picked from commit 85d7bb3ecf14301f36a51225d5ecce42b614bc44) --- .../java/org/apache/bookkeeper/bookie/Journal.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java index 9735e137179..000a013881d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java @@ -1033,15 +1033,9 @@ journalFormatVersionToWrite, getBufferedChannelBuilder(), if (localQueueEntriesLen > 0) { qe = localQueueEntries[localQueueEntriesIdx]; localQueueEntries[localQueueEntriesIdx++] = null; - journalStats.getJournalQueueSize().dec(); - journalStats.getJournalQueueStats() - .registerSuccessfulEvent(MathUtils.elapsedNanos(qe.enqueueTime), TimeUnit.NANOSECONDS); } - } else { - journalStats.getJournalQueueSize().dec(); - journalStats.getJournalQueueStats() - .registerSuccessfulEvent(MathUtils.elapsedNanos(qe.enqueueTime), TimeUnit.NANOSECONDS); } + if (numEntriesToFlush > 0) { boolean shouldFlush = false; // We should issue a forceWrite if any of the three conditions below holds good @@ -1161,6 +1155,11 @@ journalFormatVersionToWrite, getBufferedChannelBuilder(), if (qe == null) { // no more queue entry continue; } + + journalStats.getJournalQueueSize().dec(); + journalStats.getJournalQueueStats() + .registerSuccessfulEvent(MathUtils.elapsedNanos(qe.enqueueTime), TimeUnit.NANOSECONDS); + if ((qe.entryId == BookieImpl.METAENTRY_ID_LEDGER_EXPLICITLAC) && (journalFormatVersionToWrite < JournalChannel.V6)) { /* From 54f89e3ad56b8ec0440b13f7e247759fb026e9ce Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Wed, 1 Nov 2023 22:36:26 +0800 Subject: [PATCH 091/233] Remove the unused logs in the CleanupLedgerManager.recordPromise (#4121) --- ### Motivation In the cleanup ledger manager, we just record every future and remove them when the future complete. Seems we don't need to print the logs (cherry picked from commit bf9a5cf3ee457797542701f0f336bede227c7fbd) --- .../java/org/apache/bookkeeper/meta/CleanupLedgerManager.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/CleanupLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/CleanupLedgerManager.java index f9c3a00d684..669304c1c18 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/CleanupLedgerManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/CleanupLedgerManager.java @@ -115,9 +115,6 @@ private void recordPromise(CompletableFuture promise) { futures.add(promise); promise.whenComplete((result, exception) -> { futures.remove(promise); - if (exception != null) { - log.error("Failed on operating ledger metadata: {}", BKException.getExceptionCode(exception)); - } }); } From be40e6bd82d76658b5fb7c5c8fa8b9b18547fdad Mon Sep 17 00:00:00 2001 From: fengyubiao Date: Mon, 20 Nov 2023 09:39:52 +0800 Subject: [PATCH 092/233] Fix no known bookies after reset racks for all BKs (#4128) * Fix no known bookies after reset racks for all BKs (cherry picked from commit c07e72aabd68abec18ac761e61aec289814390c4) --- .../bookkeeper/net/NetworkTopologyImpl.java | 3 ++ .../net/NetworkTopologyImplTest.java | 40 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java index d4f0c4fd03b..ff5704407a4 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java @@ -505,6 +505,9 @@ public void remove(Node node) { if (rack == null) { numOfRacks--; } + if (clusterMap.numOfLeaves == 0) { + depthOfAllLeaves = -1; + } } if (LOG.isDebugEnabled()) { LOG.debug("NetworkTopology became:\n" + this); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/net/NetworkTopologyImplTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/net/NetworkTopologyImplTest.java index 6122e51f0cd..e9ed1577e75 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/net/NetworkTopologyImplTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/net/NetworkTopologyImplTest.java @@ -65,6 +65,46 @@ public void getLeavesShouldReturnNodesInScope() { assertTrue(leavesScopeRack1.contains(bookieRack1ScopeNode)); } + @Test + public void testRestartBKWithNewRackDepth() { + NetworkTopologyImpl networkTopology = new NetworkTopologyImpl(); + String dp1Rack = "/rack-1"; + String dp2Rack = "/dp/rack-1"; + BookieId bkId1 = BookieId.parse("bookieIdScopeRack0"); + BookieId bkId2 = BookieId.parse("bookieIdScopeRack1"); + + // Register 2 BKs with depth 1 rack. + BookieNode dp1BkNode1 = new BookieNode(bkId1, dp1Rack); + BookieNode dp1BkNode2 = new BookieNode(bkId2, dp1Rack); + networkTopology.add(dp1BkNode1); + networkTopology.add(dp1BkNode2); + + // Update one BK with depth 2 rack. + // Assert it can not be added due to different depth. + networkTopology.remove(dp1BkNode1); + BookieNode dp2BkNode1 = new BookieNode(bkId1, dp2Rack); + try { + networkTopology.add(dp2BkNode1); + fail("Expected add node failed caused by different depth of rack"); + } catch (NetworkTopologyImpl.InvalidTopologyException ex) { + // Expected ex. + } + Set leaves = networkTopology.getLeaves(dp1Rack); + assertEquals(leaves.size(), 1); + assertTrue(leaves.contains(dp1BkNode2)); + + // Update all Bks with depth 2 rack. + // Verify update success. + networkTopology.remove(dp1BkNode2); + BookieNode dp2BkNode2 = new BookieNode(bkId2, dp2Rack); + networkTopology.add(dp2BkNode1); + networkTopology.add(dp2BkNode2); + leaves = networkTopology.getLeaves(dp2Rack); + assertEquals(leaves.size(), 2); + assertTrue(leaves.contains(dp2BkNode1)); + assertTrue(leaves.contains(dp2BkNode2)); + } + @Test public void getLeavesShouldReturnLeavesThatAreNotInExcludedScope() { // GIVEN From 2189d079a40f67cc8a762d70fb377f0a23701f1c Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Mon, 4 Dec 2023 10:47:00 +0800 Subject: [PATCH 093/233] make waitForNewAuditor stronger. (#4078) ### Motivation Make AuditorBookieTest#waitForNewAuditor stronger. (cherry picked from commit 7a5f8912c8916dd0f07d1ff42881068f46c91c08) --- .../bookkeeper/replication/AuditorBookieTest.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java index 4a88b8670fe..1bf56983624 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java @@ -267,12 +267,15 @@ private BookieServer waitForNewAuditor(BookieServer auditor) BookieServer newAuditor = null; int retryCount = 8; while (retryCount > 0) { - List auditors = getAuditorBookie(); - if (auditors.size() > 0) { - newAuditor = auditors.get(0); - if (auditor != newAuditor) { - break; + try { + List auditors = getAuditorBookie(); + if (auditors.size() > 0) { + newAuditor = auditors.get(0); + if (auditor != newAuditor) { + break; + } } + } catch (Exception ignore) { } Thread.sleep(500); retryCount--; From 31a2c0557066bad1f46b628166a10232ae74996e Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Mon, 4 Dec 2023 11:13:35 +0800 Subject: [PATCH 094/233] Tune the test case (#4093) ### Motivation When migrating the TestReplicationWorker to pulsar(https://github.com/apache/pulsar/pull/21188), the CI always failed. We need to reset the config after test passing (cherry picked from commit 2c2c583d6dce5942d97e8e1377ced5ace3db1000) --- .../apache/bookkeeper/replication/TestReplicationWorker.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java index 8caad1178c3..a9914233899 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java @@ -1246,6 +1246,7 @@ private void testRepairedNotAdheringPlacementPolicyLedgerFragments( baseClientConf.setProperty("reppDnsResolverClass", StaticDNSResolver.class.getName()); baseClientConf.setProperty("enforceStrictZoneawarePlacement", false); + bkc.close(); bkc = new BookKeeperTestClient(baseClientConf) { @Override protected EnsemblePlacementPolicy initializeEnsemblePlacementPolicy(ClientConfiguration conf, @@ -1357,6 +1358,8 @@ protected EnsemblePlacementPolicy initializeEnsemblePlacementPolicy(ClientConfig if (checkReplicationStats == null) { rw.shutdown(); } + baseConf.setRepairedPlacementPolicyNotAdheringBookieEnable(false); + bookKeeper.close(); } private EnsemblePlacementPolicy buildRackAwareEnsemblePlacementPolicy(List bookieIds) { From db6d9976408f0500b2e46fbae682fdd1844d0cc9 Mon Sep 17 00:00:00 2001 From: houxiaoyu Date: Mon, 4 Dec 2023 10:44:34 +0800 Subject: [PATCH 095/233] issue 4109: Fix Flaky-test: HandleFailuresTest.testHandleFailureBookieNotInWriteSet (#4110) Master Issue: https://github.com/apache/bookkeeper/issues/4109 ### Motivation Fix Flaky-test: HandleFailuresTest.testHandleFailureBookieNotInWriteSet When we call `b1Delay.completeExceptionally(new BKException.BKWriteException())` at line480(code1), the `preWriteHook` will complete with exception and then do some actions in the choosen thread(code2), e.g., put the failure bookie to `delayedWriteFailedBookies`(code3). So the `delayedWriteFailedBookies` update is async. However, `lh.appendAsync("entry2".getBytes()))`(Line483 in Code4) is invoked in main thread. So when `appendAsync` execute, the `delayedWriteFailedBookies` could be not updated yet, and `changeInProgress.complete(null)`(code5) will never be invoked. (cherry picked from commit b3662b7a235fea08c11c28a5381b497961916609) --- .../bookkeeper/client/HandleFailuresTest.java | 14 +++++++++++--- .../apache/bookkeeper/proto/MockBookieClient.java | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/HandleFailuresTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/HandleFailuresTest.java index 252fb83330c..8e8f5649dad 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/HandleFailuresTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/HandleFailuresTest.java @@ -31,11 +31,13 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicReference; import org.apache.bookkeeper.client.api.LedgerMetadata; import org.apache.bookkeeper.client.api.WriteFlag; import org.apache.bookkeeper.common.concurrent.FutureUtils; import org.apache.bookkeeper.net.BookieId; import org.apache.bookkeeper.net.BookieSocketAddress; +import org.apache.bookkeeper.proto.MockBookieClient; import org.apache.bookkeeper.versioning.Versioned; import org.junit.Assert; import org.junit.Test; @@ -480,14 +482,20 @@ public void testHandleFailureBookieNotInWriteSet() throws Exception { b1Delay.completeExceptionally(new BKException.BKWriteException()); log.info("write second entry, should have enough bookies, but blocks completion on failure handling"); - CompletableFuture e2 = lh.appendAsync("entry2".getBytes()); + AtomicReference> e2 = new AtomicReference<>(); + + // Execute appendAsync at the same thread of preWriteHook exception thread. So that the + // `delayedWriteFailedBookies` could update before appendAsync invoke. + ((MockBookieClient) clientCtx.getBookieClient()).getExecutor() + .chooseThread(lh.ledgerId) + .execute(() -> e2.set(lh.appendAsync("entry2".getBytes()))); changeInProgress.get(); assertEventuallyTrue("e2 should eventually complete", () -> lh.pendingAddOps.peek().completed); - Assert.assertFalse("e2 shouldn't be completed to client", e2.isDone()); + Assert.assertFalse("e2 shouldn't be completed to client", e2.get().isDone()); blockEnsembleChange.complete(null); // allow ensemble change to continue log.info("e2 should complete"); - e2.get(10, TimeUnit.SECONDS); + e2.get().get(10, TimeUnit.SECONDS); } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookieClient.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookieClient.java index c4344c74d00..2d8315f2f0a 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookieClient.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookieClient.java @@ -32,6 +32,7 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; +import lombok.Getter; import org.apache.bookkeeper.client.BKException; import org.apache.bookkeeper.client.api.WriteFlag; import org.apache.bookkeeper.common.concurrent.FutureUtils; @@ -56,6 +57,7 @@ public class MockBookieClient implements BookieClient { static final Logger LOG = LoggerFactory.getLogger(MockBookieClient.class); + @Getter final OrderedExecutor executor; final MockBookies mockBookies; final Set errorBookies = From 1181e77be4723be7e3989348ebd2c4b1416afc0d Mon Sep 17 00:00:00 2001 From: erobot Date: Mon, 4 Dec 2023 11:46:02 +0800 Subject: [PATCH 096/233] Fix a slow gc thread shutdown when compacting (#4127) Descriptions of the changes in this PR: ### Motivation Fix a slow gc thread shutdown when compacting. The problem here is that the stop flag `running` has been moved after `compacting.compareAndSet`. When `running` is not set to false, entry log continues to compact one after one and the shutdown thread is hard to set the `compacting`. ### Changes Set `running` to false first and then check `compacting`. Master Issue: #4126 (cherry picked from commit a842f3e92cbe7c9a99f72567af19b8f7c4ce7e82) --- .../org/apache/bookkeeper/bookie/GarbageCollectorThread.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java index e865bbc3f25..451aecfe578 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java @@ -676,6 +676,7 @@ public synchronized void shutdown() throws InterruptedException { if (!this.running) { return; } + this.running = false; LOG.info("Shutting down GarbageCollectorThread"); throttler.cancelledAcquire(); @@ -685,7 +686,6 @@ public synchronized void shutdown() throws InterruptedException { Thread.sleep(100); } - this.running = false; // Interrupt GC executor thread gcExecutor.shutdownNow(); try { From 57282500351362c24829b930e592a6ee7e77c2a6 Mon Sep 17 00:00:00 2001 From: Anup Ghatage Date: Sun, 3 Dec 2023 17:55:00 -0800 Subject: [PATCH 097/233] Update Jetty dependency. (#4141) 9.4.51 needs to be updated due to - https://nvd.nist.gov/vuln/detail/CVE-2023-40167 - https://security.snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-5958847 Co-authored-by: Anup Ghatage (cherry picked from commit c1b7f76d77267c0ac10e8a0e80a2890191aaae84) --- .../src/main/resources/LICENSE-all.bin.txt | 14 +++++++------- .../src/main/resources/LICENSE-server.bin.txt | 14 +++++++------- .../src/main/resources/NOTICE-all.bin.txt | 16 ++++++++-------- .../src/main/resources/NOTICE-server.bin.txt | 16 ++++++++-------- pom.xml | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 3b2ed988bae..b488c58fe29 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -263,13 +263,13 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.8.3.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [21] - lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [21] -- lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-server-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-servlet-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar [22] - lib/org.rocksdb-rocksdbjni-7.9.2.jar [23] - lib/com.beust-jcommander-1.82.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index c354d1bb8b4..ad14d4048dd 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -263,13 +263,13 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.8.3.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [21] - lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [21] -- lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-server-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-servlet-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar [22] -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.51.v20230217.jar [22] +- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar [22] +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar [22] - lib/org.rocksdb-rocksdbjni-7.9.2.jar [23] - lib/com.beust-jcommander-1.82.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index 4b824280528..6019c6e90a3 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -92,13 +92,13 @@ SoundCloud Ltd. (http://soundcloud.com/). This product includes software developed as part of the Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). ------------------------------------------------------------------------------------ -- lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-server-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-servlet-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar ============================================================== Jetty Web Container @@ -120,7 +120,7 @@ Jetty is dual licensed under both Jetty may be distributed under either license. -lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar bundles UnixCrypt +lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar bundles UnixCrypt The UnixCrypt.java code implements the one way cryptography used by Unix systems for simple password protection. Copyright 1996 Aki Yoshida, diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt index b061617e6b6..848bd55ef29 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -74,13 +74,13 @@ SoundCloud Ltd. (http://soundcloud.com/). This product includes software developed as part of the Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). ------------------------------------------------------------------------------------ -- lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-server-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-servlet-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.51.v20230217.jar +- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar ============================================================== Jetty Web Container @@ -102,7 +102,7 @@ Jetty is dual licensed under both Jetty may be distributed under either license. -lib/org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar bundles UnixCrypt +lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar bundles UnixCrypt The UnixCrypt.java code implements the one way cryptography used by Unix systems for simple password protection. Copyright 1996 Aki Yoshida, diff --git a/pom.xml b/pom.xml index 1b15bc6ac6f..57b5910597d 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ 2.1.10 2.13.4.20221013 1.82 - 9.4.51.v20230217 + 9.4.53.v20231009 1.19 2.8.2 1.14.3 From 487c94193bb1963bead49a5d4a57804f1e1943e1 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Thu, 7 Dec 2023 08:58:05 +0800 Subject: [PATCH 098/233] Use Flaky flag to skip testBookieServerZKSessionExpireBehaviour test (#4144) ### Motivation The `BookieZKExpireTest.testBookieServerZKSessionExpireBehaviour` is a flaky test and the root cause is described in https://github.com/apache/bookkeeper/pull/3418. There is a race condition in the zookeeper reconnection and listener and it is an expected behavior in Bookie. We created one issue to track this https://github.com/apache/bookkeeper/issues/4142. We can skip this flaky test to unblock the pending PRs. (cherry picked from commit 11ccebbe6096cfbc65fd5b1e59dce43ac013a232) --- .../java/org/apache/bookkeeper/test/BookieZKExpireTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java index 8713756edaf..808b7e8f900 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java @@ -32,6 +32,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.bookie.MockUncleanShutdownDetection; import org.apache.bookkeeper.bookie.TestBookieImpl; +import org.apache.bookkeeper.common.testing.annotations.FlakyTest; import org.apache.bookkeeper.conf.ServerConfiguration; import org.apache.bookkeeper.proto.BookieServer; import org.apache.bookkeeper.stats.NullStatsLogger; @@ -121,7 +122,7 @@ conf, new TestBookieImpl(conf), Attempt to reconnect by BookieStateManager's RegistrationManager listener will fail (even if retry it many times). */ - @Test + @FlakyTest(value = "https://github.com/apache/bookkeeper/issues/4142") @SuppressWarnings("deprecation") public void testBookieServerZKSessionExpireBehaviour() throws Exception { // 6000 is minimum due to default tick time From 15f764c5dabf5177402f4f6601344b664b1d3238 Mon Sep 17 00:00:00 2001 From: qinyuren Date: Mon, 11 Dec 2023 14:21:29 +0800 Subject: [PATCH 099/233] when setExplicitLac is called the ledgersCount should increased (#4138) The **ledgersCount.incrementAndGet** should be called in **setExplicitLac** , just like in **setFenced** and **setLimbo**. (cherry picked from commit 5be03cfdfb4dbe4ad37bd2502fe514d9b347cd26) --- .../bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java index 20e0dd09ade..bf3c01e6629 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java @@ -400,6 +400,7 @@ void setExplicitLac(long ledgerId, ByteBuf lac) throws IOException { if (ledgers.put(ledgerId, newLedgerData) == null) { // Ledger had been deleted + ledgersCount.incrementAndGet(); return; } else if (log.isDebugEnabled()) { log.debug("Set explicitLac on ledger {}", ledgerId); From 82b3f7bc116c25845b5fc3af76985d0c2602ce49 Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Mon, 25 Dec 2023 10:32:46 +0800 Subject: [PATCH 100/233] Fix auditor thread leak problem. (#4162) ### Motivation The auditor didn't close the ledger manager and ledger under replication manager the thread will leak. Run the test `AuditorPeriodicBookieCheckTest` and get the stack. ## Before this PR: ``` Full thread dump Java HotSpot(TM) 64-Bit Server VM (11.0.15+8-LTS-149 mixed mode): Threads class SMR info: _java_thread_list=0x0000600003e44460, length=16, elements={ 0x00007fad34009000, 0x00007fad45032800, 0x00007fad14813800, 0x00007fad44010800, 0x00007fad44011800, 0x00007fad45037800, 0x00007fad3400a000, 0x00007fad45812800, 0x00007fad34944000, 0x00007fad4585f800, 0x00007fad45456000, 0x00007fad4444c000, 0x00007fad3431b800, 0x00007face5825800, 0x00007face5860800, 0x00007face4009800 } "main" #1 prio=5 os_prio=31 cpu=1801.68ms elapsed=20.85s tid=0x00007fad34009000 nid=0x2a03 waiting on condition [0x000000030a10d000] java.lang.Thread.State: TIMED_WAITING (parking) at jdk.internal.misc.Unsafe.park(java.base@11.0.15/Native Method) - parking to wait for <0x000000079f26a8a0> (a java.util.concurrent.FutureTask) at java.util.concurrent.locks.LockSupport.parkNanos(java.base@11.0.15/LockSupport.java:234) at java.util.concurrent.FutureTask.awaitDone(java.base@11.0.15/FutureTask.java:444) at java.util.concurrent.FutureTask.get(java.base@11.0.15/FutureTask.java:203) at org.junit.internal.runners.statements.FailOnTimeout.getResult(FailOnTimeout.java:141) at org.junit.internal.runners.statements.FailOnTimeout.evaluate(FailOnTimeout.java:127) at org.junit.rules.TestWatcher$1.evaluate(TestWatcher.java:55) at org.junit.rules.RunRules.evaluate(RunRules.java:20) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268) at org.junit.runners.ParentRunner.run(ParentRunner.java:363) at org.junit.runner.JUnitCore.run(JUnitCore.java:137) at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69) at com.intellij.rt.junit.IdeaTestRunner$Repeater$1.execute(IdeaTestRunner.java:38) at com.intellij.rt.execution.junit.TestsRepeater.repeat(TestsRepeater.java:11) at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:35) at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235) at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54) Locked ownable synchronizers: - None "Reference Handler" #2 daemon prio=10 os_prio=31 cpu=2.14ms elapsed=20.82s tid=0x00007fad45032800 nid=0x4803 waiting on condition [0x000000030a823000] java.lang.Thread.State: RUNNABLE at java.lang.ref.Reference.waitForReferencePendingList(java.base@11.0.15/Native Method) at java.lang.ref.Reference.processPendingReferences(java.base@11.0.15/Reference.java:241) at java.lang.ref.Reference$ReferenceHandler.run(java.base@11.0.15/Reference.java:213) Locked ownable synchronizers: - None "Finalizer" #3 daemon prio=8 os_prio=31 cpu=1.33ms elapsed=20.82s tid=0x00007fad14813800 nid=0x5503 in Object.wait() [0x000000030a926000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(java.base@11.0.15/Native Method) - waiting on <0x00000007801b6f18> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(java.base@11.0.15/ReferenceQueue.java:155) - waiting to re-lock in wait() <0x00000007801b6f18> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(java.base@11.0.15/ReferenceQueue.java:176) at java.lang.ref.Finalizer$FinalizerThread.run(java.base@11.0.15/Finalizer.java:170) Locked ownable synchronizers: - None "Signal Dispatcher" #4 daemon prio=9 os_prio=31 cpu=2.69ms elapsed=20.81s tid=0x00007fad44010800 nid=0x5b03 runnable [0x0000000000000000] java.lang.Thread.State: RUNNABLE Locked ownable synchronizers: - None "Service Thread" #5 daemon prio=9 os_prio=31 cpu=0.03ms elapsed=20.81s tid=0x00007fad44011800 nid=0x7403 runnable [0x0000000000000000] java.lang.Thread.State: RUNNABLE Locked ownable synchronizers: - None "C2 CompilerThread0" #6 daemon prio=9 os_prio=31 cpu=1986.68ms elapsed=20.81s tid=0x00007fad45037800 nid=0x5d03 waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE No compile task Locked ownable synchronizers: - None "C1 CompilerThread0" #9 daemon prio=9 os_prio=31 cpu=769.61ms elapsed=20.81s tid=0x00007fad3400a000 nid=0x7003 waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE No compile task Locked ownable synchronizers: - None "Sweeper thread" #10 daemon prio=9 os_prio=31 cpu=0.08ms elapsed=20.81s tid=0x00007fad45812800 nid=0x6e03 runnable [0x0000000000000000] java.lang.Thread.State: RUNNABLE Locked ownable synchronizers: - None "Common-Cleaner" #11 daemon prio=8 os_prio=31 cpu=11.62ms elapsed=20.73s tid=0x00007fad34944000 nid=0x6b03 in Object.wait() [0x000000030b049000] java.lang.Thread.State: TIMED_WAITING (on object monitor) at java.lang.Object.wait(java.base@11.0.15/Native Method) - waiting on <0x00000007801b7550> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(java.base@11.0.15/ReferenceQueue.java:155) - waiting to re-lock in wait() <0x00000007801b7550> (a java.lang.ref.ReferenceQueue$Lock) at jdk.internal.ref.CleanerImpl.run(java.base@11.0.15/CleanerImpl.java:148) at java.lang.Thread.run(java.base@11.0.15/Thread.java:834) at jdk.internal.misc.InnocuousThread.run(java.base@11.0.15/InnocuousThread.java:134) Locked ownable synchronizers: - None "Monitor Ctrl-Break" #12 daemon prio=5 os_prio=31 cpu=21.16ms elapsed=20.65s tid=0x00007fad4585f800 nid=0x6a03 runnable [0x000000030b14c000] java.lang.Thread.State: RUNNABLE at java.net.SocketInputStream.socketRead0(java.base@11.0.15/Native Method) at java.net.SocketInputStream.socketRead(java.base@11.0.15/SocketInputStream.java:115) at java.net.SocketInputStream.read(java.base@11.0.15/SocketInputStream.java:168) at java.net.SocketInputStream.read(java.base@11.0.15/SocketInputStream.java:140) at sun.nio.cs.StreamDecoder.readBytes(java.base@11.0.15/StreamDecoder.java:284) at sun.nio.cs.StreamDecoder.implRead(java.base@11.0.15/StreamDecoder.java:326) at sun.nio.cs.StreamDecoder.read(java.base@11.0.15/StreamDecoder.java:178) - locked <0x00000007801b81e8> (a java.io.InputStreamReader) at java.io.InputStreamReader.read(java.base@11.0.15/InputStreamReader.java:181) at java.io.BufferedReader.fill(java.base@11.0.15/BufferedReader.java:161) at java.io.BufferedReader.readLine(java.base@11.0.15/BufferedReader.java:326) - locked <0x00000007801b81e8> (a java.io.InputStreamReader) at java.io.BufferedReader.readLine(java.base@11.0.15/BufferedReader.java:392) at com.intellij.rt.execution.application.AppMainV2$1.run(AppMainV2.java:56) Locked ownable synchronizers: - None "Log4j2-TF-2-Scheduled-1" #13 daemon prio=5 os_prio=31 cpu=3.80ms elapsed=19.18s tid=0x00007fad45456000 nid=0x8c03 waiting on condition [0x000000030bb6a000] java.lang.Thread.State: TIMED_WAITING (parking) at jdk.internal.misc.Unsafe.park(java.base@11.0.15/Native Method) - parking to wait for <0x00000007805c1f78> (a java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject) at java.util.concurrent.locks.LockSupport.parkNanos(java.base@11.0.15/LockSupport.java:234) at java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.awaitNanos(java.base@11.0.15/AbstractQueuedSynchronizer.java:2123) at java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(java.base@11.0.15/ScheduledThreadPoolExecutor.java:1182) at java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(java.base@11.0.15/ScheduledThreadPoolExecutor.java:899) at java.util.concurrent.ThreadPoolExecutor.getTask(java.base@11.0.15/ThreadPoolExecutor.java:1054) at java.util.concurrent.ThreadPoolExecutor.runWorker(java.base@11.0.15/ThreadPoolExecutor.java:1114) at java.util.concurrent.ThreadPoolExecutor$Worker.run(java.base@11.0.15/ThreadPoolExecutor.java:628) at java.lang.Thread.run(java.base@11.0.15/Thread.java:834) Locked ownable synchronizers: - None "Time-limited test" #15 daemon prio=5 os_prio=31 cpu=1344.20ms elapsed=18.79s tid=0x00007fad4444c000 nid=0x9107 waiting on condition [0x000000030bd70000] java.lang.Thread.State: TIMED_WAITING (sleeping) at java.lang.Thread.sleep(java.base@11.0.15/Native Method) at org.apache.bookkeeper.replication.AuditorPeriodicBookieCheckTest.tearDown(AuditorPeriodicBookieCheckTest.java:81) at jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(java.base@11.0.15/Native Method) at jdk.internal.reflect.NativeMethodAccessorImpl.invoke(java.base@11.0.15/NativeMethodAccessorImpl.java:62) at jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(java.base@11.0.15/DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(java.base@11.0.15/Method.java:566) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33) at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298) at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292) at java.util.concurrent.FutureTask.run(java.base@11.0.15/FutureTask.java:264) at java.lang.Thread.run(java.base@11.0.15/Thread.java:834) Locked ownable synchronizers: - None "ZkLedgerManagerScheduler-48-1" #165 prio=5 os_prio=31 cpu=9.25ms elapsed=16.04s tid=0x00007fad3431b800 nid=0x25b03 waiting on condition [0x0000000314d1a000] java.lang.Thread.State: WAITING (parking) at jdk.internal.misc.Unsafe.park(java.base@11.0.15/Native Method) - parking to wait for <0x000000079db6aed0> (a java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject) at java.util.concurrent.locks.LockSupport.park(java.base@11.0.15/LockSupport.java:194) at java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.await(java.base@11.0.15/AbstractQueuedSynchronizer.java:2081) at java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(java.base@11.0.15/ScheduledThreadPoolExecutor.java:1170) at java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(java.base@11.0.15/ScheduledThreadPoolExecutor.java:899) at java.util.concurrent.ThreadPoolExecutor.getTask(java.base@11.0.15/ThreadPoolExecutor.java:1054) at java.util.concurrent.ThreadPoolExecutor.runWorker(java.base@11.0.15/ThreadPoolExecutor.java:1114) at java.util.concurrent.ThreadPoolExecutor$Worker.run(java.base@11.0.15/ThreadPoolExecutor.java:628) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.lang.Thread.run(java.base@11.0.15/Thread.java:834) Locked ownable synchronizers: - None "ZkLedgerManagerScheduler-49-1" #166 prio=5 os_prio=31 cpu=1.01ms elapsed=16.04s tid=0x00007face5825800 nid=0x25903 waiting on condition [0x0000000314e1d000] java.lang.Thread.State: WAITING (parking) at jdk.internal.misc.Unsafe.park(java.base@11.0.15/Native Method) - parking to wait for <0x000000079db6b3f0> (a java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject) at java.util.concurrent.locks.LockSupport.park(java.base@11.0.15/LockSupport.java:194) at java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.await(java.base@11.0.15/AbstractQueuedSynchronizer.java:2081) at java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(java.base@11.0.15/ScheduledThreadPoolExecutor.java:1170) at java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(java.base@11.0.15/ScheduledThreadPoolExecutor.java:899) at java.util.concurrent.ThreadPoolExecutor.getTask(java.base@11.0.15/ThreadPoolExecutor.java:1054) at java.util.concurrent.ThreadPoolExecutor.runWorker(java.base@11.0.15/ThreadPoolExecutor.java:1114) at java.util.concurrent.ThreadPoolExecutor$Worker.run(java.base@11.0.15/ThreadPoolExecutor.java:628) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.lang.Thread.run(java.base@11.0.15/Thread.java:834) Locked ownable synchronizers: - None "ForkJoinPool.commonPool-worker-19" #187 daemon prio=5 os_prio=31 cpu=1.52ms elapsed=15.64s tid=0x00007face5860800 nid=0x2ca03 waiting on condition [0x0000000316259000] java.lang.Thread.State: WAITING (parking) at jdk.internal.misc.Unsafe.park(java.base@11.0.15/Native Method) - parking to wait for <0x000000079ef3f6e8> (a java.util.concurrent.ForkJoinPool) at java.util.concurrent.locks.LockSupport.park(java.base@11.0.15/LockSupport.java:194) at java.util.concurrent.ForkJoinPool.runWorker(java.base@11.0.15/ForkJoinPool.java:1628) at java.util.concurrent.ForkJoinWorkerThread.run(java.base@11.0.15/ForkJoinWorkerThread.java:183) Locked ownable synchronizers: - None "Attach Listener" #313 daemon prio=9 os_prio=31 cpu=1.90ms elapsed=0.24s tid=0x00007face4009800 nid=0x3d53b waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE Locked ownable synchronizers: - None "VM Thread" os_prio=31 cpu=122.89ms elapsed=20.84s tid=0x00007fad1405f000 nid=0x4e03 runnable "GC Thread#0" os_prio=31 cpu=67.63ms elapsed=20.85s tid=0x00007fad3480c000 nid=0x3b03 runnable "GC Thread#1" os_prio=31 cpu=60.78ms elapsed=20.16s tid=0x00007fad45203800 nid=0x8233 runnable "GC Thread#2" os_prio=31 cpu=56.71ms elapsed=20.16s tid=0x00007fad45039800 nid=0x8403 runnable "GC Thread#3" os_prio=31 cpu=59.80ms elapsed=20.16s tid=0x00007fad45341800 nid=0xa703 runnable "GC Thread#4" os_prio=31 cpu=60.21ms elapsed=20.16s tid=0x00007fad45342000 nid=0x8503 runnable "GC Thread#5" os_prio=31 cpu=60.89ms elapsed=20.16s tid=0x00007fad4536d000 nid=0xa503 runnable "GC Thread#6" os_prio=31 cpu=57.91ms elapsed=20.16s tid=0x00007fad4594a800 nid=0x8803 runnable "GC Thread#7" os_prio=31 cpu=56.48ms elapsed=20.16s tid=0x00007fad4594b800 nid=0xa403 runnable "GC Thread#8" os_prio=31 cpu=56.38ms elapsed=20.16s tid=0x00007fad4536e000 nid=0x8a03 runnable "G1 Main Marker" os_prio=31 cpu=2.03ms elapsed=20.85s tid=0x00007fad3482d000 nid=0x3a03 runnable "G1 Conc#0" os_prio=31 cpu=12.67ms elapsed=20.85s tid=0x00007fad4500d800 nid=0x5403 runnable "G1 Conc#1" os_prio=31 cpu=14.15ms elapsed=18.88s tid=0x00007fad45470800 nid=0x8d4f runnable "G1 Refine#0" os_prio=31 cpu=2.03ms elapsed=20.84s tid=0x00007fad3492d800 nid=0x4103 runnable "G1 Young RemSet Sampling" os_prio=31 cpu=5.41ms elapsed=20.84s tid=0x00007fad14008800 nid=0x5103 runnable "VM Periodic Task Thread" os_prio=31 cpu=14.86ms elapsed=20.64s tid=0x00007fad3494b000 nid=0x680f waiting on condition JNI global refs: 20, weak refs: 0 ``` ## After this PR: ``` Full thread dump Java HotSpot(TM) 64-Bit Server VM (11.0.15+8-LTS-149 mixed mode): Threads class SMR info: _java_thread_list=0x00006000020b8540, length=14, elements={ 0x00007ff536808800, 0x00007ff53311f800, 0x00007ff533021800, 0x00007ff53485f000, 0x00007ff53500f000, 0x00007ff535010000, 0x00007ff53500c000, 0x00007ff53400d800, 0x00007ff536861800, 0x00007ff536053000, 0x00007ff53621c800, 0x00007ff536178800, 0x00007ff5357e2000, 0x00007ff4d3009800 } "main" #1 prio=5 os_prio=31 cpu=1768.54ms elapsed=23.32s tid=0x00007ff536808800 nid=0x2a03 waiting on condition [0x000000030630b000] java.lang.Thread.State: TIMED_WAITING (parking) at jdk.internal.misc.Unsafe.park(java.base@11.0.15/Native Method) - parking to wait for <0x000000079f31ab80> (a java.util.concurrent.FutureTask) at java.util.concurrent.locks.LockSupport.parkNanos(java.base@11.0.15/LockSupport.java:234) at java.util.concurrent.FutureTask.awaitDone(java.base@11.0.15/FutureTask.java:444) at java.util.concurrent.FutureTask.get(java.base@11.0.15/FutureTask.java:203) at org.junit.internal.runners.statements.FailOnTimeout.getResult(FailOnTimeout.java:141) at org.junit.internal.runners.statements.FailOnTimeout.evaluate(FailOnTimeout.java:127) at org.junit.rules.TestWatcher$1.evaluate(TestWatcher.java:55) at org.junit.rules.RunRules.evaluate(RunRules.java:20) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268) at org.junit.runners.ParentRunner.run(ParentRunner.java:363) at org.junit.runner.JUnitCore.run(JUnitCore.java:137) at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69) at com.intellij.rt.junit.IdeaTestRunner$Repeater$1.execute(IdeaTestRunner.java:38) at com.intellij.rt.execution.junit.TestsRepeater.repeat(TestsRepeater.java:11) at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:35) at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235) at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54) Locked ownable synchronizers: - None "Reference Handler" #2 daemon prio=10 os_prio=31 cpu=1.79ms elapsed=23.29s tid=0x00007ff53311f800 nid=0x4d03 waiting on condition [0x0000000306a21000] java.lang.Thread.State: RUNNABLE at java.lang.ref.Reference.waitForReferencePendingList(java.base@11.0.15/Native Method) at java.lang.ref.Reference.processPendingReferences(java.base@11.0.15/Reference.java:241) at java.lang.ref.Reference$ReferenceHandler.run(java.base@11.0.15/Reference.java:213) Locked ownable synchronizers: - None "Finalizer" #3 daemon prio=8 os_prio=31 cpu=1.34ms elapsed=23.29s tid=0x00007ff533021800 nid=0x5503 in Object.wait() [0x0000000306b24000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(java.base@11.0.15/Native Method) - waiting on <0x00000007801c5b68> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(java.base@11.0.15/ReferenceQueue.java:155) - waiting to re-lock in wait() <0x00000007801c5b68> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(java.base@11.0.15/ReferenceQueue.java:176) at java.lang.ref.Finalizer$FinalizerThread.run(java.base@11.0.15/Finalizer.java:170) Locked ownable synchronizers: - None "Signal Dispatcher" #4 daemon prio=9 os_prio=31 cpu=1.44ms elapsed=23.27s tid=0x00007ff53485f000 nid=0x5b03 runnable [0x0000000000000000] java.lang.Thread.State: RUNNABLE Locked ownable synchronizers: - None "Service Thread" #5 daemon prio=9 os_prio=31 cpu=0.03ms elapsed=23.27s tid=0x00007ff53500f000 nid=0x7503 runnable [0x0000000000000000] java.lang.Thread.State: RUNNABLE Locked ownable synchronizers: - None "C2 CompilerThread0" #6 daemon prio=9 os_prio=31 cpu=1882.60ms elapsed=23.27s tid=0x00007ff535010000 nid=0x7403 waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE No compile task Locked ownable synchronizers: - None "C1 CompilerThread0" #9 daemon prio=9 os_prio=31 cpu=768.63ms elapsed=23.27s tid=0x00007ff53500c000 nid=0x6003 waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE No compile task Locked ownable synchronizers: - None "Sweeper thread" #10 daemon prio=9 os_prio=31 cpu=0.05ms elapsed=23.27s tid=0x00007ff53400d800 nid=0x6203 runnable [0x0000000000000000] java.lang.Thread.State: RUNNABLE Locked ownable synchronizers: - None "Common-Cleaner" #11 daemon prio=8 os_prio=31 cpu=8.06ms elapsed=23.20s tid=0x00007ff536861800 nid=0x6403 in Object.wait() [0x0000000307245000] java.lang.Thread.State: TIMED_WAITING (on object monitor) at java.lang.Object.wait(java.base@11.0.15/Native Method) - waiting on <0x00000007801c6678> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(java.base@11.0.15/ReferenceQueue.java:155) - waiting to re-lock in wait() <0x00000007801c6678> (a java.lang.ref.ReferenceQueue$Lock) at jdk.internal.ref.CleanerImpl.run(java.base@11.0.15/CleanerImpl.java:148) at java.lang.Thread.run(java.base@11.0.15/Thread.java:834) at jdk.internal.misc.InnocuousThread.run(java.base@11.0.15/InnocuousThread.java:134) Locked ownable synchronizers: - None "Monitor Ctrl-Break" #12 daemon prio=5 os_prio=31 cpu=19.84ms elapsed=23.11s tid=0x00007ff536053000 nid=0x6c03 runnable [0x0000000307348000] java.lang.Thread.State: RUNNABLE at java.net.SocketInputStream.socketRead0(java.base@11.0.15/Native Method) at java.net.SocketInputStream.socketRead(java.base@11.0.15/SocketInputStream.java:115) at java.net.SocketInputStream.read(java.base@11.0.15/SocketInputStream.java:168) at java.net.SocketInputStream.read(java.base@11.0.15/SocketInputStream.java:140) at sun.nio.cs.StreamDecoder.readBytes(java.base@11.0.15/StreamDecoder.java:284) at sun.nio.cs.StreamDecoder.implRead(java.base@11.0.15/StreamDecoder.java:326) at sun.nio.cs.StreamDecoder.read(java.base@11.0.15/StreamDecoder.java:178) - locked <0x00000007801c7860> (a java.io.InputStreamReader) at java.io.InputStreamReader.read(java.base@11.0.15/InputStreamReader.java:181) at java.io.BufferedReader.fill(java.base@11.0.15/BufferedReader.java:161) at java.io.BufferedReader.readLine(java.base@11.0.15/BufferedReader.java:326) - locked <0x00000007801c7860> (a java.io.InputStreamReader) at java.io.BufferedReader.readLine(java.base@11.0.15/BufferedReader.java:392) at com.intellij.rt.execution.application.AppMainV2$1.run(AppMainV2.java:56) Locked ownable synchronizers: - None "Log4j2-TF-2-Scheduled-1" #13 daemon prio=5 os_prio=31 cpu=14.05ms elapsed=21.67s tid=0x00007ff53621c800 nid=0x9c03 waiting on condition [0x0000000307d66000] java.lang.Thread.State: TIMED_WAITING (parking) at jdk.internal.misc.Unsafe.park(java.base@11.0.15/Native Method) - parking to wait for <0x00000007805a1378> (a java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject) at java.util.concurrent.locks.LockSupport.parkNanos(java.base@11.0.15/LockSupport.java:234) at java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.awaitNanos(java.base@11.0.15/AbstractQueuedSynchronizer.java:2123) at java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(java.base@11.0.15/ScheduledThreadPoolExecutor.java:1182) at java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(java.base@11.0.15/ScheduledThreadPoolExecutor.java:899) at java.util.concurrent.ThreadPoolExecutor.getTask(java.base@11.0.15/ThreadPoolExecutor.java:1054) at java.util.concurrent.ThreadPoolExecutor.runWorker(java.base@11.0.15/ThreadPoolExecutor.java:1114) at java.util.concurrent.ThreadPoolExecutor$Worker.run(java.base@11.0.15/ThreadPoolExecutor.java:628) at java.lang.Thread.run(java.base@11.0.15/Thread.java:834) Locked ownable synchronizers: - None "Time-limited test" #15 daemon prio=5 os_prio=31 cpu=1353.43ms elapsed=21.31s tid=0x00007ff536178800 nid=0x9603 waiting on condition [0x0000000307f6c000] java.lang.Thread.State: TIMED_WAITING (sleeping) at java.lang.Thread.sleep(java.base@11.0.15/Native Method) at org.apache.bookkeeper.replication.AuditorPeriodicBookieCheckTest.tearDown(AuditorPeriodicBookieCheckTest.java:81) at jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(java.base@11.0.15/Native Method) at jdk.internal.reflect.NativeMethodAccessorImpl.invoke(java.base@11.0.15/NativeMethodAccessorImpl.java:62) at jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(java.base@11.0.15/DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(java.base@11.0.15/Method.java:566) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33) at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298) at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292) at java.util.concurrent.FutureTask.run(java.base@11.0.15/FutureTask.java:264) at java.lang.Thread.run(java.base@11.0.15/Thread.java:834) Locked ownable synchronizers: - None "ForkJoinPool.commonPool-worker-19" #187 daemon prio=5 os_prio=31 cpu=1.50ms elapsed=18.22s tid=0x00007ff5357e2000 nid=0x2d003 waiting on condition [0x0000000312455000] java.lang.Thread.State: WAITING (parking) at jdk.internal.misc.Unsafe.park(java.base@11.0.15/Native Method) - parking to wait for <0x000000079f052a68> (a java.util.concurrent.ForkJoinPool) at java.util.concurrent.locks.LockSupport.park(java.base@11.0.15/LockSupport.java:194) at java.util.concurrent.ForkJoinPool.runWorker(java.base@11.0.15/ForkJoinPool.java:1628) at java.util.concurrent.ForkJoinWorkerThread.run(java.base@11.0.15/ForkJoinWorkerThread.java:183) Locked ownable synchronizers: - None "Attach Listener" #313 daemon prio=9 os_prio=31 cpu=1.42ms elapsed=0.25s tid=0x00007ff4d3009800 nid=0x2a767 waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE Locked ownable synchronizers: - None "VM Thread" os_prio=31 cpu=122.92ms elapsed=23.30s tid=0x00007ff536863800 nid=0x5003 runnable "GC Thread#0" os_prio=31 cpu=62.12ms elapsed=23.31s tid=0x00007ff536815000 nid=0x3403 runnable "GC Thread#1" os_prio=31 cpu=57.82ms elapsed=22.63s tid=0x00007ff53580c800 nid=0x8207 runnable "GC Thread#2" os_prio=31 cpu=56.34ms elapsed=22.63s tid=0x00007ff535ad9800 nid=0xa703 runnable "GC Thread#3" os_prio=31 cpu=59.35ms elapsed=22.63s tid=0x00007ff53516f000 nid=0xa603 runnable "GC Thread#4" os_prio=31 cpu=57.35ms elapsed=22.63s tid=0x00007ff536015000 nid=0x8503 runnable "GC Thread#5" os_prio=31 cpu=57.46ms elapsed=22.63s tid=0x00007ff5351b5000 nid=0x8603 runnable "GC Thread#6" os_prio=31 cpu=52.34ms elapsed=22.63s tid=0x00007ff5351b6000 nid=0x8803 runnable "GC Thread#7" os_prio=31 cpu=57.02ms elapsed=22.63s tid=0x00007ff5351b6800 nid=0x8a03 runnable "GC Thread#8" os_prio=31 cpu=58.19ms elapsed=22.63s tid=0x00007ff5351b7800 nid=0xa403 runnable "G1 Main Marker" os_prio=31 cpu=1.36ms elapsed=23.31s tid=0x00007ff53482e800 nid=0x3603 runnable "G1 Conc#0" os_prio=31 cpu=11.69ms elapsed=23.31s tid=0x00007ff53482f000 nid=0x5403 runnable "G1 Conc#1" os_prio=31 cpu=12.95ms elapsed=21.39s tid=0x00007ff53695b000 nid=0x9103 runnable "G1 Refine#0" os_prio=31 cpu=2.18ms elapsed=23.31s tid=0x00007ff53311e800 nid=0x5303 runnable "G1 Young RemSet Sampling" os_prio=31 cpu=6.12ms elapsed=23.31s tid=0x00007ff534854000 nid=0x4203 runnable "VM Periodic Task Thread" os_prio=31 cpu=17.11ms elapsed=23.11s tid=0x00007ff535888000 nid=0x8003 waiting on condition JNI global refs: 20, weak refs: 0 ``` ### You can see the executor `ZkLedgerManagerScheduler` shutdown correctly. (cherry picked from commit 1e3efa112b66aa597def7cc247a1ffa9e7732301) --- .../java/org/apache/bookkeeper/replication/Auditor.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java index 93810280189..13b10cf927c 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java @@ -618,10 +618,16 @@ public void shutdown() { if (ownBkc) { bkc.close(); } + if (ledgerManager != null) { + ledgerManager.close(); + } + if (ledgerUnderreplicationManager != null) { + ledgerUnderreplicationManager.close(); + } } catch (InterruptedException ie) { Thread.currentThread().interrupt(); LOG.warn("Interrupted while shutting down auditor bookie", ie); - } catch (BKException bke) { + } catch (UnavailableException | IOException | BKException bke) { LOG.warn("Exception while shutting down auditor bookie", bke); } } From 3c9f7b81db192d2e15feb6fdb902a1133be66b7a Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Mon, 8 Jan 2024 11:39:18 +0800 Subject: [PATCH 101/233] Fix the autorecovery failed replicate by add entry fenced error (#4163) * Fix the autorecovery failed replicate by add entry fenced error --- ### Motivation #3783 changed the recovery add request flags. It causes when replication happening, if the ledger was fenced, the ledger can not be recovered. Because the recovery add flag is not added then the normal add is not allowed to a fenced ledger. (cherry picked from commit eb233b0e45623c9ff64387fde4428df57fff2344) --- .../client/LedgerFragmentReplicator.java | 4 +- ...TestLedgerFragmentReplicationWithMock.java | 111 ++++++++++++++++++ 2 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplicationWithMock.java diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java index b9dc4c32d2a..5cc22362ac3 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java @@ -336,7 +336,7 @@ static Set splitIntoSubFragments(LedgerHandle lh, * New bookies we want to use to recover and replicate the ledger * entries that were stored on the failed bookie. */ - private void recoverLedgerFragmentEntry(final Long entryId, + void recoverLedgerFragmentEntry(final Long entryId, final LedgerHandle lh, final AsyncCallback.VoidCallback ledgerFragmentEntryMcb, final Set newBookies, @@ -410,7 +410,7 @@ public void readComplete(int rc, LedgerHandle lh, lh.getLastAddConfirmed(), entry.getLength(), Unpooled.wrappedBuffer(data, 0, data.length), lh.getLedgerKey(), - 0 + BookieProtocol.FLAG_RECOVERY_ADD ); if (replicationThrottle != null) { if (toSend instanceof ByteBuf) { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplicationWithMock.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplicationWithMock.java new file mode 100644 index 00000000000..c618aa4a15b --- /dev/null +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplicationWithMock.java @@ -0,0 +1,111 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.bookkeeper.client; + +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.when; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; +import io.netty.buffer.Unpooled; +import java.lang.reflect.Field; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.concurrent.CountDownLatch; +import org.apache.bookkeeper.client.impl.LedgerEntryImpl; +import org.apache.bookkeeper.conf.ClientConfiguration; +import org.apache.bookkeeper.net.BookieId; +import org.apache.bookkeeper.proto.BookieClientImpl; +import org.apache.bookkeeper.proto.BookieProtoEncoding; +import org.apache.bookkeeper.proto.BookieProtocol; +import org.apache.bookkeeper.proto.checksum.DigestManager; +import org.apache.bookkeeper.proto.checksum.DummyDigestManager; +import org.apache.commons.collections4.IteratorUtils; +import org.apache.zookeeper.AsyncCallback; +import org.junit.Test; +import org.mockito.Mockito; + +public class TestLedgerFragmentReplicationWithMock { + + @Test + public void testRecoverLedgerFragmentEntrySendRightRequestWithFlag() throws Exception { + CountDownLatch latch = new CountDownLatch(1); + BookieClientImpl bookieClient = Mockito.mock(BookieClientImpl.class); + doAnswer(invocationOnMock -> { + ByteBuf toSend = invocationOnMock.getArgument(4); + BookieProtoEncoding.RequestEnDeCoderPreV3 deCoderPreV3 = + new BookieProtoEncoding.RequestEnDeCoderPreV3(null); + toSend.readerIndex(4); + BookieProtocol.ParsedAddRequest request = (BookieProtocol.ParsedAddRequest) deCoderPreV3.decode(toSend); + + Field flagField = request.getClass().getSuperclass().getDeclaredField("flags"); + flagField.setAccessible(true); + short flag = flagField.getShort(request); + assertEquals(flag, BookieProtocol.FLAG_RECOVERY_ADD); + latch.countDown(); + return null; + }).when(bookieClient) + .addEntry(any(), anyLong(), any(), anyLong(), any(), any(), any(), anyInt(), anyBoolean(), any()); + + BookKeeper bkc = Mockito.mock(BookKeeper.class); + when(bkc.getBookieClient()).thenReturn(bookieClient); + + LedgerHandle lh = Mockito.mock(LedgerHandle.class); + DummyDigestManager ds = new DummyDigestManager(1L, true, ByteBufAllocator.DEFAULT); + when(lh.getDigestManager()).thenReturn(ds); + when(lh.getLedgerKey()).thenReturn(DigestManager.generateMasterKey("".getBytes())); + + ByteBuf data = Unpooled.wrappedBuffer(new byte[1024]); + LedgerEntry entry = new LedgerEntry(LedgerEntryImpl.create(1L, 1L, data.readableBytes(), data)); + List list = new LinkedList<>(); + list.add(entry); + Enumeration entries = IteratorUtils.asEnumeration(list.iterator()); + doAnswer(invocation -> { + org.apache.bookkeeper.client.AsyncCallback.ReadCallback rc = + invocation.getArgument(2, org.apache.bookkeeper.client.AsyncCallback.ReadCallback.class); + rc.readComplete(0, lh, entries, null); + return null; + }).when(lh).asyncReadEntries(anyLong(), anyLong(), any(), any()); + + ClientConfiguration conf = new ClientConfiguration(); + LedgerFragmentReplicator lfr = new LedgerFragmentReplicator(bkc, conf); + + Set bookies = new HashSet<>(); + bookies.add(BookieId.parse("127.0.0.1:3181")); + + AsyncCallback.VoidCallback vc = new AsyncCallback.VoidCallback() { + @Override + public void processResult(int rc, String path, Object ctx) { + } + }; + + lfr.recoverLedgerFragmentEntry(1L, lh, vc, bookies, (lid, le) -> {}); + + latch.await(); + } +} From 0e375de9e44ed18a5de5367afec11d6138884259 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 8 Jan 2024 11:43:07 +0800 Subject: [PATCH 102/233] Skip sync the RocksDB when no changes (#3904) Co-authored-by: Matteo Merli ### Motivation For the `LedgerMetadataIndex#removeDeletedLedgers` and `LedgerMetadataIndex#flush`, it will call ledgersDB sync whether the ledgersDB has changed or not. We can skip the sync call when nothing changed in the ledgersDB. ### Changes - Check whether pendingLedgersUpdates is empty in `flush()` and `pendingDeletedLedgers` is empty in removeDeletedLedgers - Move the `key.recycle()` in finally to cover keys leak when the ledgersDB operations throw an exception. (cherry picked from commit 24464ba428d9c93a18c3edf74be5c32759bdce1e) --- .../bookie/storage/ldb/LedgerMetadataIndex.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java index bf3c01e6629..9b50479b7d5 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java @@ -297,6 +297,10 @@ public void setMasterKey(long ledgerId, byte[] masterKey) throws IOException { * Flushes all pending changes. */ public void flush() throws IOException { + if (pendingLedgersUpdates.isEmpty()) { + return; + } + LongWrapper key = LongWrapper.get(); try { @@ -320,6 +324,10 @@ public void flush() throws IOException { } public void removeDeletedLedgers() throws IOException { + if (pendingDeletedLedgers.isEmpty()) { + return; + } + LongWrapper key = LongWrapper.get(); try { From 7108cbcf22527483ad9b0a09367761d6836862dc Mon Sep 17 00:00:00 2001 From: grayson <916028390@qq.com> Date: Mon, 8 Jan 2024 11:59:10 +0800 Subject: [PATCH 103/233] Issue 4134: Fixing memory leak error when using DirectEntryLogger (#4135) ### Motivation When we use DirectIO and a catch up read occurs, a memory leak occurs because the ByteBuf is not released. Because although in the `internalReadEntry` method in `DirectEntryLogger`, even if the upper layer `fillReadAheadCache` uses the `ReferenceCountUtil.release(entry)` method in the finally block to release ByteBuf, it will still cause an exception thrown by `internalReadEntry`, and the `entryLogger.readEntry` method happens to be in try. ..catch unexpected, causing ByteBuf to not be released correctly ### Changes Master Issue: #4134 (cherry picked from commit cc1c2e012f052d63f585be41c74beecbef71334d) --- .../bookie/storage/directentrylogger/DirectEntryLogger.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java index 323727217d6..e18364e61d3 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/DirectEntryLogger.java @@ -252,6 +252,7 @@ private ByteBuf internalReadEntry(long ledgerId, long entryId, long location, bo long thisEntryId = buf.getLong(8); if (thisLedgerId != ledgerId || thisEntryId != entryId) { + ReferenceCountUtil.release(buf); throw new IOException( exMsg("Bad location").kv("location", location) .kv("expectedLedger", ledgerId).kv("expectedEntry", entryId) From e7187f61693401e8112e6de65a8a9c90d763562b Mon Sep 17 00:00:00 2001 From: lifepuzzlefun Date: Mon, 8 Jan 2024 12:26:08 +0800 Subject: [PATCH 104/233] fix LedgerHandle `ensembleChangeCounter` not used. (#4103) ### Motivation fix #4096 ensemble change counter not inc when ensemble change . ### Changes inc counter when ensemble change. (cherry picked from commit 13e7efaa971cd3613b065ac50836c5ee98985d13) --- .../src/main/java/org/apache/bookkeeper/client/LedgerHandle.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java index ea5295dc7a8..0ea5f8fec14 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java @@ -1910,6 +1910,7 @@ void handleBookieFailure(final Map failedBookies) { void ensembleChangeLoop(List origEnsemble, Map failedBookies) { int ensembleChangeId = numEnsembleChanges.incrementAndGet(); + ensembleChangeCounter.inc(); String logContext = String.format("[EnsembleChange(ledger:%d, change-id:%010d)]", ledgerId, ensembleChangeId); // when the ensemble changes are too frequent, close handle From 7875f158ded57e7bf7152e7a97f1a111affd93f6 Mon Sep 17 00:00:00 2001 From: lifepuzzlefun Date: Mon, 8 Jan 2024 18:26:05 +0800 Subject: [PATCH 105/233] Try to use jdk api to create hardlink when rename file when compaction. (#3876) ### Motivation Current HardLink will create a process to execute mv like command to rename file in compaction logic. maybe we can just use jdk api to do this with lower overhead. see javadoc: https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#createLink(java.nio.file.Path,%20java.nio.file.Path) ### Changes test if `Files.createLink` is available in hardlink static code block. if test fails means `Files.createLink` is not available. else will use `Files.createLink` when call createHardlink (cherry picked from commit af419cccba9a945b407018e2e2962a5680d38219) --- .../bookkeeper/bookie/DefaultEntryLogger.java | 2 +- .../org/apache/bookkeeper/util/HardLink.java | 32 +++++++- .../apache/bookkeeper/util/TestHardLink.java | 82 +++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestHardLink.java diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java index 66c7a56d3b0..ab200b7ca0d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java @@ -683,7 +683,7 @@ private void createNewCompactionLog() throws IOException { private void removeCurCompactionLog() { synchronized (compactionLogLock) { if (compactionLogChannel != null) { - if (!compactionLogChannel.getLogFile().delete()) { + if (compactionLogChannel.getLogFile().exists() && !compactionLogChannel.getLogFile().delete()) { LOG.warn("Could not delete compaction log file {}", compactionLogChannel.getLogFile()); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/HardLink.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/HardLink.java index d3e72b8aad6..1d3a3645921 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/HardLink.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/HardLink.java @@ -22,12 +22,18 @@ import static java.nio.charset.StandardCharsets.UTF_8; +import com.google.common.annotations.VisibleForTesting; import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Arrays; +import java.util.concurrent.atomic.AtomicBoolean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Class for creating hardlinks. @@ -42,7 +48,7 @@ * efficient - and minimizes the impact of the extra buffer creations. */ public class HardLink { - + private static final Logger LOG = LoggerFactory.getLogger(HardLink.class); /** * OS Types. */ @@ -395,12 +401,19 @@ protected static int getMaxAllowedCmdArgLength() { return getHardLinkCommand.getMaxAllowedCmdArgLength(); } + private static final AtomicBoolean CREATE_LINK_SUPPORTED = new AtomicBoolean(true); + /* * **************************************************** * Complexity is above. User-visible functionality is below * **************************************************** */ + @VisibleForTesting + static void enableJdkLinkApi(boolean enable) { + CREATE_LINK_SUPPORTED.set(enable); + } + /** * Creates a hardlink. * @param file - existing source file @@ -416,6 +429,23 @@ public static void createHardLink(File file, File linkName) throw new IOException( "invalid arguments to createHardLink: link name is null"); } + + // if createLink available try first, else fall back to shell command. + if (CREATE_LINK_SUPPORTED.get()) { + try { + Path newFile = Files.createLink(linkName.toPath(), file.toPath()); + if (newFile.toFile().exists()) { + return; + } + } catch (UnsupportedOperationException e) { + LOG.error("createLink not supported", e); + CREATE_LINK_SUPPORTED.set(false); + } catch (IOException e) { + LOG.error("error when create hard link use createLink", e); + CREATE_LINK_SUPPORTED.set(false); + } + } + // construct and execute shell command String[] hardLinkCommand = getHardLinkCommand.linkOne(file, linkName); Process process = Runtime.getRuntime().exec(hardLinkCommand); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestHardLink.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestHardLink.java new file mode 100644 index 00000000000..75f6cf502d8 --- /dev/null +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestHardLink.java @@ -0,0 +1,82 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.bookkeeper.util; + +import java.io.File; +import java.io.IOException; +import java.util.UUID; +import org.apache.commons.io.FileUtils; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + + +public class TestHardLink { + + private File tempDir; + + @Before + public void setup() throws IOException { + // Create at least one file so that target disk will never be empty + tempDir = IOUtils.createTempDir("TestHardLink", "test-hardlink"); + } + + @After + public void tearDown() throws IOException { + FileUtils.deleteDirectory(tempDir); + } + + private void verifyHardLink(File origin, File linkedOrigin) throws IOException { + Assert.assertTrue(origin.exists()); + Assert.assertFalse(linkedOrigin.exists()); + + HardLink.createHardLink(origin, linkedOrigin); + + Assert.assertTrue(origin.exists()); + Assert.assertTrue(linkedOrigin.exists()); + + // when delete origin file it should be success and not exist. + origin.delete(); + Assert.assertFalse(origin.exists()); + Assert.assertTrue(linkedOrigin.exists()); + } + + @Test + public void testHardLink() throws IOException { + String uuidSuffix = UUID.randomUUID().toString(); + + // prepare file + File origin = new File(tempDir, "originFile." + uuidSuffix); + File linkedOrigin = new File(tempDir, "linkedOrigin." + uuidSuffix); + origin.createNewFile(); + + // disable jdk api link first + HardLink.enableJdkLinkApi(false); + verifyHardLink(origin, linkedOrigin); + + // prepare file + File jdkorigin = new File(tempDir, "jdkoriginFile." + uuidSuffix); + File jdklinkedOrigin = new File(tempDir, "jdklinkedOrigin." + uuidSuffix); + jdkorigin.createNewFile(); + + // enable jdk api link + HardLink.enableJdkLinkApi(true); + verifyHardLink(jdkorigin, jdklinkedOrigin); + } +} From 11a402089daa482b66386e40a006ffac4197ef9d Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Thu, 18 Jan 2024 16:04:06 +0800 Subject: [PATCH 106/233] Fix auditor elector executor block problem. (#4165) ### Motivation Now, when we shut down the auditor elector. The shutdown behavior via submitting a shutdown task to do it. In some cases, the follower auditor elector executor is always blocked due to waiting leader election, so the shutdown task will lie in the task queue forever, get no chance to execute. In the pulsar, the case happen. See https://github.com/apache/pulsar/pull/21797#discussion_r1436278822 So in the auditor elector shutdown, if the remain task can't done in time, we should invoke shutdownNow to interrupt the blocked thread. (cherry picked from commit c3748dd0bba8d8534ecb443213c287cd9b8736b7) --- .../replication/AuditorElector.java | 55 +++++--- .../replication/AuditorLedgerCheckerTest.java | 130 ++++++++++++++---- 2 files changed, 141 insertions(+), 44 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java index b478f43a0c2..f6b3a3a04f2 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java @@ -25,11 +25,14 @@ import com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.bookkeeper.client.BKException; import org.apache.bookkeeper.client.BookKeeper; @@ -147,26 +150,28 @@ public Future start() { /** * Run cleanup operations for the auditor elector. */ - private void submitShutdownTask() { - executor.submit(new Runnable() { - @Override - public void run() { - if (!running.compareAndSet(true, false)) { - return; - } - - try { - ledgerAuditorManager.close(); - } catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - LOG.warn("InterruptedException while closing ledger auditor manager", ie); - } catch (Exception ke) { - LOG.error("Exception while closing ledger auditor manager", ke); - } - } - }); + private Future submitShutdownTask() { + return executor.submit(shutdownTask); } + Runnable shutdownTask = new Runnable() { + @Override + public void run() { + if (!running.compareAndSet(true, false)) { + return; + } + + try { + ledgerAuditorManager.close(); + } catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + LOG.warn("InterruptedException while closing ledger auditor manager", ie); + } catch (Exception ke) { + LOG.error("Exception while closing ledger auditor manager", ke); + } + } + }; + /** * Performing the auditor election using the ZooKeeper ephemeral sequential * znode. The bookie which has created the least sequential will be elect as @@ -238,8 +243,18 @@ public void shutdown() throws InterruptedException { return; } // close auditor manager - submitShutdownTask(); - executor.shutdown(); + try { + submitShutdownTask().get(10, TimeUnit.SECONDS); + executor.shutdown(); + } catch (ExecutionException e) { + LOG.warn("Failed to close auditor manager", e); + executor.shutdownNow(); + shutdownTask.run(); + } catch (TimeoutException e) { + LOG.warn("Failed to close auditor manager in 10 seconds", e); + executor.shutdownNow(); + shutdownTask.run(); + } } if (auditor != null) { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java index 7fc733a1113..2e3e09012fb 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java @@ -45,6 +45,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import lombok.Cleanup; import org.apache.bookkeeper.bookie.BookieImpl; @@ -409,7 +410,16 @@ public void testInnerDelayedAuditOfLostBookies() throws Exception { urLedgerMgr.setLostBookieRecoveryDelay(5); // shutdown a non auditor bookie; choosing non-auditor to avoid another election - String shutdownBookie = shutDownNonAuditorBookie(); + AtomicReference shutdownBookieRef = new AtomicReference<>(); + CountDownLatch shutdownLatch = new CountDownLatch(1); + new Thread(() -> { + try { + String shutdownBookie = shutDownNonAuditorBookie(); + shutdownBookieRef.set(shutdownBookie); + shutdownLatch.countDown(); + } catch (Exception ignore) { + } + }).start(); if (LOG.isDebugEnabled()) { LOG.debug("Waiting for ledgers to be marked as under replicated"); @@ -425,9 +435,10 @@ public void testInnerDelayedAuditOfLostBookies() throws Exception { urLedgerList.contains(ledgerId)); Map urLedgerData = getUrLedgerData(urLedgerList); String data = urLedgerData.get(ledgerId); - assertTrue("Bookie " + shutdownBookie + shutdownLatch.await(); + assertTrue("Bookie " + shutdownBookieRef.get() + "is not listed in the ledger as missing replica :" + data, - data.contains(shutdownBookie)); + data.contains(shutdownBookieRef.get())); } /** @@ -486,7 +497,16 @@ public void testRescheduleOfDelayedAuditOfLostBookiesToStartImmediately() throws urLedgerMgr.setLostBookieRecoveryDelay(50); // shutdown a non auditor bookie; choosing non-auditor to avoid another election - String shutdownBookie = shutDownNonAuditorBookie(); + AtomicReference shutdownBookieRef = new AtomicReference<>(); + CountDownLatch shutdownLatch = new CountDownLatch(1); + new Thread(() -> { + try { + String shutdownBookie = shutDownNonAuditorBookie(); + shutdownBookieRef.set(shutdownBookie); + shutdownLatch.countDown(); + } catch (Exception ignore) { + } + }).start(); if (LOG.isDebugEnabled()) { LOG.debug("Waiting for ledgers to be marked as under replicated"); @@ -505,9 +525,10 @@ public void testRescheduleOfDelayedAuditOfLostBookiesToStartImmediately() throws urLedgerList.contains(ledgerId)); Map urLedgerData = getUrLedgerData(urLedgerList); String data = urLedgerData.get(ledgerId); - assertTrue("Bookie " + shutdownBookie + shutdownLatch.await(); + assertTrue("Bookie " + shutdownBookieRef.get() + "is not listed in the ledger as missing replica :" + data, - data.contains(shutdownBookie)); + data.contains(shutdownBookieRef.get())); } @Test @@ -530,7 +551,16 @@ public void testRescheduleOfDelayedAuditOfLostBookiesToStartLater() throws Excep urLedgerMgr.setLostBookieRecoveryDelay(3); // shutdown a non auditor bookie; choosing non-auditor to avoid another election - String shutdownBookie = shutDownNonAuditorBookie(); + AtomicReference shutdownBookieRef = new AtomicReference<>(); + CountDownLatch shutdownLatch = new CountDownLatch(1); + new Thread(() -> { + try { + String shutdownBookie = shutDownNonAuditorBookie(); + shutdownBookieRef.set(shutdownBookie); + shutdownLatch.countDown(); + } catch (Exception ignore) { + } + }).start(); if (LOG.isDebugEnabled()) { LOG.debug("Waiting for ledgers to be marked as under replicated"); @@ -556,9 +586,10 @@ public void testRescheduleOfDelayedAuditOfLostBookiesToStartLater() throws Excep urLedgerList.contains(ledgerId)); Map urLedgerData = getUrLedgerData(urLedgerList); String data = urLedgerData.get(ledgerId); - assertTrue("Bookie " + shutdownBookie + shutdownLatch.await(); + assertTrue("Bookie " + shutdownBookieRef.get() + "is not listed in the ledger as missing replica :" + data, - data.contains(shutdownBookie)); + data.contains(shutdownBookieRef.get())); } @Test @@ -647,7 +678,12 @@ public void testTriggerAuditorWithPendingAuditTask() throws Exception { urLedgerMgr.setLostBookieRecoveryDelay(lostBookieRecoveryDelay); // shutdown a non auditor bookie; choosing non-auditor to avoid another election - String shutdownBookie = shutDownNonAuditorBookie(); + new Thread(() -> { + try { + shutDownNonAuditorBookie(); + } catch (Exception ignore) { + } + }).start(); if (LOG.isDebugEnabled()) { LOG.debug("Waiting for ledgers to be marked as under replicated"); @@ -698,7 +734,12 @@ public void testTriggerAuditorBySettingDelayToZeroWithPendingAuditTask() throws urLedgerMgr.setLostBookieRecoveryDelay(lostBookieRecoveryDelay); // shutdown a non auditor bookie; choosing non-auditor to avoid another election - String shutdownBookie = shutDownNonAuditorBookie(); + new Thread(() -> { + try { + shutDownNonAuditorBookie(); + } catch (Exception ignore) { + } + }).start(); if (LOG.isDebugEnabled()) { LOG.debug("Waiting for ledgers to be marked as under replicated"); @@ -750,8 +791,17 @@ public void testDelayedAuditWithMultipleBookieFailures() throws Exception { // wait for 10 seconds before starting the recovery work when a bookie fails urLedgerMgr.setLostBookieRecoveryDelay(10); - // shutdown a non auditor bookie to avoid an election - String shutdownBookie1 = shutDownNonAuditorBookie(); + // shutdown a non auditor bookie; choosing non-auditor to avoid another election + AtomicReference shutdownBookieRef1 = new AtomicReference<>(); + CountDownLatch shutdownLatch1 = new CountDownLatch(1); + new Thread(() -> { + try { + String shutdownBookie1 = shutDownNonAuditorBookie(); + shutdownBookieRef1.set(shutdownBookie1); + shutdownLatch1.countDown(); + } catch (Exception ignore) { + } + }).start(); // wait for 3 seconds and there shouldn't be any under replicated ledgers // because we have delayed the start of audit by 10 seconds @@ -763,7 +813,16 @@ public void testDelayedAuditWithMultipleBookieFailures() throws Exception { // the history about having delayed recovery remains. Hence we make sure // we bring down a non auditor bookie. This should cause the audit to take // place immediately and not wait for the remaining 7 seconds to elapse - String shutdownBookie2 = shutDownNonAuditorBookie(); + AtomicReference shutdownBookieRef2 = new AtomicReference<>(); + CountDownLatch shutdownLatch2 = new CountDownLatch(1); + new Thread(() -> { + try { + String shutdownBookie2 = shutDownNonAuditorBookie(); + shutdownBookieRef2.set(shutdownBookie2); + shutdownLatch2.countDown(); + } catch (Exception ignore) { + } + }).start(); // 2 second grace period for the ledgers to get reported as under replicated Thread.sleep(2000); @@ -776,9 +835,11 @@ public void testDelayedAuditWithMultipleBookieFailures() throws Exception { urLedgerList.contains(ledgerId)); Map urLedgerData = getUrLedgerData(urLedgerList); String data = urLedgerData.get(ledgerId); - assertTrue("Bookie " + shutdownBookie1 + shutdownBookie2 + shutdownLatch1.await(); + shutdownLatch2.await(); + assertTrue("Bookie " + shutdownBookieRef1.get() + shutdownBookieRef2.get() + " are not listed in the ledger as missing replicas :" + data, - data.contains(shutdownBookie1) && data.contains(shutdownBookie2)); + data.contains(shutdownBookieRef1.get()) && data.contains(shutdownBookieRef2.get())); } /** @@ -808,7 +869,17 @@ public void testDelayedAuditWithRollingUpgrade() throws Exception { // shutdown a non auditor bookie to avoid an election int idx1 = getShutDownNonAuditorBookieIdx(""); ServerConfiguration conf1 = confByIndex(idx1); - String shutdownBookie1 = shutdownBookie(idx1); + + AtomicReference shutdownBookieRef1 = new AtomicReference<>(); + CountDownLatch shutdownLatch1 = new CountDownLatch(1); + new Thread(() -> { + try { + String shutdownBookie1 = shutdownBookie(idx1); + shutdownBookieRef1.set(shutdownBookie1); + shutdownLatch1.countDown(); + } catch (Exception ignore) { + } + }).start(); // wait for 2 seconds and there shouldn't be any under replicated ledgers // because we have delayed the start of audit by 5 seconds @@ -821,8 +892,17 @@ public void testDelayedAuditWithRollingUpgrade() throws Exception { // Now to simulate the rolling upgrade, bring down a bookie different from // the one we brought down/up above. - String shutdownBookie2 = shutDownNonAuditorBookie(shutdownBookie1); - + // shutdown a non auditor bookie; choosing non-auditor to avoid another election + AtomicReference shutdownBookieRef2 = new AtomicReference<>(); + CountDownLatch shutdownLatch2 = new CountDownLatch(1); + new Thread(() -> { + try { + String shutdownBookie2 = shutDownNonAuditorBookie(); + shutdownBookieRef2.set(shutdownBookie2); + shutdownLatch2.countDown(); + } catch (Exception ignore) { + } + }).start(); // since the first bookie that was brought down/up has come up, there is only // one bookie down at this time. Hence the lost bookie check shouldn't start // immediately; it will start 5 seconds after the second bookie went down @@ -839,11 +919,13 @@ public void testDelayedAuditWithRollingUpgrade() throws Exception { urLedgerList.contains(ledgerId)); Map urLedgerData = getUrLedgerData(urLedgerList); String data = urLedgerData.get(ledgerId); - assertTrue("Bookie " + shutdownBookie1 + "wrongly listed as missing the ledger: " + data, - !data.contains(shutdownBookie1)); - assertTrue("Bookie " + shutdownBookie2 + shutdownLatch1.await(); + shutdownLatch2.await(); + assertTrue("Bookie " + shutdownBookieRef1.get() + "wrongly listed as missing the ledger: " + data, + !data.contains(shutdownBookieRef1.get())); + assertTrue("Bookie " + shutdownBookieRef2.get() + " is not listed in the ledger as missing replicas :" + data, - data.contains(shutdownBookie2)); + data.contains(shutdownBookieRef2.get())); LOG.info("*****************Test Complete"); } @@ -1008,7 +1090,7 @@ private Auditor getAuditorBookiesAuditor() throws Exception { return auditorElectors.get(bookieAddr).auditor; } - private String shutDownNonAuditorBookie() throws Exception { + private String shutDownNonAuditorBookie() throws Exception { // shutdown bookie which is not an auditor int indexOf = indexOfServer(getAuditorBookie()); int bkIndexDownBookie; From 616da4fe13393afe23aa36ba864ec1d81e9a7275 Mon Sep 17 00:00:00 2001 From: chenhang Date: Thu, 18 Jan 2024 21:49:12 +0800 Subject: [PATCH 107/233] Bump python client version to 4.16.4 --- stream/clients/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream/clients/python/setup.py b/stream/clients/python/setup.py index e71934859ba..1dbc63863a2 100644 --- a/stream/clients/python/setup.py +++ b/stream/clients/python/setup.py @@ -19,7 +19,7 @@ name = 'apache-bookkeeper-client' description = 'Apache BookKeeper client library' -version = '4.16.4-alpha-0' +version = '4.16.4' # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta' From 16de712d8c8f1f0296697331bb68c1ad0eb5787d Mon Sep 17 00:00:00 2001 From: chenhang Date: Thu, 18 Jan 2024 16:55:29 +0000 Subject: [PATCH 108/233] [maven-release-plugin] prepare release v4.16.4-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +++++- bookkeeper-dist/bkctl/pom.xml | 6 +++++- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +++++- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +++++- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +++++- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +++++- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +++++- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +++++- shaded/distributedlog-core-shaded/pom.xml | 6 +++++- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +++++- .../codahale-metrics-provider/pom.xml | 6 +++++- stats/bookkeeper-stats-providers/pom.xml | 6 +++++- .../prometheus-metrics-provider/pom.xml | 6 +++++- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +++++- stream/api/pom.xml | 6 +++++- stream/bk-grpc-name-resolver/pom.xml | 6 +++++- stream/clients/java/all/pom.xml | 6 +++++- stream/clients/java/base/pom.xml | 6 +++++- stream/clients/java/kv/pom.xml | 6 +++++- stream/clients/java/pom.xml | 6 +++++- stream/clients/pom.xml | 6 +++++- stream/common/pom.xml | 6 +++++- stream/distributedlog/common/pom.xml | 6 +++++- stream/distributedlog/core/pom.xml | 6 +++++- stream/distributedlog/io/dlfs/pom.xml | 6 +++++- stream/distributedlog/io/pom.xml | 6 +++++- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +++++- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +++++- stream/server/pom.xml | 6 +++++- stream/statelib/pom.xml | 6 +++++- stream/storage/api/pom.xml | 6 +++++- stream/storage/impl/pom.xml | 6 +++++- stream/storage/pom.xml | 6 +++++- stream/tests-common/pom.xml | 6 +++++- tests/backward-compat/bc-non-fips/pom.xml | 6 +++++- tests/backward-compat/current-server-old-clients/pom.xml | 6 +++++- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +++++- tests/backward-compat/hostname-bookieid/pom.xml | 6 +++++- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +++++- tests/backward-compat/pom.xml | 6 +++++- tests/backward-compat/recovery-no-password/pom.xml | 6 +++++- tests/backward-compat/upgrade-direct/pom.xml | 6 +++++- tests/backward-compat/upgrade/pom.xml | 6 +++++- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +++++- tests/docker-images/all-released-versions-image/pom.xml | 6 +++++- tests/docker-images/all-versions-image/pom.xml | 6 +++++- tests/docker-images/pom.xml | 6 +++++- tests/integration-tests-base-groovy/pom.xml | 6 +++++- tests/integration-tests-base/pom.xml | 6 +++++- tests/integration-tests-topologies/pom.xml | 6 +++++- tests/integration-tests-utils/pom.xml | 6 +++++- tests/integration/cluster/pom.xml | 6 +++++- tests/integration/pom.xml | 6 +++++- tests/integration/smoke/pom.xml | 6 +++++- tests/integration/standalone/pom.xml | 6 +++++- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +++++- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +++++- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +++++- tests/shaded/pom.xml | 6 +++++- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +++++- tools/framework/pom.xml | 6 +++++- tools/ledger/pom.xml | 6 +++++- tools/perf/pom.xml | 6 +++++- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +++++- 90 files changed, 353 insertions(+), 93 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index bdb82cb5647..5bae84448d3 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index eac95eef2ec..33b65f2240f 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 25d0f1604bc..c587cfdb801 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 47d91e6b68d..13c76d35ffa 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -154,4 +154,8 @@ + + + v4.16.4-rc0 + diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 222a9192c67..2e211f341b9 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -79,4 +79,8 @@ + + + v4.16.4-rc0 + diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 892b185044f..227e5d4c22b 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 52c40121ba3..a0cd8ee4f80 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -129,4 +129,8 @@ + + + v4.16.4-rc0 + diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index b8923105be2..b1e58907176 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 729115a0e5d..ecfd743637e 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index eef6d199d1e..04515c502b2 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index f2601e5a953..dc34c3ddb0a 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index b56a17f5699..fdb143aae0f 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index ebf4772b959..31c647a9d37 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 8d936a5f844..7df5510622e 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,10 +18,14 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API + + + v4.16.4-rc0 + diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index ddb67bf6d28..791efb6eb89 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 34d25cb1610..7893646b44c 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. org.apache.bookkeeper @@ -31,4 +31,8 @@ ${project.parent.version} + + + v4.16.4-rc0 + diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f29f77df900..6eac2d73f56 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 buildtools Apache BookKeeper :: Build Tools - 4.16.4-SNAPSHOT + 4.16.4 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 5a5b85ee11c..db791f856e1 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index bf4e83b9043..c4d8a7a1c48 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index a85f033d7d9..230c7f369dd 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.4-SNAPSHOT + 4.16.4 .. 4.0.0 @@ -158,4 +158,8 @@ + + + v4.16.4-rc0 + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 5c2a0748225..d83c0835283 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 63c9400cd4a..f5d8f6a6b6f 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 40e428d0577..0cff14834af 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. diff --git a/pom.xml b/pom.xml index 57b5910597d..5864db2fd82 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.16 + v4.16.4-rc0 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 85a3408fd6d..e34091a5c83 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.4-SNAPSHOT + 4.16.4 .. bookkeeper-server-shaded @@ -126,4 +126,8 @@ + + + v4.16.4-rc0 + diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index f9ccbc1bd6c..a4b9b9c60fb 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.4-SNAPSHOT + 4.16.4 .. bookkeeper-server-tests-shaded @@ -144,4 +144,8 @@ + + + v4.16.4-rc0 + diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index f66b3c15bff..c331049c6f6 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.4-SNAPSHOT + 4.16.4 .. org.apache.distributedlog @@ -238,4 +238,8 @@ + + + v4.16.4-rc0 + diff --git a/shaded/pom.xml b/shaded/pom.xml index 6a3680ca5dc..aed6f399c54 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 2423b007b8e..e54d7e954e8 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,4 +59,8 @@ + + + v4.16.4-rc0 + diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 5a177e97ef5..f60870d9f75 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,4 +53,8 @@ guava + + + v4.16.4-rc0 + diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 2255ddeee60..8b61d2e3921 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.4-SNAPSHOT + 4.16.4 4.0.0 bookkeeper-stats-providers @@ -29,4 +29,8 @@ codahale-metrics-provider prometheus-metrics-provider + + + v4.16.4-rc0 + diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 0edc2704dbf..4733e105993 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,4 +72,8 @@ + + + v4.16.4-rc0 + diff --git a/stats/pom.xml b/stats/pom.xml index d5cc4f2ccc3..ebc699ffdb3 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 39710f59788..076ac917f3c 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,4 +50,8 @@ jackson-annotations + + + v4.16.4-rc0 + diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 761f0f44b43..2d6fdcf0170 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. org.apache.bookkeeper @@ -46,4 +46,8 @@ freebuilder + + + v4.16.4-rc0 + diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 912c9c06741..86f0c41969a 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. org.apache.bookkeeper @@ -77,4 +77,8 @@ test + + + v4.16.4-rc0 + diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 9ee0082b776..f449df499a9 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.4-SNAPSHOT + 4.16.4 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,4 +112,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index a6f028b0b38..aab32d03473 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.4-SNAPSHOT + 4.16.4 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,4 +59,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 936621fba83..d0f8e5c8a6d 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.4-SNAPSHOT + 4.16.4 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,4 +47,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 3cbca66086b..299d6103ccd 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.4-SNAPSHOT + 4.16.4 .. stream-storage-java-client-parent @@ -31,4 +31,8 @@ kv all + + + v4.16.4-rc0 + diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 6f72e1f835c..7036585dec9 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4-SNAPSHOT + 4.16.4 .. stream-storage-clients-parent @@ -47,4 +47,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/common/pom.xml b/stream/common/pom.xml index d7f63439df9..482943591c6 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. org.apache.bookkeeper @@ -82,4 +82,8 @@ test + + + v4.16.4-rc0 + diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 24fc27e764e..8778d91d4cd 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.4-SNAPSHOT + 4.16.4 distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,4 +106,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 2cbdde34c36..099a06ee805 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.4-SNAPSHOT + 4.16.4 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,4 +138,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index c102819feda..a19e13c282e 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.4-SNAPSHOT + 4.16.4 ../.. org.apache.distributedlog @@ -100,4 +100,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 7d58702f080..ff5eba8a6cd 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.4-SNAPSHOT + 4.16.4 4.0.0 distributedlog-io @@ -28,4 +28,8 @@ dlfs + + + v4.16.4-rc0 + diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 08e5ed3d88d..58b2307d3f4 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 289ed4f0889..1e745e7ee7f 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.4-SNAPSHOT + 4.16.4 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,4 +61,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/pom.xml b/stream/pom.xml index bb960504b0f..a98ae984551 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 99639e46a87..92574a26d7c 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4-SNAPSHOT + 4.16.4 .. org.apache.bookkeeper @@ -118,4 +118,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 514bce17c11..60cec3f26e5 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4-SNAPSHOT + 4.16.4 stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,4 +82,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index b0bc7706509..f986fa945cd 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 .. org.apache.bookkeeper @@ -130,4 +130,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 0d6d352cea6..589432bfebd 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.4-SNAPSHOT + 4.16.4 .. stream-storage-service-api @@ -55,4 +55,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index cb9b00dd890..8080e08b492 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.4-SNAPSHOT + 4.16.4 .. stream-storage-service-impl @@ -121,4 +121,8 @@ + + + v4.16.4-rc0 + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index be326a996f6..7079aba241e 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4-SNAPSHOT + 4.16.4 .. stream-storage-service-parent @@ -30,4 +30,8 @@ api impl + + + v4.16.4-rc0 + diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 4349f73c5f0..a0baa5f069d 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4-SNAPSHOT + 4.16.4 .. org.apache.bookkeeper.tests @@ -123,4 +123,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 3bd0fa870cb..fa9654e6875 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -76,4 +76,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 59692e55fdf..1601b61ee6d 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -28,4 +28,8 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server + + + v4.16.4-rc0 + diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index dde37c87246..3934ffc7087 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -28,4 +28,8 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager + + + v4.16.4-rc0 + diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index befc066d751..804f363ab78 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -28,4 +28,8 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) + + + v4.16.4-rc0 + diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 1241fc732a2..b4c7af40570 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -28,4 +28,8 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies + + + v4.16.4-rc0 + diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 692cca42c1c..4d044d65595 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.4-SNAPSHOT + 4.16.4 ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,4 +49,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index deda6a66428..b95b21021d2 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -36,4 +36,8 @@ ${project.version} + + + v4.16.4-rc0 + diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 2f54fc1a24d..2b5985f0c3d 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -28,4 +28,8 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version + + + v4.16.4-rc0 + diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 43e601d51b3..a2fbd23bad9 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -28,4 +28,8 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version + + + v4.16.4-rc0 + diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 3eebc908f3b..b5200be8832 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -28,4 +28,8 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current + + + v4.16.4-rc0 + diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index d89fd3100ac..c0d817bd180 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.4-SNAPSHOT + 4.16.4 4.0.0 org.apache.bookkeeper.tests @@ -68,4 +68,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 057dc6db3c8..d4bca3f2287 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.4-SNAPSHOT + 4.16.4 4.0.0 org.apache.bookkeeper.tests @@ -108,4 +108,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index fad8e528a3f..7e50a49783c 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper.tests docker-images @@ -30,4 +30,8 @@ all-released-versions-image all-versions-image + + + v4.16.4-rc0 + diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 5c02d9966c1..be83b193344 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.4-SNAPSHOT + 4.16.4 ../integration-tests-base @@ -109,4 +109,8 @@ test + + + v4.16.4-rc0 + diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 65cc9ca012c..1ee3b4d387b 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 42c9069b845..6a4793c4f6f 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper.tests @@ -45,4 +45,8 @@ ${project.version} + + + v4.16.4-rc0 + diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index e8a87f87cb8..55eeed659a5 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper.tests @@ -89,4 +89,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index c4696604416..bc95216ebde 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -83,4 +83,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 03419ec4b33..9680cc3d666 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper.tests integration @@ -70,4 +70,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 5bdaa7da3a8..49dca4408d6 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -72,4 +72,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 1ccfd94f5d7..32a233bd9be 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.4-SNAPSHOT + 4.16.4 .. @@ -68,4 +68,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/pom.xml b/tests/pom.xml index 900836365aa..16245a304cb 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 0efb891691c..bdacc143b4f 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.4 org.apache.bookkeeper.tests @@ -73,4 +73,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 00e791ef6f9..52271ca4a36 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.4-SNAPSHOT + 4.16.4 .. bookkeeper-server-shaded-test @@ -59,4 +59,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 3274c5a5214..a697894f01e 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.4-SNAPSHOT + 4.16.4 .. bookkeeper-server-tests-shaded-test @@ -75,4 +75,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index e6335c32534..c34b406f6de 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.4-SNAPSHOT + 4.16.4 .. distributedlog-core-shaded-test @@ -84,4 +84,8 @@ + + + v4.16.4-rc0 + diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d510eba453c..64cdb6d30e6 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.4 .. org.apache.bookkeeper.tests.shaded @@ -32,4 +32,8 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test + + + v4.16.4-rc0 + diff --git a/testtools/pom.xml b/testtools/pom.xml index 359dbf7ad6e..ea4c0ec6aa0 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 testtools Apache BookKeeper :: Test Tools - 4.16.4-SNAPSHOT + 4.16.4 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 28190a5f479..d987199b897 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 bookkeeper-tools Apache BookKeeper :: Tools @@ -79,4 +79,8 @@ + + + v4.16.4-rc0 + diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 8b2f8988fcc..72613e05d3a 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,4 +41,8 @@ test + + + v4.16.4-rc0 + diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 1b055e348ad..5a999808d73 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,4 +71,8 @@ test + + + v4.16.4-rc0 + diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 1765770b485..d4f316606ec 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.4-SNAPSHOT + 4.16.4 bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,4 +48,8 @@ HdrHistogram + + + v4.16.4-rc0 + diff --git a/tools/pom.xml b/tools/pom.xml index c111e75d93e..03e3306e49d 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.4 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index da62a144fdf..0e26376cf9f 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.4-SNAPSHOT + 4.16.4 stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,4 +48,8 @@ ${project.version} + + + v4.16.4-rc0 + From 79b36afd4aea7e072bcc658284442e4c1400a44c Mon Sep 17 00:00:00 2001 From: chenhang Date: Thu, 18 Jan 2024 16:55:55 +0000 Subject: [PATCH 109/233] [maven-release-plugin] rollback changes from release preparation of v4.16.4-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 6 +----- bookkeeper-dist/bkctl/pom.xml | 6 +----- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 6 +----- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 6 +----- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 6 +----- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 6 +----- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 6 +----- shaded/bookkeeper-server-tests-shaded/pom.xml | 6 +----- shaded/distributedlog-core-shaded/pom.xml | 6 +----- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 6 +----- .../codahale-metrics-provider/pom.xml | 6 +----- stats/bookkeeper-stats-providers/pom.xml | 6 +----- .../prometheus-metrics-provider/pom.xml | 6 +----- stats/pom.xml | 2 +- stats/utils/pom.xml | 6 +----- stream/api/pom.xml | 6 +----- stream/bk-grpc-name-resolver/pom.xml | 6 +----- stream/clients/java/all/pom.xml | 6 +----- stream/clients/java/base/pom.xml | 6 +----- stream/clients/java/kv/pom.xml | 6 +----- stream/clients/java/pom.xml | 6 +----- stream/clients/pom.xml | 6 +----- stream/common/pom.xml | 6 +----- stream/distributedlog/common/pom.xml | 6 +----- stream/distributedlog/core/pom.xml | 6 +----- stream/distributedlog/io/dlfs/pom.xml | 6 +----- stream/distributedlog/io/pom.xml | 6 +----- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 6 +----- stream/pom.xml | 2 +- stream/proto/pom.xml | 6 +----- stream/server/pom.xml | 6 +----- stream/statelib/pom.xml | 6 +----- stream/storage/api/pom.xml | 6 +----- stream/storage/impl/pom.xml | 6 +----- stream/storage/pom.xml | 6 +----- stream/tests-common/pom.xml | 6 +----- tests/backward-compat/bc-non-fips/pom.xml | 6 +----- tests/backward-compat/current-server-old-clients/pom.xml | 6 +----- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 6 +----- tests/backward-compat/hostname-bookieid/pom.xml | 6 +----- tests/backward-compat/old-cookie-new-cluster/pom.xml | 6 +----- tests/backward-compat/pom.xml | 6 +----- tests/backward-compat/recovery-no-password/pom.xml | 6 +----- tests/backward-compat/upgrade-direct/pom.xml | 6 +----- tests/backward-compat/upgrade/pom.xml | 6 +----- tests/backward-compat/yahoo-custom-version/pom.xml | 6 +----- tests/docker-images/all-released-versions-image/pom.xml | 6 +----- tests/docker-images/all-versions-image/pom.xml | 6 +----- tests/docker-images/pom.xml | 6 +----- tests/integration-tests-base-groovy/pom.xml | 6 +----- tests/integration-tests-base/pom.xml | 6 +----- tests/integration-tests-topologies/pom.xml | 6 +----- tests/integration-tests-utils/pom.xml | 6 +----- tests/integration/cluster/pom.xml | 6 +----- tests/integration/pom.xml | 6 +----- tests/integration/smoke/pom.xml | 6 +----- tests/integration/standalone/pom.xml | 6 +----- tests/pom.xml | 2 +- tests/scripts/pom.xml | 6 +----- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 6 +----- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 6 +----- tests/shaded/distributedlog-core-shaded-test/pom.xml | 6 +----- tests/shaded/pom.xml | 6 +----- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 6 +----- tools/framework/pom.xml | 6 +----- tools/ledger/pom.xml | 6 +----- tools/perf/pom.xml | 6 +----- tools/pom.xml | 2 +- tools/stream/pom.xml | 6 +----- 90 files changed, 93 insertions(+), 353 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 5bae84448d3..bdb82cb5647 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 33b65f2240f..eac95eef2ec 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index c587cfdb801..25d0f1604bc 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 13c76d35ffa..47d91e6b68d 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -154,8 +154,4 @@ - - - v4.16.4-rc0 - diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 2e211f341b9..222a9192c67 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -79,8 +79,4 @@ - - - v4.16.4-rc0 - diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 227e5d4c22b..892b185044f 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a0cd8ee4f80..52c40121ba3 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -129,8 +129,4 @@ - - - v4.16.4-rc0 - diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index b1e58907176..b8923105be2 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index ecfd743637e..729115a0e5d 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 04515c502b2..eef6d199d1e 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index dc34c3ddb0a..f2601e5a953 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index fdb143aae0f..b56a17f5699 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 31c647a9d37..ebf4772b959 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 7df5510622e..8d936a5f844 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,14 +18,10 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. org.apache.bookkeeper bookkeeper-slogger-api Apache BookKeeper :: Structured Logger :: API - - - v4.16.4-rc0 - diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 791efb6eb89..ddb67bf6d28 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 7893646b44c..34d25cb1610 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. org.apache.bookkeeper @@ -31,8 +31,4 @@ ${project.parent.version} - - - v4.16.4-rc0 - diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 6eac2d73f56..f29f77df900 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.4 + 4.16.4-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index db791f856e1..5a5b85ee11c 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index c4d8a7a1c48..bf4e83b9043 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 230c7f369dd..a85f033d7d9 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.4 + 4.16.4-SNAPSHOT .. 4.0.0 @@ -158,8 +158,4 @@ - - - v4.16.4-rc0 - diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index d83c0835283..5c2a0748225 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index f5d8f6a6b6f..63c9400cd4a 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0cff14834af..40e428d0577 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 5864db2fd82..57b5910597d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.4-rc0 + branch-4.16 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index e34091a5c83..85a3408fd6d 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.4 + 4.16.4-SNAPSHOT .. bookkeeper-server-shaded @@ -126,8 +126,4 @@ - - - v4.16.4-rc0 - diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index a4b9b9c60fb..f9ccbc1bd6c 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.4 + 4.16.4-SNAPSHOT .. bookkeeper-server-tests-shaded @@ -144,8 +144,4 @@ - - - v4.16.4-rc0 - diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index c331049c6f6..f66b3c15bff 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.4 + 4.16.4-SNAPSHOT .. org.apache.distributedlog @@ -238,8 +238,4 @@ - - - v4.16.4-rc0 - diff --git a/shaded/pom.xml b/shaded/pom.xml index aed6f399c54..6a3680ca5dc 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index e54d7e954e8..2423b007b8e 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api @@ -59,8 +59,4 @@ - - - v4.16.4-rc0 - diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index f60870d9f75..5a177e97ef5 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider @@ -53,8 +53,4 @@ guava - - - v4.16.4-rc0 - diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 8b61d2e3921..2255ddeee60 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.4 + 4.16.4-SNAPSHOT 4.0.0 bookkeeper-stats-providers @@ -29,8 +29,4 @@ codahale-metrics-provider prometheus-metrics-provider - - - v4.16.4-rc0 - diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 4733e105993..0edc2704dbf 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider @@ -72,8 +72,4 @@ - - - v4.16.4-rc0 - diff --git a/stats/pom.xml b/stats/pom.xml index ebc699ffdb3..d5cc4f2ccc3 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 076ac917f3c..39710f59788 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils @@ -50,8 +50,4 @@ jackson-annotations - - - v4.16.4-rc0 - diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 2d6fdcf0170..761f0f44b43 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. org.apache.bookkeeper @@ -46,8 +46,4 @@ freebuilder - - - v4.16.4-rc0 - diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 86f0c41969a..912c9c06741 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. org.apache.bookkeeper @@ -77,8 +77,4 @@ test - - - v4.16.4-rc0 - diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index f449df499a9..9ee0082b776 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.4 + 4.16.4-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client @@ -112,8 +112,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index aab32d03473..a6f028b0b38 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.4 + 4.16.4-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base @@ -59,8 +59,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index d0f8e5c8a6d..936621fba83 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.4 + 4.16.4-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV @@ -47,8 +47,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 299d6103ccd..3cbca66086b 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.4 + 4.16.4-SNAPSHOT .. stream-storage-java-client-parent @@ -31,8 +31,4 @@ kv all - - - v4.16.4-rc0 - diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 7036585dec9..6f72e1f835c 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4 + 4.16.4-SNAPSHOT .. stream-storage-clients-parent @@ -47,8 +47,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 482943591c6..d7f63439df9 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. org.apache.bookkeeper @@ -82,8 +82,4 @@ test - - - v4.16.4-rc0 - diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 8778d91d4cd..24fc27e764e 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.4 + 4.16.4-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common @@ -106,8 +106,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 099a06ee805..2cbdde34c36 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.4 + 4.16.4-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library @@ -138,8 +138,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index a19e13c282e..c102819feda 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.4 + 4.16.4-SNAPSHOT ../.. org.apache.distributedlog @@ -100,8 +100,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index ff5eba8a6cd..7d58702f080 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.4 + 4.16.4-SNAPSHOT 4.0.0 distributedlog-io @@ -28,8 +28,4 @@ dlfs - - - v4.16.4-rc0 - diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 58b2307d3f4..08e5ed3d88d 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 1e745e7ee7f..289ed4f0889 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.4 + 4.16.4-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol @@ -61,8 +61,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/pom.xml b/stream/pom.xml index a98ae984551..bb960504b0f 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 92574a26d7c..99639e46a87 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4 + 4.16.4-SNAPSHOT .. org.apache.bookkeeper @@ -118,8 +118,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 60cec3f26e5..514bce17c11 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4 + 4.16.4-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server @@ -82,8 +82,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index f986fa945cd..b0bc7706509 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT .. org.apache.bookkeeper @@ -130,8 +130,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 589432bfebd..0d6d352cea6 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.4 + 4.16.4-SNAPSHOT .. stream-storage-service-api @@ -55,8 +55,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 8080e08b492..cb9b00dd890 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.4 + 4.16.4-SNAPSHOT .. stream-storage-service-impl @@ -121,8 +121,4 @@ - - - v4.16.4-rc0 - diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 7079aba241e..be326a996f6 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4 + 4.16.4-SNAPSHOT .. stream-storage-service-parent @@ -30,8 +30,4 @@ api impl - - - v4.16.4-rc0 - diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index a0baa5f069d..4349f73c5f0 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4 + 4.16.4-SNAPSHOT .. org.apache.bookkeeper.tests @@ -123,8 +123,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index fa9654e6875..3bd0fa870cb 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -76,8 +76,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 1601b61ee6d..59692e55fdf 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -28,8 +28,4 @@ backward-compat-current-server-old-clients jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server - - - v4.16.4-rc0 - diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 3934ffc7087..dde37c87246 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -28,8 +28,4 @@ hierarchical-ledger-manager jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager - - - v4.16.4-rc0 - diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 804f363ab78..befc066d751 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -28,8 +28,4 @@ hostname-bookieid jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID) - - - v4.16.4-rc0 - diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index b4c7af40570..1241fc732a2 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -28,8 +28,4 @@ old-cookie-new-cluster jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies - - - v4.16.4-rc0 - diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 4d044d65595..692cca42c1c 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.4 + 4.16.4-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests @@ -49,8 +49,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index b95b21021d2..deda6a66428 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -36,8 +36,4 @@ ${project.version} - - - v4.16.4-rc0 - diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 2b5985f0c3d..2f54fc1a24d 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade-direct jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version - - - v4.16.4-rc0 - diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index a2fbd23bad9..43e601d51b3 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -28,8 +28,4 @@ upgrade jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version - - - v4.16.4-rc0 - diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index b5200be8832..3eebc908f3b 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -28,8 +28,4 @@ yahoo-custom-version jar Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current - - - v4.16.4-rc0 - diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index c0d817bd180..d89fd3100ac 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.4 + 4.16.4-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -68,8 +68,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index d4bca3f2287..057dc6db3c8 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.4 + 4.16.4-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests @@ -108,8 +108,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 7e50a49783c..fad8e528a3f 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests docker-images @@ -30,8 +30,4 @@ all-released-versions-image all-versions-image - - - v4.16.4-rc0 - diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index be83b193344..5c02d9966c1 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.4 + 4.16.4-SNAPSHOT ../integration-tests-base @@ -109,8 +109,4 @@ test - - - v4.16.4-rc0 - diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 1ee3b4d387b..65cc9ca012c 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 6a4793c4f6f..42c9069b845 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests @@ -45,8 +45,4 @@ ${project.version} - - - v4.16.4-rc0 - diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 55eeed659a5..e8a87f87cb8 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests @@ -89,8 +89,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index bc95216ebde..c4696604416 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -83,8 +83,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 9680cc3d666..03419ec4b33 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests integration @@ -70,8 +70,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 49dca4408d6..5bdaa7da3a8 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -72,8 +72,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 32a233bd9be..1ccfd94f5d7 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.4 + 4.16.4-SNAPSHOT .. @@ -68,8 +68,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/pom.xml b/tests/pom.xml index 16245a304cb..900836365aa 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index bdacc143b4f..0efb891691c 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4 + 4.16.4-SNAPSHOT org.apache.bookkeeper.tests @@ -73,8 +73,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 52271ca4a36..00e791ef6f9 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.4 + 4.16.4-SNAPSHOT .. bookkeeper-server-shaded-test @@ -59,8 +59,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index a697894f01e..3274c5a5214 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.4 + 4.16.4-SNAPSHOT .. bookkeeper-server-tests-shaded-test @@ -75,8 +75,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index c34b406f6de..e6335c32534 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.4 + 4.16.4-SNAPSHOT .. distributedlog-core-shaded-test @@ -84,8 +84,4 @@ - - - v4.16.4-rc0 - diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 64cdb6d30e6..d510eba453c 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4 + 4.16.4-SNAPSHOT .. org.apache.bookkeeper.tests.shaded @@ -32,8 +32,4 @@ bookkeeper-server-tests-shaded-test distributedlog-core-shaded-test - - - v4.16.4-rc0 - diff --git a/testtools/pom.xml b/testtools/pom.xml index ea4c0ec6aa0..359dbf7ad6e 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.4 + 4.16.4-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index d987199b897..28190a5f479 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools @@ -79,8 +79,4 @@ - - - v4.16.4-rc0 - diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 72613e05d3a..8b2f8988fcc 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework @@ -41,8 +41,4 @@ test - - - v4.16.4-rc0 - diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 5a999808d73..1b055e348ad 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger @@ -71,8 +71,4 @@ test - - - v4.16.4-rc0 - diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index d4f316606ec..1765770b485 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.4 + 4.16.4-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf @@ -48,8 +48,4 @@ HdrHistogram - - - v4.16.4-rc0 - diff --git a/tools/pom.xml b/tools/pom.xml index 03e3306e49d..c111e75d93e 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4 + 4.16.4-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 0e26376cf9f..da62a144fdf 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.4 + 4.16.4-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream @@ -48,8 +48,4 @@ ${project.version} - - - v4.16.4-rc0 - From 1e891515e6cc1638bf93aa183936a61c281527c3 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 9 Feb 2024 08:28:47 -0800 Subject: [PATCH 110/233] Fix checksum calculation bug when the payload is a CompositeByteBuf with readerIndex > 0 (#4196) (#4205) * Add a test that reproduces a bug in checksum calculation * Revert "Fixed unnecessary copy to heap (#2701)" changes to ByteBufList This partially reverts commit 3c9c7102538909fd3764ea7314e7618d6d9458fd. * Remove CompositeBuffer unwrapping in DigestManager * Rename update -> internalUpdate so that unwrapping logic could be added to update * Remove unnecessary unwrapping logic in Java9IntHash * Add safe way to handle CompositeByteBuf * Add license header * Fix checkstyle * Refactor ByteBuf visitor solution * Fix checkstyle * Reformat * Refactor recursive visiting * Revisit equals, hashCode and toString * Refactor test case * Add support for UnpooledHeapByteBuf.getBytes which passes an array * Add support for visiting buffers backed by byte[] arrays - getBytes calls setBytes with a byte[] argument for heap ByteBufs * Move ByteBufVisitor to org.apache.bookkeeper.util package * Update javadoc * Refactor to use stateless visitor so that instance can be shared * Improve test so that a single scenario can be used for debugging * Fix bug in Java9IntHash calculation that assumed crc32c_update(x) == ~crc32c_update(~x) - Java9IntHash uses private methods from java.util.zip.CRC32C class, updateBytes and updateDirectByteBuffer. When inspecting the use and interface contract, it doesn't match how it is used in Java9IntHash. This PR addresses that by introducing a separate initial value for initializing the accumulated value so that the initial value could match the logic in java.util.zip.CRC32C.reset method. There's also a separate method for finalizing the accumulated value into a final checksum value. This is to match the java.util.zip.CRC32C.getValue method's logic (uses bitwise complement operator ~). - With a quick glance, it might appear that the previous logic is similar. However it isn't since I have a failing test which gets fixed with this change. I haven't yet added the Java9IntHash level unit test case to prove how it differs. It must be related to integer value overflow. For the CRC32C function, I believe it means that it cannot be assumed in all cases that func(x) == ~func(~x). That's the assumption that the previous code was making. It probably applies for many inputs, but not all. It would break in overflow cases. * Fix checkstyle * Fix checkstyle * Fix missing depth increment that prevents StackOverflowException * Properly handle the depth increase and decrease * Remove unnecessary condition * Use more efficient way to read bytes to the target array * Don't use ByteBufVisitor if it's not necessary * Revert "Fix bug in Java9IntHash calculation that assumed crc32c_update(x) == ~crc32c_update(~x)" This reverts commit 272e962930a31cbc237c5e7c0bd0c93213520ba4. * Fix issue in resume byte[] version that was added - input and output should be complemented. explanation has been added to the resume ByteBuf method * Polish ByteBufVisitor - reuse GetBytesCallbackByteBuf instance for handling the root ByteBuf instance * Use extracted method * Fix bug with array handling * Polish ByteBufVisitor * Optimize the buffer copying in the case where array or memory address cannot be accessed - read-only buffers will need to be copied before reading - use ByteBuf.copy for direct buffers with pooled allocator when the algorithm can accept a memory address buffer - use the 64kB threadlocal byte[] buffer for copying all other inputs * Check if memory address is accepted * Improve comments about complement (current = ~current) in resume * Print thread dump when build is cancelled * Filter empty buffers and arrays in ByteBufVisitor (cherry picked from commit 9c373f7e7b5b62d57dc5d295039229c2461ae518) --- .github/workflows/bk-ci.yml | 4 + .../proto/checksum/CRC32CDigestManager.java | 12 +- .../proto/checksum/CRC32DigestManager.java | 14 +- .../proto/checksum/DigestManager.java | 94 +- .../checksum/DirectMemoryCRC32Digest.java | 18 +- .../proto/checksum/DummyDigestManager.java | 12 +- .../proto/checksum/MacDigestManager.java | 13 +- .../proto/checksum/StandardCRC32Digest.java | 5 + .../apache/bookkeeper/util/ByteBufList.java | 36 +- .../bookkeeper/util/ByteBufVisitor.java | 1132 +++++++++++++++++ ...ompositeByteBufUnwrapBugReproduceTest.java | 280 ++++ .../bookkeeper/util/ByteBufListTest.java | 34 - .../circe/checksum/Crc32cIntChecksum.java | 24 +- .../scurrilous/circe/checksum/IntHash.java | 4 + .../circe/checksum/Java8IntHash.java | 10 + .../circe/checksum/Java9IntHash.java | 48 +- .../scurrilous/circe/checksum/JniIntHash.java | 10 + 17 files changed, 1618 insertions(+), 132 deletions(-) create mode 100644 bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufVisitor.java create mode 100644 bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/checksum/CompositeByteBufUnwrapBugReproduceTest.java diff --git a/.github/workflows/bk-ci.yml b/.github/workflows/bk-ci.yml index e8d77821147..c9f9226dd80 100644 --- a/.github/workflows/bk-ci.yml +++ b/.github/workflows/bk-ci.yml @@ -200,6 +200,10 @@ jobs: path: surefire-reports retention-days: 7 + - name: print JVM thread dumps when cancelled + if: cancelled() + run: ./dev/ci-tool print_thread_dumps + integration-tests: name: Integration Tests runs-on: ubuntu-latest diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/CRC32CDigestManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/CRC32CDigestManager.java index 1fb3d47b3e0..5343357198a 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/CRC32CDigestManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/CRC32CDigestManager.java @@ -46,7 +46,17 @@ void populateValueAndReset(int digest, ByteBuf buf) { } @Override - int update(int digest, ByteBuf data, int offset, int len) { + int internalUpdate(int digest, ByteBuf data, int offset, int len) { return Crc32cIntChecksum.resumeChecksum(digest, data, offset, len); } + + @Override + int internalUpdate(int digest, byte[] buffer, int offset, int len) { + return Crc32cIntChecksum.resumeChecksum(digest, buffer, offset, len); + } + + @Override + boolean acceptsMemoryAddressBuffer() { + return Crc32cIntChecksum.acceptsMemoryAddressBuffer(); + } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/CRC32DigestManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/CRC32DigestManager.java index 21be2651a7a..0d18312cfc8 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/CRC32DigestManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/CRC32DigestManager.java @@ -34,6 +34,7 @@ interface CRC32Digest { long getValueAndReset(); void update(ByteBuf buf, int offset, int len); + void update(byte[] buffer, int offset, int len); } private static final FastThreadLocal crc = new FastThreadLocal() { @@ -62,14 +63,25 @@ void populateValueAndReset(int digest, ByteBuf buf) { } @Override - int update(int digest, ByteBuf data, int offset, int len) { + int internalUpdate(int digest, ByteBuf data, int offset, int len) { crc.get().update(data, offset, len); return 0; } + @Override + int internalUpdate(int digest, byte[] buffer, int offset, int len) { + crc.get().update(buffer, offset, len); + return 0; + } + @Override boolean isInt32Digest() { // This is stored as 8 bytes return false; } + + @Override + boolean acceptsMemoryAddressBuffer() { + return DirectMemoryCRC32Digest.isSupported(); + } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DigestManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DigestManager.java index eab33945b1e..1e78e4075eb 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DigestManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DigestManager.java @@ -20,10 +20,8 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufUtil; -import io.netty.buffer.CompositeByteBuf; import io.netty.buffer.PooledByteBufAllocator; import io.netty.buffer.Unpooled; -import io.netty.util.ReferenceCountUtil; import io.netty.util.ReferenceCounted; import io.netty.util.concurrent.FastThreadLocal; import java.security.GeneralSecurityException; @@ -34,6 +32,7 @@ import org.apache.bookkeeper.proto.BookieProtocol; import org.apache.bookkeeper.proto.DataFormats.LedgerMetadataFormat.DigestType; import org.apache.bookkeeper.util.ByteBufList; +import org.apache.bookkeeper.util.ByteBufVisitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,10 +52,25 @@ public abstract class DigestManager { final long ledgerId; final boolean useV2Protocol; private final ByteBufAllocator allocator; + private final DigestUpdaterByteBufVisitorCallback byteBufVisitorCallback; abstract int getMacCodeLength(); - abstract int update(int digest, ByteBuf buffer, int offset, int len); + abstract int internalUpdate(int digest, ByteBuf buffer, int offset, int len); + + abstract int internalUpdate(int digest, byte[] buffer, int offset, int len); + + final int update(int digest, ByteBuf buffer, int offset, int len) { + if (buffer.hasMemoryAddress() && acceptsMemoryAddressBuffer()) { + return internalUpdate(digest, buffer, offset, len); + } else if (buffer.hasArray()) { + return internalUpdate(digest, buffer.array(), buffer.arrayOffset() + offset, len); + } else { + UpdateContext updateContext = new UpdateContext(digest); + ByteBufVisitor.visitBuffers(buffer, offset, len, byteBufVisitorCallback, updateContext); + return updateContext.digest; + } + } abstract void populateValueAndReset(int digest, ByteBuf buffer); @@ -69,6 +83,7 @@ public DigestManager(long ledgerId, boolean useV2Protocol, ByteBufAllocator allo this.useV2Protocol = useV2Protocol; this.macCodeLength = getMacCodeLength(); this.allocator = allocator; + this.byteBufVisitorCallback = new DigestUpdaterByteBufVisitorCallback(); } public static DigestManager instantiate(long ledgerId, byte[] passwd, DigestType digestType, @@ -136,22 +151,7 @@ private ReferenceCounted computeDigestAndPackageForSendingV2(long entryId, long // Compute checksum over the headers int digest = update(0, buf, buf.readerIndex(), buf.readableBytes()); - - // don't unwrap slices - final ByteBuf unwrapped = data.unwrap() != null && data.unwrap() instanceof CompositeByteBuf - ? data.unwrap() : data; - ReferenceCountUtil.retain(unwrapped); - ReferenceCountUtil.safeRelease(data); - - if (unwrapped instanceof CompositeByteBuf) { - CompositeByteBuf cbb = (CompositeByteBuf) unwrapped; - for (int i = 0; i < cbb.numComponents(); i++) { - ByteBuf b = cbb.component(i); - digest = update(digest, b, b.readerIndex(), b.readableBytes()); - } - } else { - digest = update(digest, unwrapped, unwrapped.readerIndex(), unwrapped.readableBytes()); - } + digest = update(digest, data, data.readerIndex(), data.readableBytes()); populateValueAndReset(digest, buf); @@ -159,11 +159,11 @@ private ReferenceCounted computeDigestAndPackageForSendingV2(long entryId, long buf.readerIndex(0); if (isSmallEntry) { - buf.writeBytes(unwrapped, unwrapped.readerIndex(), unwrapped.readableBytes()); - unwrapped.release(); + buf.writeBytes(data, data.readerIndex(), data.readableBytes()); + data.release(); return buf; } else { - return ByteBufList.get(buf, unwrapped); + return ByteBufList.get(buf, data); } } @@ -176,25 +176,9 @@ private ByteBufList computeDigestAndPackageForSendingV3(long entryId, long lastA headersBuffer.writeLong(length); int digest = update(0, headersBuffer, 0, METADATA_LENGTH); - - // don't unwrap slices - final ByteBuf unwrapped = data.unwrap() != null && data.unwrap() instanceof CompositeByteBuf - ? data.unwrap() : data; - ReferenceCountUtil.retain(unwrapped); - ReferenceCountUtil.release(data); - - if (unwrapped instanceof CompositeByteBuf) { - CompositeByteBuf cbb = ((CompositeByteBuf) unwrapped); - for (int i = 0; i < cbb.numComponents(); i++) { - ByteBuf b = cbb.component(i); - digest = update(digest, b, b.readerIndex(), b.readableBytes()); - } - } else { - digest = update(digest, unwrapped, unwrapped.readerIndex(), unwrapped.readableBytes()); - } + digest = update(digest, data, data.readerIndex(), data.readableBytes()); populateValueAndReset(digest, headersBuffer); - - return ByteBufList.get(headersBuffer, unwrapped); + return ByteBufList.get(headersBuffer, data); } /** @@ -373,4 +357,34 @@ public RecoveryData verifyDigestAndReturnLastConfirmed(ByteBuf dataReceived) thr long length = dataReceived.readLong(); return new RecoveryData(lastAddConfirmed, length); } + + private static class UpdateContext { + int digest; + + UpdateContext(int digest) { + this.digest = digest; + } + } + + private class DigestUpdaterByteBufVisitorCallback implements ByteBufVisitor.ByteBufVisitorCallback { + + @Override + public void visitBuffer(UpdateContext context, ByteBuf visitBuffer, int visitIndex, int visitLength) { + // recursively visit the sub buffer and update the digest + context.digest = internalUpdate(context.digest, visitBuffer, visitIndex, visitLength); + } + + @Override + public void visitArray(UpdateContext context, byte[] visitArray, int visitIndex, int visitLength) { + // update the digest with the array + context.digest = internalUpdate(context.digest, visitArray, visitIndex, visitLength); + } + + @Override + public boolean acceptsMemoryAddress(UpdateContext context) { + return DigestManager.this.acceptsMemoryAddressBuffer(); + } + } + + abstract boolean acceptsMemoryAddressBuffer(); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DirectMemoryCRC32Digest.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DirectMemoryCRC32Digest.java index eda223ef7f3..07a2bdf464f 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DirectMemoryCRC32Digest.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DirectMemoryCRC32Digest.java @@ -50,18 +50,32 @@ public void update(ByteBuf buf, int index, int length) { crcValue = (int) updateByteBuffer.invoke(null, crcValue, buf.memoryAddress(), index, length); } else if (buf.hasArray()) { // Use the internal method to update from array based - crcValue = (int) updateBytes.invoke(null, crcValue, buf.array(), buf.arrayOffset() + index, length); + crcValue = updateArray(crcValue, buf.array(), buf.arrayOffset() + index, length); } else { // Fallback to data copy if buffer is not contiguous byte[] b = new byte[length]; buf.getBytes(index, b, 0, length); - crcValue = (int) updateBytes.invoke(null, crcValue, b, 0, b.length); + crcValue = updateArray(crcValue, b, 0, length); } } catch (IllegalAccessException | InvocationTargetException e) { throw new RuntimeException(e); } } + private static int updateArray(int crcValue, byte[] buf, int offset, int length) + throws IllegalAccessException, InvocationTargetException { + return (int) updateBytes.invoke(null, crcValue, buf, offset, length); + } + + @Override + public void update(byte[] buffer, int offset, int len) { + try { + crcValue = updateArray(crcValue, buffer, offset, len); + } catch (IllegalAccessException | InvocationTargetException e) { + throw new RuntimeException(e); + } + } + private static final Method updateByteBuffer; private static final Method updateBytes; diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DummyDigestManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DummyDigestManager.java index b15499f0cc5..e2fff9bd7ca 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DummyDigestManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/DummyDigestManager.java @@ -38,7 +38,12 @@ int getMacCodeLength() { } @Override - int update(int digest, ByteBuf buffer, int offset, int len) { + int internalUpdate(int digest, ByteBuf buffer, int offset, int len) { + return 0; + } + + @Override + int internalUpdate(int digest, byte[] buffer, int offset, int len) { return 0; } @@ -49,4 +54,9 @@ void populateValueAndReset(int digest, ByteBuf buffer) {} boolean isInt32Digest() { return false; } + + @Override + boolean acceptsMemoryAddressBuffer() { + return false; + } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/MacDigestManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/MacDigestManager.java index c04c411c6c7..f9fda5a531d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/MacDigestManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/MacDigestManager.java @@ -96,13 +96,24 @@ void populateValueAndReset(int digest, ByteBuf buffer) { } @Override - int update(int digest, ByteBuf data, int offset, int len) { + int internalUpdate(int digest, ByteBuf data, int offset, int len) { mac.get().update(data.slice(offset, len).nioBuffer()); return 0; } + @Override + int internalUpdate(int digest, byte[] buffer, int offset, int len) { + mac.get().update(buffer, offset, len); + return 0; + } + @Override boolean isInt32Digest() { return false; } + + @Override + boolean acceptsMemoryAddressBuffer() { + return false; + } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/StandardCRC32Digest.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/StandardCRC32Digest.java index 3d48f0ef7da..7635e3e9f20 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/StandardCRC32Digest.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/checksum/StandardCRC32Digest.java @@ -39,4 +39,9 @@ public long getValueAndReset() { public void update(ByteBuf buf, int offset, int len) { crc.update(buf.slice(offset, len).nioBuffer()); } + + @Override + public void update(byte[] buffer, int offset, int len) { + crc.update(buffer, offset, len); + } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java index 3a0d7b2bdef..f690b99197b 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java @@ -22,7 +22,6 @@ import com.google.common.annotations.VisibleForTesting; import io.netty.buffer.ByteBuf; -import io.netty.buffer.CompositeByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; @@ -133,43 +132,14 @@ private static ByteBufList get() { * Append a {@link ByteBuf} at the end of this {@link ByteBufList}. */ public void add(ByteBuf buf) { - final ByteBuf unwrapped = buf.unwrap() != null && buf.unwrap() instanceof CompositeByteBuf - ? buf.unwrap() : buf; - ReferenceCountUtil.retain(unwrapped); - ReferenceCountUtil.release(buf); - - if (unwrapped instanceof CompositeByteBuf) { - ((CompositeByteBuf) unwrapped).forEach(b -> { - ReferenceCountUtil.retain(b); - buffers.add(b); - }); - ReferenceCountUtil.release(unwrapped); - } else { - buffers.add(unwrapped); - } + buffers.add(buf); } /** * Prepend a {@link ByteBuf} at the beginning of this {@link ByteBufList}. */ public void prepend(ByteBuf buf) { - // don't unwrap slices - final ByteBuf unwrapped = buf.unwrap() != null && buf.unwrap() instanceof CompositeByteBuf - ? buf.unwrap() : buf; - ReferenceCountUtil.retain(unwrapped); - ReferenceCountUtil.release(buf); - - if (unwrapped instanceof CompositeByteBuf) { - CompositeByteBuf composite = (CompositeByteBuf) unwrapped; - for (int i = composite.numComponents() - 1; i >= 0; i--) { - ByteBuf b = composite.component(i); - ReferenceCountUtil.retain(b); - buffers.add(0, b); - } - ReferenceCountUtil.release(unwrapped); - } else { - buffers.add(0, unwrapped); - } + buffers.add(0, buf); } /** @@ -285,7 +255,7 @@ public ByteBufList retain() { @Override protected void deallocate() { for (int i = 0; i < buffers.size(); i++) { - ReferenceCountUtil.release(buffers.get(i)); + buffers.get(i).release(); } buffers.clear(); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufVisitor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufVisitor.java new file mode 100644 index 00000000000..32e9c8c55a4 --- /dev/null +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufVisitor.java @@ -0,0 +1,1132 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.bookkeeper.util; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; +import io.netty.util.ByteProcessor; +import io.netty.util.concurrent.FastThreadLocal; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.channels.FileChannel; +import java.nio.channels.GatheringByteChannel; +import java.nio.channels.ScatteringByteChannel; +import java.nio.charset.Charset; + +/** + * This class visits the possible wrapped child buffers of a Netty {@link ByteBuf} for a given offset and length. + *

+ * The Netty ByteBuf API does not provide a method to visit the wrapped child buffers. The + * {@link ByteBuf#unwrap()} method is not suitable for this purpose as it loses the + * {@link ByteBuf#readerIndex()} state, resulting in incorrect offset and length information. + *

+ * Despite Netty not having a public API for visiting the sub buffers, it is possible to achieve this using + * the {@link ByteBuf#getBytes(int, ByteBuf, int, int)} method. This class uses this method to visit the + * wrapped child buffers by providing a suitable {@link ByteBuf} implementation. This implementation supports + * the role of the destination buffer for the getBytes call. It requires implementing the + * {@link ByteBuf#setBytes(int, ByteBuf, int, int)} and {@link ByteBuf#setBytes(int, byte[], int, int)} methods + * and other methods required by getBytes such as {@link ByteBuf#hasArray()}, {@link ByteBuf#hasMemoryAddress()}, + * {@link ByteBuf#nioBufferCount()} and {@link ByteBuf#capacity()}. + * All other methods in the internal ByteBuf implementation are not supported and will throw an exception. + * This is to ensure correctness and to fail fast if some ByteBuf implementation is not following the expected + * and supported interface contract. + */ +public class ByteBufVisitor { + private static final int DEFAULT_VISIT_MAX_DEPTH = 10; + + private ByteBufVisitor() { + // prevent instantiation + } + + /** + * This method traverses the potential nested composite buffers of the provided buffer, given a specific offset and + * length. The traversal continues until it encounters a buffer that is backed by an array or a memory address, + * which allows for the inspection of individual buffer segments without the need for data duplication. + * If no such wrapped buffer is found, the callback function is invoked with the original buffer, offset, + * and length as parameters. + * + * @param buffer the buffer to visit + * @param offset the offset for the buffer + * @param length the length for the buffer + * @param callback the callback to call for each visited buffer + * @param context the context to pass to the callback + */ + public static void visitBuffers(ByteBuf buffer, int offset, int length, ByteBufVisitorCallback callback, + T context) { + visitBuffers(buffer, offset, length, callback, context, DEFAULT_VISIT_MAX_DEPTH); + } + + /** + * The callback interface for visiting buffers. + * In case of a heap buffer that is backed by an byte[] array, the visitArray method is called. This + * is due to the internal implementation detail of the {@link ByteBuf#getBytes(int, ByteBuf, int, int)} + * method for heap buffers. + */ + public interface ByteBufVisitorCallback { + void visitBuffer(T context, ByteBuf visitBuffer, int visitIndex, int visitLength); + void visitArray(T context, byte[] visitArray, int visitIndex, int visitLength); + default boolean preferArrayOrMemoryAddress(T context) { + return true; + } + default boolean acceptsMemoryAddress(T context) { + return false; + } + } + + /** + * See @{@link #visitBuffers(ByteBuf, int, int, ByteBufVisitorCallback, Object)}. This method + * allows to specify the maximum depth of recursion for visiting wrapped buffers. + */ + public static void visitBuffers(ByteBuf buffer, int offset, int length, ByteBufVisitorCallback callback, + T context, int maxDepth) { + if (length == 0) { + // skip visiting empty buffers + return; + } + InternalContext internalContext = new InternalContext<>(); + internalContext.maxDepth = maxDepth; + internalContext.callbackContext = context; + internalContext.callback = callback; + internalContext.recursivelyVisitBuffers(buffer, offset, length); + } + + private static final int TL_COPY_BUFFER_SIZE = 64 * 1024; + private static final FastThreadLocal TL_COPY_BUFFER = new FastThreadLocal() { + @Override + protected byte[] initialValue() { + return new byte[TL_COPY_BUFFER_SIZE]; + } + }; + + private static class InternalContext { + int depth; + int maxDepth; + ByteBuf parentBuffer; + int parentOffset; + int parentLength; + T callbackContext; + ByteBufVisitorCallback callback; + GetBytesCallbackByteBuf callbackByteBuf = new GetBytesCallbackByteBuf(this); + + void recursivelyVisitBuffers(ByteBuf visitBuffer, int visitIndex, int visitLength) { + // visit the wrapped buffers recursively if the buffer is not backed by an array or memory address + // and the max depth has not been reached + if (depth < maxDepth && !visitBuffer.hasMemoryAddress() && !visitBuffer.hasArray()) { + parentBuffer = visitBuffer; + parentOffset = visitIndex; + parentLength = visitLength; + depth++; + // call getBytes to trigger the wrapped buffer visit + visitBuffer.getBytes(visitIndex, callbackByteBuf, 0, visitLength); + depth--; + } else { + passBufferToCallback(visitBuffer, visitIndex, visitLength); + } + } + + void handleBuffer(ByteBuf visitBuffer, int visitIndex, int visitLength) { + if (visitLength == 0) { + // skip visiting empty buffers + return; + } + if (visitBuffer == parentBuffer && visitIndex == parentOffset && visitLength == parentLength) { + // further recursion would cause unnecessary recursion up to the max depth of recursion + passBufferToCallback(visitBuffer, visitIndex, visitLength); + } else { + // use the doRecursivelyVisitBuffers method to visit the wrapped buffer, possibly recursively + recursivelyVisitBuffers(visitBuffer, visitIndex, visitLength); + } + } + + private void passBufferToCallback(ByteBuf visitBuffer, int visitIndex, int visitLength) { + if (callback.preferArrayOrMemoryAddress(callbackContext)) { + if (visitBuffer.hasArray()) { + handleArray(visitBuffer.array(), visitBuffer.arrayOffset() + visitIndex, visitLength); + } else if (visitBuffer.hasMemoryAddress() && callback.acceptsMemoryAddress(callbackContext)) { + callback.visitBuffer(callbackContext, visitBuffer, visitIndex, visitLength); + } else if (callback.acceptsMemoryAddress(callbackContext) && visitBuffer.isDirect() + && visitBuffer.alloc().isDirectBufferPooled()) { + // read-only buffers need to be copied before they can be directly accessed + ByteBuf copyBuffer = visitBuffer.copy(visitIndex, visitLength); + callback.visitBuffer(callbackContext, copyBuffer, 0, visitLength); + copyBuffer.release(); + } else { + // fallback to reading the visited buffer into the copy buffer in a loop + byte[] copyBuffer = TL_COPY_BUFFER.get(); + int remaining = visitLength; + int currentOffset = visitIndex; + while (remaining > 0) { + int readLen = Math.min(remaining, copyBuffer.length); + visitBuffer.getBytes(currentOffset, copyBuffer, 0, readLen); + handleArray(copyBuffer, 0, readLen); + remaining -= readLen; + currentOffset += readLen; + } + } + } else { + callback.visitBuffer(callbackContext, visitBuffer, visitIndex, visitLength); + } + } + + void handleArray(byte[] visitArray, int visitIndex, int visitLength) { + if (visitLength == 0) { + // skip visiting empty arrays + return; + } + // pass array to callback + callback.visitArray(callbackContext, visitArray, visitIndex, visitLength); + } + } + + /** + * A ByteBuf implementation that can be used as the destination buffer for + * a {@link ByteBuf#getBytes(int, ByteBuf)} for visiting the wrapped child buffers. + */ + static class GetBytesCallbackByteBuf extends ByteBuf { + private final InternalContext internalContext; + + GetBytesCallbackByteBuf(InternalContext internalContext) { + this.internalContext = internalContext; + } + + @Override + public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length) { + internalContext.handleBuffer(src, srcIndex, length); + return this; + } + + @Override + public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length) { + internalContext.handleArray(src, srcIndex, length); + return this; + } + + @Override + public boolean hasArray() { + // return false so that the wrapped buffer is visited + return false; + } + + @Override + public boolean hasMemoryAddress() { + // return false so that the wrapped buffer is visited + return false; + } + + @Override + public int nioBufferCount() { + // return 0 so that the wrapped buffer is visited + return 0; + } + + @Override + public int capacity() { + // should return sufficient capacity for the total length + return Integer.MAX_VALUE; + } + + @Override + public ByteBuf capacity(int newCapacity) { + throw new UnsupportedOperationException(); + } + + @Override + public int maxCapacity() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBufAllocator alloc() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteOrder order() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf order(ByteOrder endianness) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf unwrap() { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isDirect() { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isReadOnly() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf asReadOnly() { + throw new UnsupportedOperationException(); + } + + @Override + public int readerIndex() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf readerIndex(int readerIndex) { + throw new UnsupportedOperationException(); + } + + @Override + public int writerIndex() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writerIndex(int writerIndex) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setIndex(int readerIndex, int writerIndex) { + throw new UnsupportedOperationException(); + } + + @Override + public int readableBytes() { + throw new UnsupportedOperationException(); + } + + @Override + public int writableBytes() { + throw new UnsupportedOperationException(); + } + + @Override + public int maxWritableBytes() { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isReadable() { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isReadable(int size) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isWritable() { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isWritable(int size) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf clear() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf markReaderIndex() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf resetReaderIndex() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf markWriterIndex() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf resetWriterIndex() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf discardReadBytes() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf discardSomeReadBytes() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf ensureWritable(int minWritableBytes) { + throw new UnsupportedOperationException(); + } + + @Override + public int ensureWritable(int minWritableBytes, boolean force) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean getBoolean(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public byte getByte(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public short getUnsignedByte(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public short getShort(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public short getShortLE(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public int getUnsignedShort(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public int getUnsignedShortLE(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public int getMedium(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public int getMediumLE(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public int getUnsignedMedium(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public int getUnsignedMediumLE(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public int getInt(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public int getIntLE(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public long getUnsignedInt(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public long getUnsignedIntLE(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public long getLong(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public long getLongLE(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public char getChar(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public float getFloat(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public double getDouble(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf getBytes(int index, ByteBuf dst) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf getBytes(int index, ByteBuf dst, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf getBytes(int index, byte[] dst) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf getBytes(int index, ByteBuffer dst) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public int getBytes(int index, GatheringByteChannel out, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public int getBytes(int index, FileChannel out, long position, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public CharSequence getCharSequence(int index, int length, Charset charset) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setBoolean(int index, boolean value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setByte(int index, int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setShort(int index, int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setShortLE(int index, int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setMedium(int index, int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setMediumLE(int index, int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setInt(int index, int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setIntLE(int index, int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setLong(int index, long value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setLongLE(int index, long value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setChar(int index, int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setFloat(int index, float value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setDouble(int index, double value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setBytes(int index, ByteBuf src) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setBytes(int index, ByteBuf src, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setBytes(int index, byte[] src) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setBytes(int index, ByteBuffer src) { + throw new UnsupportedOperationException(); + } + + @Override + public int setBytes(int index, InputStream in, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public int setBytes(int index, FileChannel in, long position, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf setZero(int index, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public int setCharSequence(int index, CharSequence sequence, Charset charset) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean readBoolean() { + throw new UnsupportedOperationException(); + } + + @Override + public byte readByte() { + throw new UnsupportedOperationException(); + } + + @Override + public short readUnsignedByte() { + throw new UnsupportedOperationException(); + } + + @Override + public short readShort() { + throw new UnsupportedOperationException(); + } + + @Override + public short readShortLE() { + throw new UnsupportedOperationException(); + } + + @Override + public int readUnsignedShort() { + throw new UnsupportedOperationException(); + } + + @Override + public int readUnsignedShortLE() { + throw new UnsupportedOperationException(); + } + + @Override + public int readMedium() { + throw new UnsupportedOperationException(); + } + + @Override + public int readMediumLE() { + throw new UnsupportedOperationException(); + } + + @Override + public int readUnsignedMedium() { + throw new UnsupportedOperationException(); + } + + @Override + public int readUnsignedMediumLE() { + throw new UnsupportedOperationException(); + } + + @Override + public int readInt() { + throw new UnsupportedOperationException(); + } + + @Override + public int readIntLE() { + throw new UnsupportedOperationException(); + } + + @Override + public long readUnsignedInt() { + throw new UnsupportedOperationException(); + } + + @Override + public long readUnsignedIntLE() { + throw new UnsupportedOperationException(); + } + + @Override + public long readLong() { + throw new UnsupportedOperationException(); + } + + @Override + public long readLongLE() { + throw new UnsupportedOperationException(); + } + + @Override + public char readChar() { + throw new UnsupportedOperationException(); + } + + @Override + public float readFloat() { + throw new UnsupportedOperationException(); + } + + @Override + public double readDouble() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf readBytes(int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf readSlice(int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf readRetainedSlice(int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf readBytes(ByteBuf dst) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf readBytes(ByteBuf dst, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf readBytes(ByteBuf dst, int dstIndex, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf readBytes(byte[] dst) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf readBytes(byte[] dst, int dstIndex, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf readBytes(ByteBuffer dst) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf readBytes(OutputStream out, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public int readBytes(GatheringByteChannel out, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public CharSequence readCharSequence(int length, Charset charset) { + throw new UnsupportedOperationException(); + } + + @Override + public int readBytes(FileChannel out, long position, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf skipBytes(int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeBoolean(boolean value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeByte(int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeShort(int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeShortLE(int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeMedium(int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeMediumLE(int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeInt(int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeIntLE(int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeLong(long value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeLongLE(long value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeChar(int value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeFloat(float value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeDouble(double value) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeBytes(ByteBuf src) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeBytes(ByteBuf src, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeBytes(ByteBuf src, int srcIndex, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeBytes(byte[] src) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeBytes(byte[] src, int srcIndex, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeBytes(ByteBuffer src) { + throw new UnsupportedOperationException(); + } + + @Override + public int writeBytes(InputStream in, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public int writeBytes(ScatteringByteChannel in, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public int writeBytes(FileChannel in, long position, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf writeZero(int length) { + throw new UnsupportedOperationException(); + } + + @Override + public int writeCharSequence(CharSequence sequence, Charset charset) { + throw new UnsupportedOperationException(); + } + + @Override + public int indexOf(int fromIndex, int toIndex, byte value) { + throw new UnsupportedOperationException(); + } + + @Override + public int bytesBefore(byte value) { + throw new UnsupportedOperationException(); + } + + @Override + public int bytesBefore(int length, byte value) { + throw new UnsupportedOperationException(); + } + + @Override + public int bytesBefore(int index, int length, byte value) { + throw new UnsupportedOperationException(); + } + + @Override + public int forEachByte(ByteProcessor processor) { + throw new UnsupportedOperationException(); + } + + @Override + public int forEachByte(int index, int length, ByteProcessor processor) { + throw new UnsupportedOperationException(); + } + + @Override + public int forEachByteDesc(ByteProcessor processor) { + throw new UnsupportedOperationException(); + } + + @Override + public int forEachByteDesc(int index, int length, ByteProcessor processor) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf copy() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf copy(int index, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf slice() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf retainedSlice() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf slice(int index, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf retainedSlice(int index, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf duplicate() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf retainedDuplicate() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuffer nioBuffer() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuffer nioBuffer(int index, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuffer internalNioBuffer(int index, int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuffer[] nioBuffers() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuffer[] nioBuffers(int index, int length) { + throw new UnsupportedOperationException(); + } + + + @Override + public byte[] array() { + throw new UnsupportedOperationException(); + } + + @Override + public int arrayOffset() { + throw new UnsupportedOperationException(); + } + @Override + public long memoryAddress() { + throw new UnsupportedOperationException(); + } + + @Override + public String toString(Charset charset) { + throw new UnsupportedOperationException(); + } + + @Override + public String toString(int index, int length, Charset charset) { + throw new UnsupportedOperationException(); + } + + @Override + public int compareTo(ByteBuf buffer) { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf retain(int increment) { + throw new UnsupportedOperationException(); + } + + @Override + public int refCnt() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf retain() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf touch() { + throw new UnsupportedOperationException(); + } + + @Override + public ByteBuf touch(Object hint) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean release() { + throw new UnsupportedOperationException(); + } + + @Override + public boolean release(int decrement) { + throw new UnsupportedOperationException(); + } + + @Override + public String toString() { + return getClass().getSimpleName() + '@' + Integer.toHexString(System.identityHashCode(this)); + } + + @Override + public int hashCode() { + return System.identityHashCode(this); + } + + @Override + public boolean equals(Object obj) { + return obj == this; + } + } + +} diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/checksum/CompositeByteBufUnwrapBugReproduceTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/checksum/CompositeByteBufUnwrapBugReproduceTest.java new file mode 100644 index 00000000000..6252bb71be9 --- /dev/null +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/checksum/CompositeByteBufUnwrapBugReproduceTest.java @@ -0,0 +1,280 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.bookkeeper.proto.checksum; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +import com.scurrilous.circe.checksum.IntHash; +import com.scurrilous.circe.checksum.Java8IntHash; +import com.scurrilous.circe.checksum.Java9IntHash; +import com.scurrilous.circe.checksum.JniIntHash; +import com.scurrilous.circe.crc.Sse42Crc32C; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; +import io.netty.buffer.ByteBufUtil; +import io.netty.buffer.CompositeByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.util.ReferenceCounted; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import org.apache.bookkeeper.proto.BookieProtoEncoding; +import org.apache.bookkeeper.proto.BookieProtocol; +import org.apache.bookkeeper.util.ByteBufList; +import org.apache.bookkeeper.util.ByteBufVisitor; +import org.apache.commons.lang3.RandomUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +/** + * This test class was added to reproduce a bug in the checksum calculation when + * the payload is a CompositeByteBuf and this buffer has a reader index state other than 0. + * The reader index state gets lost in the unwrapping process. + * + * There were at least 2 different bugs. One that occured when the + * payload was >= BookieProtoEncoding.SMALL_ENTRY_SIZE_THRESHOLD and the other when + * it was < BookieProtoEncoding.SMALL_ENTRY_SIZE_THRESHOLD. + * This test covers both useV2Protocol=true and useV2Protocol=false since the bug was triggered differently. + * + * The bug has been fixed and this test is here to make sure it doesn't happen again. + */ +@RunWith(Parameterized.class) +public class CompositeByteBufUnwrapBugReproduceTest { + final byte[] testPayLoad; + final int defaultBufferPrefixLength; + private final boolean useV2Protocol; + + // set to 0 to 3 to run a single scenario for debugging purposes + private static final int RUN_SINGLE_SCENARIO_FOR_DEBUGGING = -1; + + @Parameterized.Parameters + public static Collection testScenarios() { + List scenarios = Arrays.asList(new Object[][] { + {BookieProtoEncoding.SMALL_ENTRY_SIZE_THRESHOLD - 1, true}, + {BookieProtoEncoding.SMALL_ENTRY_SIZE_THRESHOLD - 1, false}, + {BookieProtoEncoding.SMALL_ENTRY_SIZE_THRESHOLD, true}, + {BookieProtoEncoding.SMALL_ENTRY_SIZE_THRESHOLD, false} + }); + if (RUN_SINGLE_SCENARIO_FOR_DEBUGGING >= 0) { + // pick a single scenario for debugging + scenarios = scenarios.subList(RUN_SINGLE_SCENARIO_FOR_DEBUGGING, 1); + } + return scenarios; + } + + public CompositeByteBufUnwrapBugReproduceTest(int payloadSize, boolean useV2Protocol) { + this.testPayLoad = createTestPayLoad(payloadSize); + this.defaultBufferPrefixLength = payloadSize / 7; + this.useV2Protocol = useV2Protocol; + } + + private static byte[] createTestPayLoad(int payloadSize) { + byte[] payload = new byte[payloadSize]; + for (int i = 0; i < payloadSize; i++) { + payload[i] = (byte) i; + } + return payload; + } + + + /** + * A DigestManager that uses the given IntHash implementation for testing. + */ + static class TestIntHashDigestManager extends DigestManager { + private final IntHash intHash; + + public TestIntHashDigestManager(IntHash intHash, long ledgerId, boolean useV2Protocol, + ByteBufAllocator allocator) { + super(ledgerId, useV2Protocol, allocator); + this.intHash = intHash; + } + + @Override + int getMacCodeLength() { + return 4; + } + + @Override + boolean isInt32Digest() { + return true; + } + + @Override + void populateValueAndReset(int digest, ByteBuf buf) { + buf.writeInt(digest); + } + + @Override + int internalUpdate(int digest, ByteBuf data, int offset, int len) { + return intHash.resume(digest, data, offset, len); + } + + @Override + int internalUpdate(int digest, byte[] buffer, int offset, int len) { + return intHash.resume(digest, buffer, offset, len); + } + + @Override + boolean acceptsMemoryAddressBuffer() { + return intHash.acceptsMemoryAddressBuffer(); + } + } + + @Test + public void shouldCalculateChecksumForCompositeBuffer() { + ByteBuf testPayload = Unpooled.wrappedBuffer(testPayLoad); + byte[] referenceOutput = computeDigestAndPackageForSending(new Java8IntHash(), testPayload.retainedDuplicate()); + assertDigestAndPackageMatchesReference(new Java8IntHash(), testPayload, referenceOutput); + assertDigestAndPackageMatchesReference(new Java9IntHash(), testPayload, referenceOutput); + if (Sse42Crc32C.isSupported()) { + assertDigestAndPackageMatchesReference(new JniIntHash(), testPayload, referenceOutput); + } + testPayload.release(); + } + + private void assertDigestAndPackageMatchesReference(IntHash intHash, ByteBuf payload, byte[] referenceOutput) { + assertDigestAndPackageScenario(intHash, payload.retainedDuplicate(), referenceOutput, testPayLoad, + "plain payload, no wrapping"); + + ByteBuf payload2 = wrapWithPrefixAndCompositeByteBufWithReaderIndexState(payload.retainedDuplicate(), + defaultBufferPrefixLength); + assertDigestAndPackageScenario(intHash, payload2, referenceOutput, testPayLoad, + "payload with prefix wrapped in CompositeByteBuf with readerIndex state"); + + ByteBuf payload3 = wrapWithPrefixAndMultipleCompositeByteBufWithReaderIndexStateAndMultipleLayersOfDuplicate( + payload.retainedDuplicate(), defaultBufferPrefixLength); + assertDigestAndPackageScenario(intHash, payload3, referenceOutput, testPayLoad, + "payload with prefix wrapped in 2 layers of CompositeByteBuf with readerIndex state in the outer " + + "composite. In addition, the outer composite is duplicated twice."); + + ByteBuf payload4 = wrapInCompositeByteBufAndSlice(payload.retainedDuplicate(), defaultBufferPrefixLength); + assertDigestAndPackageScenario(intHash, payload4, referenceOutput, testPayLoad, + "payload with prefix wrapped in CompositeByteBuf and sliced"); + } + + private void assertDigestAndPackageScenario(IntHash intHash, ByteBuf payload, byte[] referenceOutput, + byte[] testPayLoadArray, + String scenario) { + // this validates that the readable bytes in the payload match the TEST_PAYLOAD content + assertArrayEquals(testPayLoadArray, ByteBufUtil.getBytes(payload.duplicate()), + "input is invalid for scenario '" + scenario + "'"); + + ByteBuf visitedCopy = Unpooled.buffer(payload.readableBytes()); + ByteBufVisitor.visitBuffers(payload, payload.readerIndex(), payload.readableBytes(), + new ByteBufVisitor.ByteBufVisitorCallback() { + @Override + public void visitBuffer(Void context, ByteBuf visitBuffer, int visitIndex, int visitLength) { + visitedCopy.writeBytes(visitBuffer, visitIndex, visitLength); + } + + @Override + public void visitArray(Void context, byte[] visitArray, int visitIndex, int visitLength) { + visitedCopy.writeBytes(visitArray, visitIndex, visitLength); + } + }, null); + + assertArrayEquals(ByteBufUtil.getBytes(visitedCopy), testPayLoadArray, + "visited copy is invalid for scenario '" + scenario + "'. Bug in ByteBufVisitor?"); + + // compute the digest and package + byte[] output = computeDigestAndPackageForSending(intHash, payload.duplicate()); + if (referenceOutput == null) { + referenceOutput = + computeDigestAndPackageForSending(new Java8IntHash(), Unpooled.wrappedBuffer(testPayLoadArray)); + } + // this validates that the output matches the reference output + assertArrayEquals(referenceOutput, output, "output is invalid for scenario '" + scenario + "'"); + } + + private byte[] computeDigestAndPackageForSending(IntHash intHash, ByteBuf data) { + DigestManager digestManager = new TestIntHashDigestManager(intHash, 1, useV2Protocol, ByteBufAllocator.DEFAULT); + ReferenceCounted packagedBuffer = + digestManager.computeDigestAndPackageForSending(1, 0, data.readableBytes(), data, + MacDigestManager.EMPTY_LEDGER_KEY, BookieProtocol.FLAG_NONE); + return packagedBufferToBytes(packagedBuffer); + } + + ByteBuf wrapWithPrefixAndCompositeByteBufWithReaderIndexState(ByteBuf payload, int bufferPrefixLength) { + // create a new buffer with a prefix and the actual payload + ByteBuf prefixedPayload = ByteBufAllocator.DEFAULT.buffer(bufferPrefixLength + payload.readableBytes()); + prefixedPayload.writeBytes(RandomUtils.nextBytes(bufferPrefixLength)); + prefixedPayload.writeBytes(payload); + + // wrap the buffer in a composite buffer + CompositeByteBuf outerComposite = ByteBufAllocator.DEFAULT.compositeBuffer(); + outerComposite.addComponent(true, prefixedPayload); + + // set reader index state. this is the state that gets lost in the unwrapping process + outerComposite.readerIndex(bufferPrefixLength); + + return outerComposite; + } + + ByteBuf wrapWithPrefixAndMultipleCompositeByteBufWithReaderIndexStateAndMultipleLayersOfDuplicate(ByteBuf payload, + int bufferPrefixLength) { + // create a new buffer with a prefix and the actual payload + ByteBuf prefixedPayload = ByteBufAllocator.DEFAULT.buffer(bufferPrefixLength + payload.readableBytes()); + prefixedPayload.writeBytes(RandomUtils.nextBytes(bufferPrefixLength)); + prefixedPayload.writeBytes(payload); + + CompositeByteBuf innerComposite = ByteBufAllocator.DEFAULT.compositeBuffer(); + innerComposite.addComponent(true, prefixedPayload); + innerComposite.addComponent(true, Unpooled.EMPTY_BUFFER); + + // wrap the buffer in a composite buffer + CompositeByteBuf outerComposite = ByteBufAllocator.DEFAULT.compositeBuffer(); + outerComposite.addComponent(true, innerComposite); + outerComposite.addComponent(true, Unpooled.EMPTY_BUFFER); + + // set reader index state. this is the state that gets lost in the unwrapping process + outerComposite.readerIndex(bufferPrefixLength); + + return outerComposite.duplicate().duplicate(); + } + + ByteBuf wrapInCompositeByteBufAndSlice(ByteBuf payload, int bufferPrefixLength) { + // create a composite buffer + CompositeByteBuf compositeWithPrefix = ByteBufAllocator.DEFAULT.compositeBuffer(); + compositeWithPrefix.addComponent(true, Unpooled.wrappedBuffer(RandomUtils.nextBytes(bufferPrefixLength))); + compositeWithPrefix.addComponent(true, payload); + + // return a slice of the composite buffer so that it returns the payload + return compositeWithPrefix.slice(bufferPrefixLength, payload.readableBytes()); + } + + private static byte[] packagedBufferToBytes(ReferenceCounted packagedBuffer) { + byte[] output; + if (packagedBuffer instanceof ByteBufList) { + ByteBufList bufList = (ByteBufList) packagedBuffer; + output = new byte[bufList.readableBytes()]; + bufList.getBytes(output); + for (int i = 0; i < bufList.size(); i++) { + bufList.getBuffer(i).release(); + } + } else if (packagedBuffer instanceof ByteBuf) { + output = ByteBufUtil.getBytes((ByteBuf) packagedBuffer); + packagedBuffer.release(); + } else { + throw new RuntimeException("Unexpected type: " + packagedBuffer.getClass()); + } + return output; + } +} \ No newline at end of file diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java index ac7aca77226..88de17d0a9d 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java @@ -23,7 +23,6 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; -import io.netty.buffer.CompositeByteBuf; import io.netty.buffer.PooledByteBufAllocator; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; @@ -87,39 +86,6 @@ public void testDouble() throws Exception { assertEquals(b2.refCnt(), 0); } - @Test - public void testComposite() throws Exception { - ByteBuf b1 = PooledByteBufAllocator.DEFAULT.heapBuffer(128, 128); - b1.writerIndex(b1.capacity()); - ByteBuf b2 = PooledByteBufAllocator.DEFAULT.heapBuffer(128, 128); - b2.writerIndex(b2.capacity()); - - CompositeByteBuf composite = PooledByteBufAllocator.DEFAULT.compositeBuffer(); - composite.addComponent(b1); - composite.addComponent(b2); - - ByteBufList buf = ByteBufList.get(composite); - - // composite is unwrapped into two parts - assertEquals(2, buf.size()); - // and released - assertEquals(composite.refCnt(), 0); - - assertEquals(256, buf.readableBytes()); - assertEquals(b1, buf.getBuffer(0)); - assertEquals(b2, buf.getBuffer(1)); - - assertEquals(buf.refCnt(), 1); - assertEquals(b1.refCnt(), 1); - assertEquals(b2.refCnt(), 1); - - buf.release(); - - assertEquals(buf.refCnt(), 0); - assertEquals(b1.refCnt(), 0); - assertEquals(b2.refCnt(), 0); - } - @Test public void testClone() throws Exception { ByteBuf b1 = PooledByteBufAllocator.DEFAULT.heapBuffer(128, 128); diff --git a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Crc32cIntChecksum.java b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Crc32cIntChecksum.java index 65a77b1492b..d90f8b7ea5d 100644 --- a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Crc32cIntChecksum.java +++ b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Crc32cIntChecksum.java @@ -71,12 +71,30 @@ public static int resumeChecksum(int previousChecksum, ByteBuf payload) { /** * Computes incremental checksum with input previousChecksum and input payload * - * @param previousChecksum : previously computed checksum - * @param payload - * @return + * @param previousChecksum the previously computed checksum + * @param payload the data for which the checksum is to be computed + * @param offset the starting position in the payload + * @param len the number of bytes to include in the checksum computation + * @return the updated checksum */ public static int resumeChecksum(int previousChecksum, ByteBuf payload, int offset, int len) { return CRC32C_HASH.resume(previousChecksum, payload, offset, len); } + /** + * Computes incremental checksum with input previousChecksum and input payload + * + * @param previousChecksum the previously computed checksum + * @param payload the data for which the checksum is to be computed + * @param offset the starting position in the payload + * @param len the number of bytes to include in the checksum computation + * @return the updated checksum + */ + public static int resumeChecksum(int previousChecksum, byte[] payload, int offset, int len) { + return CRC32C_HASH.resume(previousChecksum, payload, offset, len); + } + + public static boolean acceptsMemoryAddressBuffer() { + return CRC32C_HASH.acceptsMemoryAddressBuffer(); + } } diff --git a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/IntHash.java b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/IntHash.java index e8922e3a16b..be98ae19be1 100644 --- a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/IntHash.java +++ b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/IntHash.java @@ -28,4 +28,8 @@ public interface IntHash { int resume(int current, ByteBuf buffer); int resume(int current, ByteBuf buffer, int offset, int len); + + int resume(int current, byte[] buffer, int offset, int len); + + boolean acceptsMemoryAddressBuffer(); } diff --git a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java8IntHash.java b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java8IntHash.java index fd548bc4de4..2825c610b11 100644 --- a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java8IntHash.java +++ b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java8IntHash.java @@ -53,4 +53,14 @@ public int resume(int current, ByteBuf buffer, int offset, int len) { return hash.resume(current, buffer.slice(offset, len).nioBuffer()); } } + + @Override + public int resume(int current, byte[] buffer, int offset, int len) { + return hash.resume(current, buffer, offset, len); + } + + @Override + public boolean acceptsMemoryAddressBuffer() { + return false; + } } diff --git a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java index 31af153666e..2e779a92766 100644 --- a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java +++ b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java @@ -19,7 +19,6 @@ package com.scurrilous.circe.checksum; import io.netty.buffer.ByteBuf; -import io.netty.buffer.CompositeByteBuf; import io.netty.util.concurrent.FastThreadLocal; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -77,7 +76,7 @@ public int calculate(ByteBuf buffer, int offset, int len) { return resume(0, buffer, offset, len); } - private int resume(int current, long address, int offset, int length) { + private int updateDirectByteBuffer(int current, long address, int offset, int length) { try { return (int) UPDATE_DIRECT_BYTEBUFFER.invoke(null, current, address, offset, offset + length); } catch (IllegalAccessException | InvocationTargetException e) { @@ -85,7 +84,20 @@ private int resume(int current, long address, int offset, int length) { } } - private int resume(int current, byte[] array, int offset, int length) { + @Override + public int resume(int current, byte[] array, int offset, int length) { + // the bit-wise complementing of the input and output is explained in the resume method below + current = ~current; + current = updateBytes(current, array, offset, length); + return ~current; + } + + @Override + public boolean acceptsMemoryAddressBuffer() { + return true; + } + + private static int updateBytes(int current, byte[] array, int offset, int length) { try { return (int) UPDATE_BYTES.invoke(null, current, array, offset, offset + length); } catch (IllegalAccessException | InvocationTargetException e) { @@ -100,33 +112,37 @@ public int resume(int current, ByteBuf buffer) { @Override public int resume(int current, ByteBuf buffer, int offset, int len) { - int negCrc = ~current; + // The input value is bit-wise complemented for two reasons: + // 1. The CRC32C algorithm is designed to start with a seed value where all bits are set to 1 (0xffffffff). + // When 0 is initially passed in, ~0 results in the correct initial value (0xffffffff). + // 2. The CRC32C algorithm complements the final value as the last step. This method will always complement + // the return value. Therefore, when the algorithm is used iteratively, it is necessary to complement + // the input value to continue calculations. + // This allows the algorithm to be used incrementally without needing separate initialization and + // finalization steps. + current = ~current; if (buffer.hasMemoryAddress()) { - negCrc = resume(negCrc, buffer.memoryAddress(), offset, len); + current = updateDirectByteBuffer(current, buffer.memoryAddress(), offset, len); } else if (buffer.hasArray()) { int arrayOffset = buffer.arrayOffset() + offset; - negCrc = resume(negCrc, buffer.array(), arrayOffset, len); - } else if (buffer instanceof CompositeByteBuf) { - CompositeByteBuf compositeByteBuf = (CompositeByteBuf) buffer; - int loopedCurrent = current; - for (int i = 0; i < compositeByteBuf.numComponents(); i ++) { - loopedCurrent = resume(loopedCurrent, compositeByteBuf.component(i)); - } - return loopedCurrent; + current = updateBytes(current, buffer.array(), arrayOffset, len); } else { byte[] b = TL_BUFFER.get(); int toRead = len; int loopOffset = offset; while (toRead > 0) { int length = Math.min(toRead, b.length); - buffer.slice(loopOffset, length).readBytes(b, 0, length); - negCrc = resume(negCrc, b, 0, length); + buffer.getBytes(loopOffset, b, 0, length); + current = updateBytes(current, b, 0, length); toRead -= length; loopOffset += length; } } - return ~negCrc; + // The current value is complemented to align with the finalization step of the CRC32C algorithm. + // If there is a subsequent resume step, the value will be complemented again to initiate the next step + // as described in the comments in the beginning of this method. + return ~current; } } diff --git a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/JniIntHash.java b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/JniIntHash.java index e8e87bf6b1a..dc5bed0fc1c 100644 --- a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/JniIntHash.java +++ b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/JniIntHash.java @@ -51,4 +51,14 @@ public int resume(int current, ByteBuf buffer, int offset, int len) { return hash.resume(current, buffer.slice(offset, len).nioBuffer()); } } + + @Override + public int resume(int current, byte[] buffer, int offset, int len) { + return hash.resume(current, buffer, offset, len); + } + + @Override + public boolean acceptsMemoryAddressBuffer() { + return true; + } } From b02ba5662b5d169f36060e585cc10b17cb218125 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 9 Feb 2024 08:31:10 -0800 Subject: [PATCH 111/233] [branch-4.16] Fix CI in branch-4.16 (#4206) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add support for Junit5 tests and fix CI that has been broken (#4197) * Add support for Junit5 tests - upgrade surefire plugin - replace always with supported way in newer maven-surefire-plugin - maven-failsafe-plugin version must match maven-surefire-plugin version - remove invalid test case. Log4j is in the classpath for other reasons checked by running "mvn -pl tests/integration-tests-utils/pom.xml test -X" also verified by debugging that it's not in the system classpath, it is loaded by the MavenClassLoader - add assertj-core for fluent assertions in tests * Upgrade arquillian-junit-standalone * Fix error in pom.xml * Fix java.lang.ClassNotFoundException: javax.ws.rs.ProcessingException * Pick docker-java-api version that is compatible with arquillian-cube-docker * Fix snakeyaml issue * Fix running of bookkeeper in Docker in tests * Improve GitHub Actions CI workflow logging * Increase client tests timeout * Add script for picking fast ubuntu mirror for docker build * upgrade maven-dependency-plugin version (used for copying .tar.gz for docker image building) * Fix building of the docker image * Increase timeouts for integration tests * Use eclipse-temurin base image * Replace "FROM ubuntu:22.10" with "FROM ubuntu:22.04" to use LTS version of ubuntu 22.10 (kinetic) is EOL since July 20 2023 * Build docker image also for backward-compatibility-tests * Install gpg that is required by the scripts * Add UBUNTU_MIRROR * Remove redundancy from integration tests * Fix missing dependency * Fix classpath issues for arquillian-cube * Upgrade actions versions * Fix invalid references in native-io/pom.xml * Fix circe-checksum native library compilation * Migrate Gradle specific settings to Maven * Another attempt to disable backward-compat tests in integration test build job * Add working solution for skipping backward compat tests in the int tests * Attempt to fix issue in locating the file * Fix tar file extraction * Improve solution * Backward compat tests build commands without int tests * Copy tune-runner-vm and clean-disk from Pulsar CI and clean disk * Revisit skipping of backward compat tests once again * Use similar MAVEN_OPTS as there is in Pulsar * Fix directory * Add way to find git root directory * Revisit one more time * Add current-version-image back * Enable tests for backwardCompatTests * Don't create /ledgers in ZK if it already exists * Add uncaughtexceptionhandler * Add exclusions for reload4j * Use maven-surefire 2.8.1 for certain tests * Add failing test back in, also fails with surefire 2.8.1 * Exclude logging implementations * Revert "Use maven-surefire 2.8.1 for certain tests" This reverts commit 94e2b8eb959c8d7559edd13d7ebe2c0637bf8ab9. * Exclude log4j * Add instructions how to run on Mac Apple Silicon * Find slf4j version * Block loading some classes * Change context classloader while creating new bookkeeper * Route commons logging to slf4j * Update shrinkwrap.version * Wait for ZK client to shutdown before returning from close * Upgrade Groovy version * Remove arquillian-junit-container which causes tests to be run twice * Skip backward compat tests unless -DbackwardCompatTests is passed * Delay closing of classloaders by 5 seconds * Fix checkstyle * Improve instructions for running tests * Upgrade Testcontainers and import the bom in dependencyManagement * Fix synchronization bug pointed out by spotbugs * upgrade markdown-link-check * Ignore checking Google calendar for dead links * Ignore anchors * Add 2 more patterns to dead link checker exclusions * Collect logs * Log integration tests to console to observe progress, disable retries * Use maven version provided by GitHub Action runner * Improve instructions for docker socket proxy * Add test timeout of 5 minutes for BookieShellTestBase * Fix test to match changes made in e41d6728 * Upgrade mockito to 4.11.0 * Align hamcrest with junit * Revert "Upgrade mockito to 4.11.0" This reverts commit 55b7fcd4ca3d83534f2ce328bc35d3a666a4b622. * Make JAVA_HOME optional * Tune Java's DNS cache timeouts for docker images * Use different directory for JDK 8 * Add tooling to containers that help debugging * Upgrade JMH version and configuration * Specify maven.compiler.release to fix issues with building with Java 11 * Remove gmavenplus plugin since there's already groovy-eclipse compiler in use * Upgrade apache-rat-plugin * Fix validation step * Don't import shaded class * Move freebuilder out of distributed libraries (there was invalid config for the annotation processor) * Remove use of shaded class in test * Upgrade junit5, assertj-core & awaitility to latest stable * Fix simpletest logic - LAC is updated asynchronously. Entries might be unconfirmed when read before ledger is closed. - The last entry id passed to the read method was invalid * Fix SimpleTestCommandTest --------- Co-authored-by: Matteo Merli (cherry picked from commit 7bd91a7edc2b2aa1ebf8527db732a79872077b69) * Fix logging configurations are broken in docker image (#4137) (cherry picked from commit 9dab13911c3b9c6917a3a19328250e343a5c212a) --------- Co-authored-by: 萧易客 --- .dlc.json | 12 + .github/actions/clean-disk/action.yml | 57 +++++ .github/actions/tune-runner-vm/action.yml | 73 +++++- .github/workflows/bk-ci.yml | 192 ++++++++------ .github/workflows/bk-streamstorage-python.yml | 18 +- .github/workflows/bot.yml | 4 +- .github/workflows/dead-link-checker.yaml | 6 +- .github/workflows/website-deploy.yaml | 10 +- .github/workflows/website-pr-validation.yml | 10 +- bin/bookkeeper-daemon.sh | 12 +- bin/common.sh | 13 +- bookkeeper-common/pom.xml | 3 +- .../src/main/resources/LICENSE-all.bin.txt | 2 - .../src/main/resources/LICENSE-bkctl.bin.txt | 2 - .../src/main/resources/LICENSE-server.bin.txt | 2 - bookkeeper-server/pom.xml | 4 +- .../meta/zk/ZKMetadataDriverBase.java | 3 +- .../commands/client/SimpleTestCommand.java | 71 ++++-- .../meta/zk/ZKMetadataDriverBaseTest.java | 2 +- circe-checksum/pom.xml | 93 ++----- cpu-affinity/pom.xml | 21 -- dev/ci-tool | 39 +++ docker/Dockerfile | 16 +- docker/README.md | 1 - docker/scripts/apply-config-from-env.py | 23 +- docker/scripts/common.sh | 2 +- docker/scripts/init_zookeeper.sh | 2 +- .../etcd/helpers/KeySetReaderTest.java | 2 +- microbenchmarks/pom.xml | 32 ++- native-io/pom.xml | 25 +- pom.xml | 236 +++++++++++++----- shaded/bookkeeper-server-shaded/pom.xml | 8 + shaded/bookkeeper-server-tests-shaded/pom.xml | 10 +- shaded/distributedlog-core-shaded/pom.xml | 8 + stats/bookkeeper-stats-api/pom.xml | 3 +- stream/api/pom.xml | 4 - stream/clients/java/base/pom.xml | 18 ++ .../TestStorageServerClientManagerImpl.java | 2 +- stream/clients/python/docker/Dockerfile | 16 +- .../python/docker/build-local-image.sh | 3 +- stream/distributedlog/common/pom.xml | 18 +- stream/distributedlog/core/pom.xml | 6 +- stream/distributedlog/io/dlfs/pom.xml | 8 + stream/distributedlog/pom.xml | 5 +- stream/pom.xml | 4 +- stream/proto/pom.xml | 9 +- stream/tests-common/pom.xml | 9 +- tests/README.md | 81 ++++++ tests/backward-compat/pom.xml | 55 ++++ .../TestCompatUpgradeDirect.groovy | 6 + .../all-released-versions-image/Dockerfile | 17 +- .../image_builder.sh | 3 +- .../all-released-versions-image/pom.xml | 4 + .../all-versions-image/image_builder.sh | 3 +- .../docker-images/all-versions-image/pom.xml | 2 + .../current-version-image/Dockerfile | 75 ++++++ .../current-version-image/pom.xml | 149 +++++++++++ .../scripts/install-python-client.sh | 24 ++ tests/docker-images/pom.xml | 1 + .../docker-images/statestore-image/Dockerfile | 18 +- .../statestore-image/image_builder.sh | 3 +- tests/integration-tests-base-groovy/pom.xml | 42 ++-- tests/integration-tests-utils/pom.xml | 12 +- .../utils/BookKeeperClusterUtils.java | 13 +- .../tests/integration/utils/DockerUtils.java | 4 +- .../integration/utils/MavenClassLoader.java | 162 +++++++++--- tests/integration/cluster/pom.xml | 1 - tests/integration/smoke/pom.xml | 28 ++- .../integration/BookieShellTestBase.java | 4 + tests/integration/standalone/pom.xml | 1 - tests/pom.xml | 5 +- .../bookkeeper-server-shaded-test/pom.xml | 2 +- .../client/SimpleTestCommandTest.java | 30 ++- 73 files changed, 1393 insertions(+), 471 deletions(-) create mode 100644 .github/actions/clean-disk/action.yml create mode 100644 tests/README.md create mode 100644 tests/docker-images/current-version-image/Dockerfile create mode 100644 tests/docker-images/current-version-image/pom.xml create mode 100644 tests/docker-images/current-version-image/scripts/install-python-client.sh diff --git a/.dlc.json b/.dlc.json index 1f86124c5a1..49a1467abac 100644 --- a/.dlc.json +++ b/.dlc.json @@ -62,6 +62,18 @@ }, { "pattern": "^http://daxue.qq.com/content/content/id/2492" + }, + { + "pattern": "^https://calendar.google.com/" + }, + { + "pattern": "^#" + }, + { + "pattern": ".*\\{\\{.*" + }, + { + "pattern": "^//" } ], "timeout": "10s", diff --git a/.github/actions/clean-disk/action.yml b/.github/actions/clean-disk/action.yml new file mode 100644 index 00000000000..d74c3f25fc6 --- /dev/null +++ b/.github/actions/clean-disk/action.yml @@ -0,0 +1,57 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +name: clean disk +description: makes some more space available on the disk by removing files +inputs: + mode: + description: "Use 'full' to clean as much as possible" + required: false +runs: + using: composite + steps: + - run: | + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + directories=(/usr/local/lib/android /opt/ghc) + if [[ "${{ inputs.mode }}" == "full" ]]; then + # remove these directories only when mode is 'full' + directories+=(/usr/share/dotnet /opt/hostedtoolcache/CodeQL) + fi + emptydir=/tmp/empty$$/ + mkdir $emptydir + echo "::group::Available diskspace" + time df -BM / /mnt + echo "::endgroup::" + for directory in "${directories[@]}"; do + echo "::group::Removing $directory" + # fast way to delete a lot of files on linux + time sudo eatmydata rsync -a --delete $emptydir ${directory}/ + time sudo eatmydata rm -rf ${directory} + time df -BM / /mnt + echo "::endgroup::" + done + echo "::group::Cleaning apt state" + time sudo bash -c "apt-get clean; apt-get autoclean; apt-get -y --purge autoremove" + time df -BM / /mnt + echo "::endgroup::" + fi + echo "::group::Available diskspace" + time df -BM / /mnt + echo "::endgroup::" + shell: bash diff --git a/.github/actions/tune-runner-vm/action.yml b/.github/actions/tune-runner-vm/action.yml index 59f977c3150..402b9201dc2 100644 --- a/.github/actions/tune-runner-vm/action.yml +++ b/.github/actions/tune-runner-vm/action.yml @@ -24,8 +24,79 @@ runs: steps: - run: | if [[ "$OSTYPE" == "linux-gnu"* ]]; then + echo "::group::Configure and tune OS" # Ensure that reverse lookups for current hostname are handled properly # Add the current IP address, long hostname and short hostname record to /etc/hosts file echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts + + # The default vm.swappiness setting is 60 which has a tendency to start swapping when memory + # consumption is high. + # Set vm.swappiness=1 to avoid swapping and allow high RAM usage + echo 1 | sudo tee /proc/sys/vm/swappiness + ( + shopt -s nullglob + # Set swappiness to 1 for all cgroups and sub-groups + for swappiness_file in /sys/fs/cgroup/memory/*/memory.swappiness /sys/fs/cgroup/memory/*/*/memory.swappiness; do + echo 1 | sudo tee $swappiness_file > /dev/null + done + ) || true + + # use "madvise" Linux Transparent HugePages (THP) setting + # https://www.kernel.org/doc/html/latest/admin-guide/mm/transhuge.html + # "madvise" is generally a better option than the default "always" setting + # Based on Azul instructions from https://docs.azul.com/prime/Enable-Huge-Pages#transparent-huge-pages-thp + echo madvise | sudo tee /sys/kernel/mm/transparent_hugepage/enabled + echo advise | sudo tee /sys/kernel/mm/transparent_hugepage/shmem_enabled + echo defer+madvise | sudo tee /sys/kernel/mm/transparent_hugepage/defrag + echo 1 | sudo tee /sys/kernel/mm/transparent_hugepage/khugepaged/defrag + + # tune filesystem mount options, https://www.kernel.org/doc/Documentation/filesystems/ext4.txt + # commit=999999, effectively disables automatic syncing to disk (default is every 5 seconds) + # nobarrier/barrier=0, loosen data consistency on system crash (no negative impact to empheral CI nodes) + sudo mount -o remount,nodiscard,commit=999999,barrier=0 / + sudo mount -o remount,nodiscard,commit=999999,barrier=0 /mnt + # disable discard/trim at device level since remount with nodiscard doesn't seem to be effective + # https://www.spinics.net/lists/linux-ide/msg52562.html + for i in /sys/block/sd*/queue/discard_max_bytes; do + echo 0 | sudo tee $i + done + # disable any background jobs that run SSD discard/trim + sudo systemctl disable fstrim.timer || true + sudo systemctl stop fstrim.timer || true + sudo systemctl disable fstrim.service || true + sudo systemctl stop fstrim.service || true + + # stop php-fpm + sudo systemctl stop php8.0-fpm.service || true + sudo systemctl stop php7.4-fpm.service || true + # stop mono-xsp4 + sudo systemctl disable mono-xsp4.service || true + sudo systemctl stop mono-xsp4.service || true + sudo killall mono || true + + # stop Azure Linux agent to save RAM + sudo systemctl stop walinuxagent.service || true + + # enable docker experimental mode which is + # required for using "docker build --squash" / "-Ddocker.squash=true" + daemon_json="$(sudo cat /etc/docker/daemon.json | jq '.experimental = true')" + echo "$daemon_json" | sudo tee /etc/docker/daemon.json + # restart docker daemon + sudo systemctl restart docker + echo '::endgroup::' + + # show memory + echo "::group::Available Memory" + free -m + echo '::endgroup::' + # show disk + echo "::group::Available diskspace" + df -BM + echo "::endgroup::" + # show cggroup + echo "::group::Cgroup settings for current cgroup $CURRENT_CGGROUP" + CURRENT_CGGROUP=$(cat /proc/self/cgroup | grep '0::' | awk -F: '{ print $3 }') + sudo cgget -a $CURRENT_CGGROUP || true + echo '::endgroup::' fi - shell: bash \ No newline at end of file + shell: bash diff --git a/.github/workflows/bk-ci.yml b/.github/workflows/bk-ci.yml index c9f9226dd80..035c2c5e27e 100644 --- a/.github/workflows/bk-ci.yml +++ b/.github/workflows/bk-ci.yml @@ -31,7 +31,7 @@ on: workflow_dispatch: env: - MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 + MAVEN_OPTS: -Xss1500k -Xmx1500m -Daether.connector.http.reuseConnections=false -Daether.connector.requestTimeout=60000 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.serviceUnavailableRetryStrategy.class=standard -Dmaven.wagon.rto=60000 concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -44,7 +44,7 @@ jobs: timeout-minutes: 60 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Tune Runner VM uses: ./.github/actions/tune-runner-vm @@ -64,7 +64,7 @@ jobs: - name: Cache local Maven repository if: steps.check_changes.outputs.docs_only != 'true' id: cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.m2/repository/*/*/* @@ -74,16 +74,11 @@ jobs: - name: Set up JDK 11 if: steps.check_changes.outputs.docs_only != 'true' - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11 - - name: Set up Maven - uses: apache/pulsar-test-infra/setup-maven@master - with: - maven-version: 3.8.7 - - name: Validate pull request if: steps.check_changes.outputs.docs_only != 'true' run: | @@ -116,6 +111,7 @@ jobs: module: bookkeeper-server flag: client test_args: "-Dtest='org.apache.bookkeeper.client.**'" + timeout: 75 - step_name: Replication Tests module: bookkeeper-server flag: replication @@ -137,14 +133,14 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Tune Runner VM uses: ./.github/actions/tune-runner-vm - name: Cache local Maven repository id: cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.m2/repository/*/*/* @@ -152,18 +148,12 @@ jobs: !~/.m2/repository/org/apache/distributedlog key: ${{ runner.os }}-bookkeeper-all-${{ hashFiles('**/pom.xml') }} - - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11 - - name: Set up Maven - uses: apache/pulsar-test-infra/setup-maven@master - with: - maven-version: 3.8.7 - - name: Build run: | projects_list= @@ -192,11 +182,11 @@ jobs: annotate_only: 'true' - name: Upload Surefire reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() continue-on-error: true with: - name: bookie-tests-reports + name: unit-${{ matrix.step_name }}-reports path: surefire-reports retention-days: 7 @@ -207,19 +197,24 @@ jobs: integration-tests: name: Integration Tests runs-on: ubuntu-latest - timeout-minutes: 60 + timeout-minutes: 75 needs: [ 'build-and-license-check' ] if: ${{ needs.build-and-license-check.outputs.docs_only != 'true' }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Tune Runner VM uses: ./.github/actions/tune-runner-vm + - name: Clean Disk + uses: ./.github/actions/clean-disk + with: + mode: full + - name: Cache local Maven repository id: cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.m2/repository/*/*/* @@ -228,15 +223,15 @@ jobs: key: ${{ runner.os }}-bookkeeper-all-${{ hashFiles('**/pom.xml') }} - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11 - - name: Set up Maven - uses: apache/pulsar-test-infra/setup-maven@master - with: - maven-version: 3.8.7 + - name: Pick ubuntu mirror for the docker image build + run: | + # pick the closest ubuntu mirror and set it to UBUNTU_MIRROR environment variable + $GITHUB_WORKSPACE/dev/ci-tool pick_ubuntu_mirror - name: Build with Maven run: mvn -B -nsu clean install -Pdocker -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO @@ -244,29 +239,67 @@ jobs: - name: Run metadata driver tests run: mvn -B -nsu -f metadata-drivers/pom.xml test -DintegrationTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO - - name: Run all integration tests - run: mvn -B -nsu -f tests/pom.xml test -DintegrationTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO + - name: Run all integration tests (except backward compatibility tests) + run: | + mvn -B -nsu -f tests/pom.xml test -DintegrationTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0 - name: print JVM thread dumps when cancelled if: cancelled() run: ./dev/ci-tool print_thread_dumps + - name: Upload container logs on failure + uses: actions/upload-artifact@v4 + if: ${{ !success() }} + continue-on-error: true + with: + retention-days: 7 + name: integration-tests-container-logs + if-no-files-found: ignore + path: | + **/docker.log + + - name: Aggregates all test reports to ./test-reports and ./surefire-reports directories + if: ${{ always() }} + uses: ./.github/actions/copy-test-reports + + - name: Publish Test Report + uses: apache/pulsar-test-infra/action-junit-report@master + if: ${{ always() }} + with: + report_paths: 'surefire-reports/TEST-*.xml' + annotate_only: 'true' + + - name: Upload Surefire reports + uses: actions/upload-artifact@v4 + if: failure() + continue-on-error: true + with: + name: integration-tests-reports + path: surefire-reports + if-no-files-found: ignore + retention-days: 7 + backward-compatibility-tests: name: Backward compatibility tests runs-on: ubuntu-latest - timeout-minutes: 60 + timeout-minutes: 75 needs: [ 'build-and-license-check' ] if: ${{ needs.build-and-license-check.outputs.docs_only != 'true' }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Tune Runner VM uses: ./.github/actions/tune-runner-vm + - name: Clean Disk + uses: ./.github/actions/clean-disk + with: + mode: full + - name: Cache local Maven repository id: cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.m2/repository/*/*/* @@ -275,28 +308,60 @@ jobs: key: ${{ runner.os }}-bookkeeper-all-${{ hashFiles('**/pom.xml') }} - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 8 - - name: Set up Maven - uses: apache/pulsar-test-infra/setup-maven@master - with: - maven-version: 3.8.7 + - name: Pick ubuntu mirror for the docker image build + run: | + # pick the closest ubuntu mirror and set it to UBUNTU_MIRROR environment variable + $GITHUB_WORKSPACE/dev/ci-tool pick_ubuntu_mirror - name: Build with Maven - run: mvn -B -nsu clean install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO + run: mvn -B -nsu clean install -Pdocker -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO - name: Test current server with old clients - run: mvn -B -nsu -DintegrationTests -pl :backward-compat-current-server-old-clients test + run: mvn -B -nsu -DbackwardCompatTests -pl :backward-compat-current-server-old-clients test - name: Test progressive upgrade - run: mvn -B -nsu -DintegrationTests -pl :upgrade test + run: mvn -B -nsu -DbackwardCompatTests -pl :upgrade test - name: Other tests run: | - mvn -B -nsu -DintegrationTests -pl :bc-non-fips,:hierarchical-ledger-manager,:hostname-bookieid,:old-cookie-new-cluster,:recovery-no-password,:upgrade-direct,:yahoo-custom-version test + mvn -B -nsu -DbackwardCompatTests -pl :bc-non-fips,:hierarchical-ledger-manager,:hostname-bookieid,:old-cookie-new-cluster,:recovery-no-password,:upgrade-direct,:yahoo-custom-version test + + - name: Upload container logs on failure + uses: actions/upload-artifact@v4 + if: ${{ !success() }} + continue-on-error: true + with: + retention-days: 7 + name: backward-compatibility-tests-container-logs + if-no-files-found: ignore + path: | + **/docker.log + + - name: Aggregates all test reports to ./test-reports and ./surefire-reports directories + if: ${{ always() }} + uses: ./.github/actions/copy-test-reports + + - name: Publish Test Report + uses: apache/pulsar-test-infra/action-junit-report@master + if: ${{ always() }} + with: + report_paths: 'surefire-reports/TEST-*.xml' + annotate_only: 'true' + + - name: Upload Surefire reports + uses: actions/upload-artifact@v4 + if: failure() + continue-on-error: true + with: + name: backward-compatibility-tests-reports + path: surefire-reports + if-no-files-found: ignore + retention-days: 7 windows-build: name: Build with windows on JDK 11 @@ -306,7 +371,7 @@ jobs: if: ${{ needs.build-and-license-check.outputs.docs_only != 'true' }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Tune Runner VM uses: ./.github/actions/tune-runner-vm @@ -316,7 +381,7 @@ jobs: - name: Cache local Maven repository id: cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.m2/repository/*/*/* @@ -324,18 +389,12 @@ jobs: !~/.m2/repository/org/apache/distributedlog key: ${{ runner.os }}-bookkeeper-all-${{ hashFiles('**/pom.xml') }} - - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11 - - name: Set up Maven - uses: apache/pulsar-test-infra/setup-maven@master - with: - maven-version: 3.8.7 - - name: mvn package run: mvn -B -nsu clean package -DskipTests @@ -347,14 +406,14 @@ jobs: if: ${{ needs.build-and-license-check.outputs.docs_only != 'true' }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Tune Runner VM uses: ./.github/actions/tune-runner-vm - name: Cache local Maven repository id: cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.m2/repository/*/*/* @@ -363,16 +422,11 @@ jobs: key: ${{ runner.os }}-bookkeeper-all-${{ hashFiles('**/pom.xml') }} - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11 - - name: Set up Maven - uses: apache/pulsar-test-infra/setup-maven@master - with: - maven-version: 3.8.7 - - name: mvn package run: mvn -B -nsu clean package -DskipTests @@ -395,14 +449,14 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Tune Runner VM uses: ./.github/actions/tune-runner-vm - name: Cache local Maven repository id: cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.m2/repository/*/*/* @@ -410,18 +464,12 @@ jobs: !~/.m2/repository/org/apache/distributedlog key: ${{ runner.os }}-bookkeeper-all-${{ hashFiles('**/pom.xml') }} - - name: Set up JDK ${{ matrix.jdk_version }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ matrix.jdk_version }} - - name: Set up Maven - uses: apache/pulsar-test-infra/setup-maven@master - with: - maven-version: 3.8.7 - - name: Build with Maven run: mvn clean package -B -nsu -DskipBookKeeperServerTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO @@ -437,14 +485,14 @@ jobs: if: ${{ needs.build-and-license-check.outputs.need_owasp == 'true' }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Tune Runner VM uses: ./.github/actions/tune-runner-vm - name: Cache local Maven repository id: cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.m2/repository/*/*/* @@ -453,7 +501,7 @@ jobs: key: ${{ runner.os }}-bookkeeper-all-${{ hashFiles('**/pom.xml') }} - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 11 @@ -468,7 +516,7 @@ jobs: run: mvn -q -B -ntp clean install verify -Powasp-dependency-check -DskipTests -pl '!stream/distributedlog/io/dlfs' - name: Upload report - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ cancelled() || failure() }} continue-on-error: true with: diff --git a/.github/workflows/bk-streamstorage-python.yml b/.github/workflows/bk-streamstorage-python.yml index 3cf7d935837..71dbe610452 100644 --- a/.github/workflows/bk-streamstorage-python.yml +++ b/.github/workflows/bk-streamstorage-python.yml @@ -41,12 +41,12 @@ jobs: timeout-minutes: 60 steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Tune Runner VM uses: ./.github/actions/tune-runner-vm - name: Test run: ./stream/clients/python/scripts/test.sh - + Stream-storage-python-client-integration-tests: name: StreamStorage Python Client Integration Tests @@ -54,12 +54,12 @@ jobs: timeout-minutes: 60 steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Tune Runner VM uses: ./.github/actions/tune-runner-vm - name: Cache local Maven repository id: cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.m2/repository/*/*/* @@ -67,16 +67,16 @@ jobs: !~/.m2/repository/org/apache/distributedlog key: ${{ runner.os }}-bookkeeper-all-${{ hashFiles('**/pom.xml') }} - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11 - - name: Set up Maven - uses: apache/pulsar-test-infra/setup-maven@master - with: - maven-version: 3.8.7 - name: Build run: mvn -q -T 1C -B -nsu clean install -DskipTests -Dcheckstyle.skip -Dspotbugs.skip -Drat.skip -Dmaven.javadoc.skip + - name: Pick ubuntu mirror for the docker image build + run: | + # pick the closest ubuntu mirror and set it to UBUNTU_MIRROR environment variable + $GITHUB_WORKSPACE/dev/ci-tool pick_ubuntu_mirror - name: Build Test image run: ./stream/clients/python/docker/build-local-image.sh - name: Test diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index b29d767c704..43d61c1179a 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -29,10 +29,10 @@ jobs: steps: - name: clone repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: bot actions - uses: actions/github-script@v1 + uses: actions/github-script@v7 env: PROVIDER: 'apache' REPOSITORY: 'bookkeeper' diff --git a/.github/workflows/dead-link-checker.yaml b/.github/workflows/dead-link-checker.yaml index 8b7c564df49..8dae314d409 100644 --- a/.github/workflows/dead-link-checker.yaml +++ b/.github/workflows/dead-link-checker.yaml @@ -21,7 +21,7 @@ on: pull_request: branches: - master - - branch-* + - branch-* paths: - '**.md' @@ -35,8 +35,8 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 - - run: sudo npm install -g markdown-link-check@3.8.7 + - uses: actions/checkout@v4 + - run: sudo npm install -g markdown-link-check@3.11.2 - run: | for file in $(find . -name "*.md"); do markdown-link-check -c .dlc.json -q "$file" diff --git a/.github/workflows/website-deploy.yaml b/.github/workflows/website-deploy.yaml index b35eb4b7efa..868b1db0c7b 100644 --- a/.github/workflows/website-deploy.yaml +++ b/.github/workflows/website-deploy.yaml @@ -38,21 +38,17 @@ jobs: timeout-minutes: 180 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11 - - name: Set up Maven - uses: apache/pulsar-test-infra/setup-maven@master - with: - maven-version: 3.8.7 - name: Setup NodeJS - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: '16' diff --git a/.github/workflows/website-pr-validation.yml b/.github/workflows/website-pr-validation.yml index f66dbf9f5d8..9d38cb59f28 100644 --- a/.github/workflows/website-pr-validation.yml +++ b/.github/workflows/website-pr-validation.yml @@ -35,21 +35,17 @@ jobs: timeout-minutes: 60 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11 - - name: Set up Maven - uses: apache/pulsar-test-infra/setup-maven@master - with: - maven-version: 3.8.7 - name: Setup NodeJS - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: '16' diff --git a/bin/bookkeeper-daemon.sh b/bin/bookkeeper-daemon.sh index 7e93b86334e..4e85a50ed64 100755 --- a/bin/bookkeeper-daemon.sh +++ b/bin/bookkeeper-daemon.sh @@ -157,7 +157,17 @@ stop() if kill -0 $TARGET_PID > /dev/null 2>&1; then fileName=$location/$command.out - $JAVA_HOME/bin/jstack $TARGET_PID > $fileName + # Check for the java to use + if [[ -z ${JAVA_HOME} ]]; then + JSTACK=$(which jstack) + if [ $? -ne 0 ]; then + echo "Error: JAVA_HOME not set, and no jstack executable found in $PATH." 1>&2 + exit 1 + fi + else + JSTACK=${JAVA_HOME}/bin/jstack + fi + $JSTACK $TARGET_PID > $fileName echo Thread dumps are taken for analysis at $fileName if [ "$1" == "-force" ] then diff --git a/bin/common.sh b/bin/common.sh index e872779531a..72779396a63 100755 --- a/bin/common.sh +++ b/bin/common.sh @@ -51,9 +51,7 @@ fi # Check for the java to use if [[ -z ${JAVA_HOME} ]]; then JAVA=$(which java) - if [ $? = 0 ]; then - echo "JAVA_HOME not set, using java from PATH. ($JAVA)" - else + if [ $? != 0 ]; then echo "Error: JAVA_HOME not set, and no java executable found in $PATH." 1>&2 exit 1 fi @@ -71,13 +69,12 @@ source ${BK_CONFDIR}/bkenv.sh source ${BK_CONFDIR}/bk_cli_env.sh detect_jdk8() { - - if [ -f "$JAVA_HOME/lib/modules" ]; then + local is_java_8=$($JAVA -version 2>&1 | grep version | grep '"1\.8') + if [ -z "$is_java_8" ]; then echo "0" else echo "1" fi - return } # default netty settings @@ -349,7 +346,7 @@ find_table_service() { TABLE_SERVICE_RELEASED="false" fi fi - + # check the configuration to see if table service is enabled or not. if [ -z "${ENABLE_TABLE_SERVICE}" ]; then # mask exit code if the configuration file doesn't contain `StreamStorageLifecycleComponent` @@ -362,7 +359,7 @@ find_table_service() { ENABLE_TABLE_SERVICE="true" fi fi - + # standalone only run if [ \( "x${SERVICE_COMMAND}" == "xstandalone" \) -a \( "x${TABLE_SERVICE_RELEASED}" == "xfalse" \) ]; then echo "The release binary is built without table service. Use \`localbookie \` instead of \`standalone\` for local development." diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 25d0f1604bc..74987bc25df 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -130,12 +130,13 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} ${src.dir} none + Bookkeeper Client diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index b488c58fe29..f77aaced453 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -298,7 +298,6 @@ Apache Software License, Version 2. - lib/org.apache.curator-curator-client-5.1.0.jar [34] - lib/org.apache.curator-curator-framework-5.1.0.jar [34] - 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.12.0.jar [37] - lib/org.jctools-jctools-core-2.1.2.jar [38] @@ -352,7 +351,6 @@ Apache Software License, Version 2. [30] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.28.0 [33] Source available at https://github.com/grpc/grpc-java/tree/v1.56.0 [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.12.0 [38] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index ba531f894f2..4a45e43f055 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -273,7 +273,6 @@ Apache Software License, Version 2. - lib/org.apache.curator-curator-client-5.1.0.jar [33] - lib/org.apache.curator-curator-framework-5.1.0.jar [33] - 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.12.0.jar [36] - lib/org.jctools-jctools-core-2.1.2.jar [37] @@ -315,7 +314,6 @@ Apache Software License, Version 2. [29] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.28.0 [32] Source available at https://github.com/grpc/grpc-java/tree/v1.56.0 [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.12.0 [37] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index ad14d4048dd..6914715a13d 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -298,7 +298,6 @@ Apache Software License, Version 2. - lib/org.apache.curator-curator-client-5.1.0.jar [34] - lib/org.apache.curator-curator-framework-5.1.0.jar [34] - 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.12.0.jar [37] - lib/org.jctools-jctools-core-2.1.2.jar [38] @@ -348,7 +347,6 @@ Apache Software License, Version 2. [30] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.28.0 [33] Source available at https://github.com/grpc/grpc-java/tree/v1.56.0 [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.12.0 [38] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2 diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index ebf4772b959..be0d6d6a40f 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -269,7 +269,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} false @@ -283,12 +282,13 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} ${src.dir} none + Bookkeeper diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java index 430333bd2ff..643ddd3ced2 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java @@ -64,6 +64,7 @@ public class ZKMetadataDriverBase implements AutoCloseable { protected static final String SCHEME = "zk"; + private static final int ZK_CLIENT_WAIT_FOR_SHUTDOWN_TIMEOUT_MS = 5000; public static String getZKServersFromServiceUri(URI uri) { String authority = uri.getAuthority(); @@ -341,7 +342,7 @@ public void close() { } if (ownZKHandle && null != zk) { try { - zk.close(); + zk.close(ZK_CLIENT_WAIT_FOR_SHUTDOWN_TIMEOUT_MS); } catch (InterruptedException e) { Thread.currentThread().interrupt(); log.warn("Interrupted on closing zookeeper client", e); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommand.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommand.java index ca94cac4a73..7b43006a19e 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommand.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommand.java @@ -88,17 +88,18 @@ protected void run(BookKeeper bk, Flags flags) throws Exception { for (int i = 0; i < data.length; i++) { data[i] = (byte) (random.nextInt(26) + 65); } - WriteHandle wh = null; - try { - wh = result(bk.newCreateLedgerOp() - .withEnsembleSize(flags.ensembleSize) - .withWriteQuorumSize(flags.writeQuorumSize) - .withAckQuorumSize(flags.ackQuorumSize) - .withDigestType(DigestType.CRC32C) - .withCustomMetadata(ImmutableMap.of("Bookie", NAME.getBytes(StandardCharsets.UTF_8))) - .withPassword(new byte[0]) - .execute()); - LOG.info("Ledger ID: {}", wh.getId()); + long ledgerId = -1L; + long lastEntryId = -1L; + try (WriteHandle wh = result(bk.newCreateLedgerOp() + .withEnsembleSize(flags.ensembleSize) + .withWriteQuorumSize(flags.writeQuorumSize) + .withAckQuorumSize(flags.ackQuorumSize) + .withDigestType(DigestType.CRC32C) + .withCustomMetadata(ImmutableMap.of("Bookie", NAME.getBytes(StandardCharsets.UTF_8))) + .withPassword(new byte[0]) + .execute())) { + ledgerId = wh.getId(); + LOG.info("Ledger ID: {}", ledgerId); long lastReport = System.nanoTime(); for (int i = 0; i < flags.numEntries; i++) { wh.append(data); @@ -108,22 +109,50 @@ protected void run(BookKeeper bk, Flags flags) throws Exception { lastReport = System.nanoTime(); } } - LOG.info("{} entries written to ledger {}", flags.numEntries, wh.getId()); + lastEntryId = wh.getLastAddPushed(); + LOG.info("{} entries written to ledger {}. Last entry Id {}", flags.numEntries, ledgerId, lastEntryId); + if (lastEntryId != flags.numEntries - 1) { + throw new IllegalStateException("Last entry id doesn't match the expected value"); + } + // check that all entries are readable + readEntries(bk, ledgerId, lastEntryId, flags.numEntries, true, data); + } + if (ledgerId != -1) { + try { + if (lastEntryId != -1) { + // check that all entries are readable and confirmed + readEntries(bk, ledgerId, lastEntryId, flags.numEntries, false, data); + } else { + throw new IllegalStateException("Last entry id is not set"); + } + } finally { + // delete the ledger + result(bk.newDeleteLedgerOp().withLedgerId(ledgerId).execute()); + } + } else { + throw new IllegalStateException("Ledger id is not set"); + } + } - try (ReadHandle rh = result(bk.newOpenLedgerOp().withLedgerId(wh.getId()).withDigestType(DigestType.CRC32C) - .withPassword(new byte[0]).execute())) { - LedgerEntries ledgerEntries = rh.read(0, flags.numEntries); + private static void readEntries(BookKeeper bk, long ledgerId, long lastEntryId, int expectedNumberOfEntries, + boolean readUnconfirmed, byte[] data) throws Exception { + int entriesRead = 0; + try (ReadHandle rh = result(bk.newOpenLedgerOp().withLedgerId(ledgerId).withDigestType(DigestType.CRC32C) + .withPassword(new byte[0]).execute())) { + try (LedgerEntries ledgerEntries = readUnconfirmed ? rh.readUnconfirmed(0, lastEntryId) : + rh.read(0, lastEntryId)) { for (LedgerEntry ledgerEntry : ledgerEntries) { if (!Arrays.equals(ledgerEntry.getEntryBytes(), data)) { - LOG.error("Read test failed, the reading data is not equals writing data."); + throw new IllegalStateException("Read data doesn't match the data written."); } + entriesRead++; } } - } finally { - if (wh != null) { - wh.close(); - result(bk.newDeleteLedgerOp().withLedgerId(wh.getId()).execute()); - } + } + if (entriesRead != expectedNumberOfEntries) { + throw new IllegalStateException( + String.format("Number of entries read (%d) doesn't match the expected value (%d).", + entriesRead, expectedNumberOfEntries)); } } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBaseTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBaseTest.java index ab9c0030f4e..e02fb29bae7 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBaseTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBaseTest.java @@ -90,7 +90,7 @@ public void testInitialize() throws Exception { driver.close(); - verify(mockZkc, times(1)).close(); + verify(mockZkc, times(1)).close(5000); assertNull(driver.zk); } diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 5a5b85ee11c..54a46d99abb 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -63,25 +63,32 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - -Xlint:deprecation - -Xlint:unchecked - - -Xpkginfo:always - - com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true + + ${nar.runtime} + circe-checksum + + + jni + com.scurrilous.circe.checksum + + + + ${nar.cpp.optionSet} + false + false + full + + **/*.cpp + + + + true + org.apache.maven.plugins @@ -132,7 +139,6 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true @@ -146,17 +152,8 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} - 1.8 - 1.8 - - - -Xlint:deprecation - -Xlint:unchecked - - -Xpkginfo:always -h ${project.build.directory}/nar/javah-include @@ -178,23 +175,9 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true - ${nar.runtime} - circe-checksum - - - jni - com.scurrilous.circe.checksum - - - - ${nar.cpp.optionSet} - false - false - full - + false @@ -212,23 +195,9 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true - ${nar.runtime} - circe-checksum - - - jni - com.scurrilous.circe.checksum - - - - ${nar.cpp.optionSet} - false - false - full - + false rt @@ -249,23 +218,9 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true - ${nar.runtime} - circe-checksum - - - jni - com.scurrilous.circe.checksum - - - - ${nar.cpp.optionSet} - false - false - full - + false g++ diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index bf4e83b9043..1ff2c12b73e 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -48,18 +48,6 @@ org.apache.maven.plugins maven-compiler-plugin - - 1.8 - 1.8 - - - - -Xlint:deprecation - -Xlint:unchecked - - -Xpkginfo:always - - com.github.maven-nar @@ -129,17 +117,8 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} - 1.8 - 1.8 - - - -Xlint:deprecation - -Xlint:unchecked - - -Xpkginfo:always -h ${project.build.directory}/nar/javah-include diff --git a/dev/ci-tool b/dev/ci-tool index 08bc2e1386c..0f26955f643 100755 --- a/dev/ci-tool +++ b/dev/ci-tool @@ -80,6 +80,45 @@ function ci_move_test_reports() { ) } +# Finds fastest up-to-date ubuntu mirror based on download speed +function ci_find_fast_ubuntu_mirror() { + local ubuntu_release=${1:-"$(lsb_release -c 2>/dev/null | cut -f2 || echo "jammy")"} + local ubuntu_arch=${2:-"$(dpkg --print-architecture 2>/dev/null || echo "amd64")"} + { + # choose mirrors that are up-to-date by checking the Last-Modified header for + { + # randomly choose up to 10 mirrors using http:// protocol + # (https isn't supported in docker containers that don't have ca-certificates installed) + curl -s http://mirrors.ubuntu.com/mirrors.txt | grep '^http://' | shuf -n 10 + # also consider Azure's Ubuntu mirror + echo http://azure.archive.ubuntu.com/ubuntu/ + } | xargs -I {} sh -c "ubuntu_release=$ubuntu_release ubuntu_arch=$ubuntu_arch;"'echo "$(curl -m 5 -sI {}dists/${ubuntu_release}/Contents-${ubuntu_arch}.gz|sed s/\\r\$//|grep Last-Modified|awk -F": " "{ print \$2 }" | LANG=C date -f- -u +%s)" "{}"' | sort -rg | awk '{ if (NR==1) TS=$1; if ($1 == TS) print $2 }' + } | xargs -I {} sh -c 'echo `curl -r 0-102400 -m 5 -s -w %{speed_download} -o /dev/null {}ls-lR.gz` {}' \ + |sort -g -r |head -1| awk '{ print $2 }' +} + +function ci_pick_ubuntu_mirror() { + echo "Choosing fastest up-to-date ubuntu mirror based on download speed..." + UBUNTU_MIRROR=$(ci_find_fast_ubuntu_mirror) + if [ -z "$UBUNTU_MIRROR" ]; then + # fallback to no mirror + UBUNTU_MIRROR="http://archive.ubuntu.com/ubuntu/" + UBUNTU_SECURITY_MIRROR="http://security.ubuntu.com/ubuntu/" + else + UBUNTU_SECURITY_MIRROR="${UBUNTU_MIRROR}" + fi + echo "Picked '$UBUNTU_MIRROR'." + # set the chosen mirror also in the UBUNTU_MIRROR and UBUNTU_SECURITY_MIRROR environment variables + # that can be used by docker builds + export UBUNTU_MIRROR + export UBUNTU_SECURITY_MIRROR + # make environment variables available for later GitHub Actions steps + if [ -n "$GITHUB_ENV" ]; then + echo "UBUNTU_MIRROR=$UBUNTU_MIRROR" >> $GITHUB_ENV + echo "UBUNTU_SECURITY_MIRROR=$UBUNTU_SECURITY_MIRROR" >> $GITHUB_ENV + fi +} + if [ -z "$1" ]; then echo "usage: $0 [ci_tool_function_name]" echo "Available ci tool functions:" diff --git a/docker/Dockerfile b/docker/Dockerfile index fafb7dea0d2..87b8899b39c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,11 +17,9 @@ # under the License. # -FROM ubuntu:22.10 +FROM ubuntu:22.04 MAINTAINER Apache BookKeeper -ARG TARGETARCH - ARG BK_VERSION=4.15.1 ARG DISTRO_NAME=bookkeeper-server-${BK_VERSION}-bin ARG DISTRO_URL=https://archive.apache.org/dist/bookkeeper/bookkeeper-${BK_VERSION}/${DISTRO_NAME}.tar.gz @@ -31,13 +29,18 @@ ENV BOOKIE_HTTP_PORT=8080 EXPOSE $BOOKIE_PORT $BOOKIE_HTTP_PORT ENV BK_USER=bookkeeper ENV BK_HOME=/opt/bookkeeper -ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-$TARGETARCH ENV DEBIAN_FRONTEND=noninteractive +ARG UBUNTU_MIRROR=http://archive.ubuntu.com/ubuntu/ +ARG UBUNTU_SECURITY_MIRROR=http://security.ubuntu.com/ubuntu/ # Download Apache Bookkeeper, untar and clean up RUN set -x \ + && sed -i -e "s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}|g" \ + -e "s|http://security\.ubuntu\.com/ubuntu/|${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}|g" /etc/apt/sources.list \ + && echo 'Acquire::http::Timeout "30";\nAcquire::http::ConnectionAttemptDelayMsec "2000";\nAcquire::https::Timeout "30";\nAcquire::https::ConnectionAttemptDelayMsec "2000";\nAcquire::ftp::Timeout "30";\nAcquire::ftp::ConnectionAttemptDelayMsec "2000";\nAcquire::Retries "15";' > /etc/apt/apt.conf.d/99timeout_and_retries \ && adduser "${BK_USER}" \ && apt-get update \ + && apt-get install -y ca-certificates apt-transport-https \ && apt-get install -y --no-install-recommends openjdk-17-jdk \ && apt-get install -y --no-install-recommends python3 pip \ && ln -s /usr/bin/python3 /usr/bin/python \ @@ -58,7 +61,10 @@ RUN set -x \ && tar -xzf "$DISTRO_NAME.tar.gz" \ && mv bookkeeper-server-${BK_VERSION}/ /opt/bookkeeper/ \ && rm -rf "$DISTRO_NAME.tar.gz" "$DISTRO_NAME.tar.gz.asc" "$DISTRO_NAME.tar.gz.sha512" \ - && pip install zk-shell + && pip install zk-shell \ + && JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java)))) \ + && echo networkaddress.cache.ttl=1 >> $JAVA_HOME/conf/security/java.security \ + && echo networkaddress.cache.negative.ttl=1 >> $JAVA_HOME/conf/security/java.security WORKDIR /opt/bookkeeper diff --git a/docker/README.md b/docker/README.md index 82c635faa19..3903536d1b5 100644 --- a/docker/README.md +++ b/docker/README.md @@ -13,7 +13,6 @@ Bookkeeper needs [Zookeeper](https://zookeeper.apache.org/) in order to preserve Just like running a BookKeeper cluster in one machine(https://bookkeeper.apache.org/docs/getting-started/run-locally/), you can run a standalone BookKeeper in one docker container, the command is: ``` docker run -it \ - --env JAVA_HOME=/usr/lib/jvm/java-11 \ --entrypoint "/bin/bash" \ apache/bookkeeper \ -c "/opt/bookkeeper/bin/bookkeeper localbookie 3" diff --git a/docker/scripts/apply-config-from-env.py b/docker/scripts/apply-config-from-env.py index 105a2bacafe..7b74b503411 100755 --- a/docker/scripts/apply-config-from-env.py +++ b/docker/scripts/apply-config-from-env.py @@ -23,21 +23,28 @@ ## based on the ENV variables ## export my-key=new-value ## -## ./apply-config-from-env config_dir +## ./apply-config-from-env file ... ## import os, sys -if len(sys.argv) != 2: - print('Usage: %s ' + 'config_dir' % (sys.argv[0])) +if len(sys.argv) < 2: + print('Usage: %s file ...' % (sys.argv[0])) sys.exit(1) -def mylistdir(dir): - return [os.path.join(dir, filename) for filename in os.listdir(dir)] +def prepare_conf_files(files): + conf_files = [] + for f in files: + if os.path.isfile(f): + if not os.path.isabs(f): + f = os.path.join(os.getcwd(), f) + conf_files.append(f) + else: + print('%s is not a readable file' % f) + sys.exit(1) + return conf_files -# Always apply env config to all the files under conf -conf_dir = sys.argv[1] -conf_files = mylistdir(conf_dir) +conf_files = prepare_conf_files(sys.argv[1:]) print('conf files: ') print(conf_files) diff --git a/docker/scripts/common.sh b/docker/scripts/common.sh index 5bbcd208072..0f745db4b45 100755 --- a/docker/scripts/common.sh +++ b/docker/scripts/common.sh @@ -71,7 +71,7 @@ echo " BK_STREAM_STORAGE_ROOT_PATH is ${BK_STREAM_STORAGE_ROOT_PATH}" echo " BK_NUM_STORAGE_CONTAINERS is ${BK_NUM_STORAGE_CONTAINERS}" echo " BOOKIE_GRPC_PORT is ${BOOKIE_GRPC_PORT}" -python scripts/apply-config-from-env.py ${BK_HOME}/conf +python scripts/apply-config-from-env.py ${BK_HOME}/conf/*.conf export BOOKIE_CONF=${BK_HOME}/conf/bk_server.conf export SERVICE_PORT=${PORT0} diff --git a/docker/scripts/init_zookeeper.sh b/docker/scripts/init_zookeeper.sh index 803ef91d786..cff981211c8 100755 --- a/docker/scripts/init_zookeeper.sh +++ b/docker/scripts/init_zookeeper.sh @@ -63,7 +63,7 @@ function create_zk_dynamic_conf() { function init_zookeeper() { # apply zookeeper envs - python scripts/apply-config-from-env.py ${BK_HOME}/conf + python scripts/apply-config-from-env.py ${BK_HOME}/conf/zookeeper.conf # create dirs if they don't exist create_zk_dirs diff --git a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/helpers/KeySetReaderTest.java b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/helpers/KeySetReaderTest.java index b4bdf6ea79b..d7a07fc2ff2 100644 --- a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/helpers/KeySetReaderTest.java +++ b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/helpers/KeySetReaderTest.java @@ -40,8 +40,8 @@ import org.apache.bookkeeper.versioning.Version.Occurred; import org.apache.bookkeeper.versioning.Versioned; import org.apache.commons.compress.utils.Sets; +import org.apache.commons.lang3.RandomStringUtils; import org.junit.Test; -import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils; /** * Integration test {@link KeySetReader}. diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 63c9400cd4a..5aebdd2ef3f 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - 4.0.0 + 4.0.0 org.apache.bookkeeper bookkeeper @@ -58,14 +58,24 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} - ${javac.target} - ${javac.target} - ${javac.target} + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + + @@ -82,7 +92,10 @@ ${uberjar.name} - org.openjdk.jmh.Main + + org.openjdk.jmh.Main + true + @@ -108,6 +121,13 @@ true + + com.github.spotbugs + spotbugs-maven-plugin + + true + + diff --git a/native-io/pom.xml b/native-io/pom.xml index 40e428d0577..1aaa47fb7c2 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -45,18 +45,6 @@ org.apache.maven.plugins maven-compiler-plugin - - 1.8 - 1.8 - - - - -Xlint:deprecation - -Xlint:unchecked - - -Xpkginfo:always - - com.github.maven-nar @@ -120,17 +108,8 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} - 1.8 - 1.8 - - - -Xlint:deprecation - -Xlint:unchecked - - -Xpkginfo:always -h ${project.build.directory}/nar/javah-include @@ -228,11 +207,11 @@ true ${nar.runtime} - circe-checksum + native-io jni - com.scurrilous.circe.checksum + org.apache.bookkeeper.util.nativeio diff --git a/pom.xml b/pom.xml index 57b5910597d..25c40ef7153 100644 --- a/pom.xml +++ b/pom.xml @@ -105,9 +105,10 @@ + 8 + 8 UTF-8 UTF-8 - 1.8 true 2 src/main/java @@ -115,7 +116,7 @@ 1.18.2 - 1.6.0.Final + 1.8.0.Final 3.0.1 1.2 4.1 @@ -129,26 +130,27 @@ 5.1.0 4.1.12.1 0.5.11 - 2.7.0 + 2.8.0 3.0.2 2.9.0 1.54.1 32.0.1-jre 1.1.1 3.3.5 - 1.3 2.1.10 2.13.4.20221013 1.82 9.4.53.v20231009 - 1.19 + 1.37 2.8.2 1.14.3 - 4.12 - - 5.8.2 + 4.13.2 + 1.3 + 5.10.2 + 3.25.3 + 4.2.0 0.14.2 - 1.18.26 + 1.18.30 2.18.0 1.3.0 3.12.4 @@ -166,41 +168,40 @@ ${grpc.version} 0.9.11 7.9.2 - 3.0.1 + 3.3.0 1.7.32 1.33 4.6.0 1.3.2 - 1.17.6 + 1.19.4 4.3.8 3.8.3 1.1.10.5 2.1.2 0.9.1 - 0.12 + 0.16.1 2.7 4.3.0 1.4.13 1.6.8 3.0.0 - 1.13.1 1.6 1.18.20.0 0.8.8 1.8 - 3.1.0 - 3.2.1 - 3.2.0 - 3.10.1 - 3.0.2 - 2.7 - 2.5.1 - 3.2.2 - 3.1.1 - 3.2.0 - 3.2.1 - 3.0.0-M5 + 3.6.0 + 3.3.1 + 3.3.2 + 3.12.1 + 3.6.1 + 3.1.1 + 3.1.1 + 3.3.0 + 3.6.3 + 3.5.1 + 3.3.0 + 3.2.5 8.0.2 3.10.1 1.4.1.Final @@ -210,8 +211,8 @@ 1 4.0.0 3.0.1 - 3.0.0-M6 - 4.0.3 + http://archive.ubuntu.com/ubuntu/ + http://security.ubuntu.com/ubuntu/ @@ -247,7 +248,6 @@ org.inferred freebuilder ${freebuilder.version} - true @@ -536,13 +536,6 @@ - - - org.junit.jupiter - junit-jupiter-api - ${junit5.version} - - org.xerial.snappy @@ -689,11 +682,33 @@ junit ${junit.version} + + org.junit + junit-bom + ${junit5.version} + pom + import + + + org.assertj + assertj-core + ${assertj-core.version} + org.hamcrest hamcrest-all ${hamcrest.version} + + org.hamcrest + hamcrest-core + ${hamcrest.version} + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + org.jmock jmock @@ -741,6 +756,11 @@ + + javax.ws.rs + javax.ws.rs-api + 2.1.1 + org.jboss.arquillian.junit arquillian-junit-standalone @@ -752,11 +772,6 @@ - - org.jboss.arquillian.junit - arquillian-junit-container - ${arquillian-junit.version} - org.codehaus.groovy groovy-all @@ -775,8 +790,10 @@ org.testcontainers - testcontainers + testcontainers-bom ${testcontainers.version} + pom + import org.jsoup @@ -840,6 +857,31 @@ junit test + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.vintage + junit-vintage-engine + test + + + org.junit.jupiter + junit-jupiter-params + test + + + org.assertj + assertj-core + test + org.hamcrest hamcrest-all @@ -887,7 +929,7 @@ buildtools/src/main/resources/bookkeeper/checkstyle.xml buildtools/src/main/resources/bookkeeper/suppressions.xml - UTF-8 + UTF-8 true true false @@ -903,6 +945,31 @@ + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-surefire-plugin.version} + + + com.github.maven-nar + nar-maven-plugin + ${nar-maven-plugin.version} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + true + none + + @@ -915,23 +982,28 @@ + org.apache.maven.plugins maven-compiler-plugin ${maven-compiler-plugin.version} - ${javac.target} - ${javac.target} + UTF-8 + true + true + + + org.projectlombok + lombok + ${lombok.version} + + - -Xlint:deprecation - -Xlint:unchecked - - -Xpkginfo:always - + -parameters + org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} -Xmx2G -Djava.net.preferIPv4Stack=true -Dio.netty.leakDetection.level=paranoid ${test.additional.args} ${redirectTestOutputToFile} @@ -945,17 +1017,16 @@ org.apache.maven.plugins maven-failsafe-plugin - ${maven-failsafe-plugin.version} org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} true - - none + Bookkeeper Client @@ -1015,6 +1086,9 @@ ${apache-rat-plugin.version} + + dependency-reduced-pom.xml + **/.idea/** @@ -1044,6 +1118,8 @@ **/*.iml **/*.iws **/*.ipr + + **/.sdkmanrc .repository/** @@ -1238,6 +1314,14 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + + false + + @@ -1249,7 +1333,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} -Xmx2G -Djava.net.preferIPv4Stack=true false @@ -1270,7 +1353,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} -Xmx2G -Djava.net.preferIPv4Stack=true -Dio.netty.leakDetection.level=paranoid -Dbookkeeper.log.root.level=INFO -Dbookkeeper.log.root.appender=CONSOLE false @@ -1313,6 +1395,10 @@ [11,) + + + ${maven.compiler.target} + --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED @@ -1334,6 +1420,20 @@ --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + ${maven.compiler.release} + + + + + apache-release @@ -1354,5 +1454,29 @@ + + ubuntu-mirror-set + + + env.UBUNTU_MIRROR + + + + + ${env.UBUNTU_MIRROR} + + + + ubuntu-security-mirror-set + + + env.UBUNTU_SECURITY_MIRROR + + + + + ${env.UBUNTU_SECURITY_MIRROR} + + diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 85a3408fd6d..6f531b0605f 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -38,10 +38,18 @@ org.slf4j slf4j-log4j12 + + org.slf4j + slf4j-reload4j + log4j log4j + + ch.qos.reload4j + reload4j + diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index f9ccbc1bd6c..b954a0cb60c 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -39,10 +39,18 @@ org.slf4j slf4j-log4j12 + + org.slf4j + slf4j-reload4j + log4j log4j + + ch.qos.reload4j + reload4j + org.apache.bookkeeper bookkeeper-common @@ -103,7 +111,7 @@ - + org.codehaus.mojo license-maven-plugin diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index f66b3c15bff..7ca68c96de7 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -39,10 +39,18 @@ org.slf4j slf4j-log4j12 + + org.slf4j + slf4j-reload4j + log4j log4j + + ch.qos.reload4j + reload4j + io.netty netty-buffer diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 2423b007b8e..5448b115681 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -33,12 +33,13 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} ${src.dir} none + Bookkeeper Stats API diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 761f0f44b43..94b58f077ce 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -41,9 +41,5 @@ io.netty netty-buffer - - org.inferred - freebuilder - diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index a6f028b0b38..701886d62c6 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -36,6 +36,11 @@ stream-storage-proto ${project.parent.version} + + org.inferred + freebuilder + true + org.apache.bookkeeper testtools @@ -45,6 +50,19 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.inferred + freebuilder + ${freebuilder.version} + + + + org.apache.maven.plugins maven-jar-plugin diff --git a/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestStorageServerClientManagerImpl.java b/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestStorageServerClientManagerImpl.java index 5f68d11c5cb..d72a69e431e 100644 --- a/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestStorageServerClientManagerImpl.java +++ b/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestStorageServerClientManagerImpl.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import com.google.common.collect.Lists; import io.grpc.stub.StreamObserver; import java.util.List; import org.apache.bookkeeper.clients.grpc.GrpcClientTestBase; @@ -36,7 +37,6 @@ import org.apache.bookkeeper.stream.proto.storage.OneStorageContainerEndpointResponse; import org.apache.bookkeeper.stream.proto.storage.RootRangeServiceGrpc.RootRangeServiceImplBase; import org.apache.bookkeeper.stream.proto.storage.StatusCode; -import org.inferred.freebuilder.shaded.com.google.common.collect.Lists; import org.junit.Test; /** diff --git a/stream/clients/python/docker/Dockerfile b/stream/clients/python/docker/Dockerfile index 7b3d7073a83..2bdb91fda69 100644 --- a/stream/clients/python/docker/Dockerfile +++ b/stream/clients/python/docker/Dockerfile @@ -17,22 +17,27 @@ # under the License. # -FROM ubuntu:22.10 +FROM ubuntu:22.04 MAINTAINER Apache BookKeeper ARG BK_TAR_BALL -ARG TARGETARCH=amd64 ENV BOOKIE_PORT=3181 ENV BOOKIE_HTTP_PORT=8080 EXPOSE $BOOKIE_PORT $BOOKIE_HTTP_PORT ENV BK_USER=bookkeeper ENV BK_HOME=/opt/bookkeeper -ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-$TARGETARCH +ENV DEBIAN_FRONTEND=noninteractive +ARG UBUNTU_MIRROR=http://archive.ubuntu.com/ubuntu/ +ARG UBUNTU_SECURITY_MIRROR=http://security.ubuntu.com/ubuntu/ RUN set -x \ + && sed -i -e "s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}|g" \ + -e "s|http://security\.ubuntu\.com/ubuntu/|${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}|g" /etc/apt/sources.list \ + && echo 'Acquire::http::Timeout "30";\nAcquire::http::ConnectionAttemptDelayMsec "2000";\nAcquire::https::Timeout "30";\nAcquire::https::ConnectionAttemptDelayMsec "2000";\nAcquire::ftp::Timeout "30";\nAcquire::ftp::ConnectionAttemptDelayMsec "2000";\nAcquire::Retries "15";' > /etc/apt/apt.conf.d/99timeout_and_retries \ && adduser "${BK_USER}" \ && apt-get update \ + && apt-get install -y ca-certificates apt-transport-https \ && apt-get install -y --no-install-recommends openjdk-17-jdk \ && apt-get install -y --no-install-recommends python3 pip \ && ln -s /usr/bin/python3 /usr/bin/python \ @@ -41,7 +46,10 @@ RUN set -x \ && apt-get autoclean \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ - && pip install zk-shell + && pip install zk-shell \ + && JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java)))) \ + && echo networkaddress.cache.ttl=1 >> $JAVA_HOME/conf/security/java.security \ + && echo networkaddress.cache.negative.ttl=1 >> $JAVA_HOME/conf/security/java.security RUN mkdir -pv /opt \ && cd /opt diff --git a/stream/clients/python/docker/build-local-image.sh b/stream/clients/python/docker/build-local-image.sh index 3958bb253c6..b6fee88d8ba 100755 --- a/stream/clients/python/docker/build-local-image.sh +++ b/stream/clients/python/docker/build-local-image.sh @@ -28,5 +28,6 @@ fi cp ${ROOT_DIR}/bookkeeper-dist/server/target/bookkeeper-server*-bin.tar.gz "${CURRENT_DIR}/${BK_TAR_BALL}" pushd "${CURRENT_DIR}" -docker build --build-arg BK_TAR_BALL=${BK_TAR_BALL} -t apache/bookkeeper:local . +docker build --build-arg UBUNTU_MIRROR="${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}" --build-arg UBUNTU_SECURITY_MIRROR="${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}" \ + --build-arg BK_TAR_BALL=${BK_TAR_BALL} -t apache/bookkeeper:local . popd diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 24fc27e764e..07c00f7a9e6 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -34,6 +34,18 @@ org.slf4j slf4j-log4j12 + + org.slf4j + slf4j-reload4j + + + log4j + log4j + + + ch.qos.reload4j + reload4j + @@ -78,8 +90,8 @@ spotbugs-maven-plugin + org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} org.apache.maven.plugins @@ -96,11 +108,11 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} ${redirectTestOutputToFile} -Xmx3G -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G ${test.additional.args} - always + 1 + false 1800 diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 2cbdde34c36..6436b5740a7 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -90,8 +90,8 @@ + org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} org.apache.maven.plugins @@ -108,12 +108,12 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} false ${redirectTestOutputToFile} -Xmx3G -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G ${test.additional.args} - always + 1 + false 1800 diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index c102819feda..798889e2cd2 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -54,10 +54,18 @@ org.slf4j slf4j-log4j12 + + org.slf4j + slf4j-reload4j + log4j log4j + + ch.qos.reload4j + reload4j + org.apache.avro avro diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 08e5ed3d88d..cf3b91a3c30 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -45,7 +45,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} ${src.dir} true @@ -74,11 +73,11 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} ${redirectTestOutputToFile} -Xmx3G -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G -Dio.netty.leakDetection.level=PARANOID ${test.additional.args} - always + 1 + false 1800 diff --git a/stream/pom.xml b/stream/pom.xml index bb960504b0f..943f341b7d2 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -53,13 +53,13 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} true ${redirectTestOutputToFile} -Xmx3G -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G -Dio.netty.leakDetection.level=PARANOID ${test.additional.args} - always + 1 + false 1800 diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 99639e46a87..c3cdd0206f0 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -71,16 +71,9 @@ + org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} - ${javac.target} - ${javac.target} - - -Xlint:unchecked - - -Xpkginfo:always - false false diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 4349f73c5f0..14254cdcb42 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -76,16 +76,9 @@ + org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} - ${javac.target} - ${javac.target} - - -Xlint:unchecked - - -Xpkginfo:always - false false diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 00000000000..4d79d4b6d3c --- /dev/null +++ b/tests/README.md @@ -0,0 +1,81 @@ +# Integration tests for Bookkeeper + +## Prerequisites + +### Workaround for running the tests with Mac Apple Silicon + +The current version of the outdated maven plugin requires a workaround. + +Install socat +```bash +brew install socat +``` + +Run a TCP -> Unix socket proxy for docker in a separate terminal +```bash +socat TCP-LISTEN:2375,bind=127.0.0.1,reuseaddr,fork UNIX-CLIENT:/var/run/docker.sock & +``` + +Set the `DOCKER_HOST` environment variable in the terminal where you run the tests +```bash +export DOCKER_HOST=tcp://localhost:2375 +``` + +Here's a shell script function to automate starting the proxy and setting `DOCKER_HOST`: +```bash +function docker_socket_proxy() { + local port=2375 + socat /dev/null TCP4:127.0.0.1:$port,connect-timeout=2 &> /dev/null + if [ $? -ne 0 ]; then + echo "Starting socat tcp proxy on port $port for docker socket /var/run/docker.sock" + socat TCP-LISTEN:$port,bind=127.0.0.1,reuseaddr,fork UNIX-CLIENT:/var/run/docker.sock &> /dev/null & + echo "Stop the proxy with 'kill $!'" + fi + export DOCKER_HOST=tcp://127.0.0.1:$port + echo "Added DOCKER_HOST=$DOCKER_HOST to environment" +} +``` +You can add the function to your shell profile (`~/.bashrc`, `~/.zshrc`, etc.). + +### Support for connecting to docker network from Mac host + +You will also need to install [docker-mac-net-connect](https://github.com/chipmk/docker-mac-net-connect). It allows the tests to connect to the docker network from the Mac host. + +```bash +brew install chipmk/tap/docker-mac-net-connect +sudo brew services start chipmk/tap/docker-mac-net-connect +``` + +## Running the tests + +Remember to start the unix socket proxy for docker as described in the previous section and set the `DOCKER_HOST` environment variable in the terminal where you run the tests. + +### Building the docker images together with the project source code + +```bash +mvn -B -nsu clean install -Pdocker -DskipTests +docker images | grep apachebookkeeper +``` + +### Running integration tests + +```bash +# Run metadata driver tests +mvn -f metadata-drivers/pom.xml test -DintegrationTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0 + +# Run all integration tests +mvn -f tests/pom.xml test -DintegrationTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0 +``` + +### Running backward compatibility tests + +```bash +# Test current server with old clients +mvn -DbackwardCompatTests -pl :backward-compat-current-server-old-clients test -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0 + +# Test progressive upgrade +mvn -DbackwardCompatTests -pl :upgrade test -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0 + +# Other backward compat tests +mvn -DbackwardCompatTests -pl :bc-non-fips,:hierarchical-ledger-manager,:hostname-bookieid,:old-cookie-new-cluster,:recovery-no-password,:upgrade-direct,:yahoo-custom-version test -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0 +``` \ No newline at end of file diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 692cca42c1c..090496e3d0f 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -38,6 +38,33 @@ yahoo-custom-version bc-non-fips + + + + com.github.docker-java + docker-java-bom + ${arquillian-cube.docker-java.version} + pom + import + + + org.arquillian.cube + arquillian-cube-docker + ${arquillian-cube.version} + + + org.yaml + snakeyaml + ${arquillian-cube.snakeyaml.version} + + + + + + org.arquillian.cube + arquillian-cube-docker + + @@ -47,6 +74,34 @@ true + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + backwardCompatTests + + + backwardCompatTests + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + + + + + diff --git a/tests/backward-compat/upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeDirect.groovy b/tests/backward-compat/upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeDirect.groovy index 2ee1c7d8aa5..448c0f83b83 100644 --- a/tests/backward-compat/upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeDirect.groovy +++ b/tests/backward-compat/upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeDirect.groovy @@ -36,6 +36,12 @@ class TestCompatUpgradeDirect { private static final Logger LOG = LoggerFactory.getLogger(TestCompatUpgradeDirect.class) private static byte[] PASSWD = "foobar".getBytes() + static { + Thread.setDefaultUncaughtExceptionHandler { Thread t, Throwable e -> + LOG.error("Uncaught exception in thread {}", t, e) + } + } + @ArquillianResource DockerClient docker diff --git a/tests/docker-images/all-released-versions-image/Dockerfile b/tests/docker-images/all-released-versions-image/Dockerfile index aee3227ecd1..a8c761c7e88 100644 --- a/tests/docker-images/all-released-versions-image/Dockerfile +++ b/tests/docker-images/all-released-versions-image/Dockerfile @@ -17,16 +17,27 @@ # under the License. # -FROM openjdk:8-jdk +FROM eclipse-temurin:8-jdk MAINTAINER Apache BookKeeper ENV BK_JOURNALDIR=/opt/bookkeeper/data/journal ENV BK_LEDGERDIR=/opt/bookkeeper/data/ledgers ENV BK_ZKCONNECTSTRING=zookeeper1,zookeeper2,zookeeper3 +ENV DEBIAN_FRONTEND=noninteractive +ARG UBUNTU_MIRROR=http://archive.ubuntu.com/ubuntu/ +ARG UBUNTU_SECURITY_MIRROR=http://security.ubuntu.com/ubuntu/ -RUN apt-get update && apt-get install -qy wget supervisor bash \ +RUN sed -i -e "s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}|g" \ + -e "s|http://security\.ubuntu\.com/ubuntu/|${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}|g" /etc/apt/sources.list \ + && echo 'Acquire::http::Timeout "30";\nAcquire::http::ConnectionAttemptDelayMsec "2000";\nAcquire::https::Timeout "30";\nAcquire::https::ConnectionAttemptDelayMsec "2000";\nAcquire::ftp::Timeout "30";\nAcquire::ftp::ConnectionAttemptDelayMsec "2000";\nAcquire::Retries "15";' > /etc/apt/apt.conf.d/99timeout_and_retries \ + && apt-get update && apt-get install -qy wget curl supervisor bash ca-certificates apt-transport-https \ + && apt-get -y install netcat dnsutils less procps iputils-ping \ + && apt-get install -y --no-install-recommends gpg gpg-agent sudo \ && echo "dash dash/sh boolean false" | debconf-set-selections \ - && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash + && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash \ + && JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java)))) \ + && echo networkaddress.cache.ttl=1 >> $JAVA_HOME/jre/lib/security/java.security \ + && echo networkaddress.cache.negative.ttl=1 >> $JAVA_HOME/jre/lib/security/java.security RUN mkdir /tarballs WORKDIR /tarballs diff --git a/tests/docker-images/all-released-versions-image/image_builder.sh b/tests/docker-images/all-released-versions-image/image_builder.sh index a06c29e49b9..b89afad3e6d 100755 --- a/tests/docker-images/all-released-versions-image/image_builder.sh +++ b/tests/docker-images/all-released-versions-image/image_builder.sh @@ -29,4 +29,5 @@ SCRIPT_DIR=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P ) ## BASE_DIR will be ./bookkeeper/ BASE_DIR=${SCRIPT_DIR}/../../../ -docker build -t ${IMAGE_NAME} "${BASE_DIR}"/tests/docker-images/all-released-versions-image \ No newline at end of file +docker build --build-arg UBUNTU_MIRROR="${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}" --build-arg UBUNTU_SECURITY_MIRROR="${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}" \ + -t ${IMAGE_NAME} "${BASE_DIR}"/tests/docker-images/all-released-versions-image \ No newline at end of file diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index d89fd3100ac..9a3148eda3e 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -62,6 +62,10 @@ apachebookkeeper/bookkeeper-all-released-versions ${project.version} false + + ${UBUNTU_MIRROR} + ${UBUNTU_SECURITY_MIRROR} + diff --git a/tests/docker-images/all-versions-image/image_builder.sh b/tests/docker-images/all-versions-image/image_builder.sh index 7b553362303..f021c5f034f 100755 --- a/tests/docker-images/all-versions-image/image_builder.sh +++ b/tests/docker-images/all-versions-image/image_builder.sh @@ -34,4 +34,5 @@ mkdir -p "${BASE_DIR}"/tests/docker-images/all-versions-image/build ls -la ${BASE_DIR}bookkeeper-dist/server/build/distributions cp ${BASE_DIR}bookkeeper-dist/server/build/distributions/bookkeeper-server-${VERSION}-bin.tar.gz "${BASE_DIR}"/tests/docker-images/all-versions-image/build/ TARBALL=build/bookkeeper-server-${VERSION}-bin.tar.gz -docker build -t ${IMAGE_NAME} "${BASE_DIR}"tests/docker-images/all-versions-image --build-arg BK_TARBALL="${TARBALL}" \ No newline at end of file +docker build --build-arg UBUNTU_MIRROR="${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}" --build-arg UBUNTU_SECURITY_MIRROR="${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}" \ + -t ${IMAGE_NAME} "${BASE_DIR}"tests/docker-images/all-versions-image --build-arg BK_TARBALL="${TARBALL}" \ No newline at end of file diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 057dc6db3c8..b6412edb755 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -82,6 +82,8 @@ true target/bookkeeper-dist-server-${project.version}-bin.tar.gz + ${UBUNTU_MIRROR} + ${UBUNTU_SECURITY_MIRROR} diff --git a/tests/docker-images/current-version-image/Dockerfile b/tests/docker-images/current-version-image/Dockerfile new file mode 100644 index 00000000000..0e489eb5ea6 --- /dev/null +++ b/tests/docker-images/current-version-image/Dockerfile @@ -0,0 +1,75 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +FROM ubuntu:22.04 +MAINTAINER Apache BookKeeper + +ARG BK_VERSION=DOESNOTEXISTS +ARG DISTRO_NAME=bookkeeper-dist-server-${BK_VERSION}-bin +ARG PKG_NAME=bookkeeper-server-${BK_VERSION} + +ENV BOOKIE_PORT=3181 +ENV BOOKIE_HTTP_PORT=8080 +ENV BOOKIE_GRPC_PORT=4181 +EXPOSE ${BOOKIE_PORT} ${BOOKIE_HTTP_PORT} ${BOOKIE_GRPC_PORT} +ENV BK_USER=bookkeeper +ENV BK_HOME=/opt/bookkeeper +ENV DEBIAN_FRONTEND=noninteractive +ARG UBUNTU_MIRROR=http://archive.ubuntu.com/ubuntu/ +ARG UBUNTU_SECURITY_MIRROR=http://security.ubuntu.com/ubuntu/ + +RUN set -x \ + && sed -i -e "s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}|g" \ + -e "s|http://security\.ubuntu\.com/ubuntu/|${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}|g" /etc/apt/sources.list \ + && echo 'Acquire::http::Timeout "30";\nAcquire::http::ConnectionAttemptDelayMsec "2000";\nAcquire::https::Timeout "30";\nAcquire::https::ConnectionAttemptDelayMsec "2000";\nAcquire::ftp::Timeout "30";\nAcquire::ftp::ConnectionAttemptDelayMsec "2000";\nAcquire::Retries "15";' > /etc/apt/apt.conf.d/99timeout_and_retries \ + && adduser "${BK_USER}" \ + && apt-get update \ + && apt-get install -y ca-certificates apt-transport-https \ + && apt-get install -y --no-install-recommends openjdk-17-jdk \ + && apt-get install -y --no-install-recommends python3 pip \ + && ln -s /usr/bin/python3 /usr/bin/python \ + && apt-get install -y --no-install-recommends gpg gpg-agent wget sudo \ + && apt-get -y install netcat dnsutils less procps iputils-ping \ + && apt-get -y --purge autoremove \ + && apt-get autoclean \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ + && pip install zk-shell \ + && JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java)))) \ + && echo networkaddress.cache.ttl=1 >> $JAVA_HOME/conf/security/java.security \ + && echo networkaddress.cache.negative.ttl=1 >> $JAVA_HOME/conf/security/java.security + +# untar tarballs +ADD target/${DISTRO_NAME}.tar.gz /opt +RUN mv /opt/${PKG_NAME} /opt/bookkeeper + +WORKDIR /opt/bookkeeper + +COPY target/scripts /opt/bookkeeper/scripts +COPY scripts/install-python-client.sh /opt/bookkeeper/scripts +RUN chmod +x -R /opt/bookkeeper/scripts/ + +# copy the python client +ADD target/bookkeeper-client/ /opt/bookkeeper/bookkeeper-client +RUN /opt/bookkeeper/scripts/install-python-client.sh + +ENTRYPOINT [ "/bin/bash", "/opt/bookkeeper/scripts/entrypoint.sh" ] +CMD ["bookie"] + +#HEALTHCHECK --interval=10s --timeout=60s CMD /bin/bash /opt/bookkeeper/scripts/healthcheck.sh diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml new file mode 100644 index 00000000000..44d3faadab7 --- /dev/null +++ b/tests/docker-images/current-version-image/pom.xml @@ -0,0 +1,149 @@ + + + + + org.apache.bookkeeper.tests + docker-images + 4.16.4-SNAPSHOT + + 4.0.0 + org.apache.bookkeeper.tests + current-version-image + Apache BookKeeper :: Tests :: Docker Images :: Current Version + pom + + + org.apache.bookkeeper + bookkeeper-dist-server + ${project.parent.version} + bin + tar.gz + provided + + + + + docker + + + integrationTests + + + + + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + build-python-client + generate-resources + + exec + + + ${project.basedir}/target + ${project.basedir}/../../../stream/clients/python/scripts/docker_build.sh + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + generate-resources + + run + + + + copy python wheel file + + + copying docker scripts + + + + + + + + + com.spotify + dockerfile-maven-plugin + ${dockerfile-maven-plugin.version} + + + default + + build + + + + add-latest-tag + + tag + + + apachebookkeeper/bookkeeper-current + latest + + + + + apachebookkeeper/bookkeeper-current + ${project.version} + false + true + + ${project.version} + ${UBUNTU_MIRROR} + ${UBUNTU_SECURITY_MIRROR} + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + copy-docker-dependencies + + copy-dependencies + + generate-resources + + ${project.build.directory}/ + bookkeeper-dist-server + true + + + + + + + + + diff --git a/tests/docker-images/current-version-image/scripts/install-python-client.sh b/tests/docker-images/current-version-image/scripts/install-python-client.sh new file mode 100644 index 00000000000..2719b335ac1 --- /dev/null +++ b/tests/docker-images/current-version-image/scripts/install-python-client.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +set -x + +WHEEL_FILE=`ls /opt/bookkeeper/bookkeeper-client/*.whl` +pip install ${WHEEL_FILE} diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index fad8e528a3f..30bb223f8d9 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -29,5 +29,6 @@ all-released-versions-image all-versions-image + current-version-image diff --git a/tests/docker-images/statestore-image/Dockerfile b/tests/docker-images/statestore-image/Dockerfile index 7605541188d..dc48fd5120c 100644 --- a/tests/docker-images/statestore-image/Dockerfile +++ b/tests/docker-images/statestore-image/Dockerfile @@ -17,28 +17,30 @@ # under the License. # -FROM ubuntu:22.10 +FROM ubuntu:22.04 MAINTAINER Apache BookKeeper -ARG TARGETARCH - -#ENV OPTS="$OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" ENV BOOKIE_PORT=3181 ENV BOOKIE_HTTP_PORT=8080 ENV BOOKIE_GRPC_PORT=4181 EXPOSE ${BOOKIE_PORT} ${BOOKIE_HTTP_PORT} ${BOOKIE_GRPC_PORT} ENV BK_USER=bookkeeper ENV BK_HOME=/opt/bookkeeper -ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-$TARGETARCH ENV DEBIAN_FRONTEND=noninteractive - +ARG UBUNTU_MIRROR=http://archive.ubuntu.com/ubuntu/ +ARG UBUNTU_SECURITY_MIRROR=http://security.ubuntu.com/ubuntu/ RUN set -x \ + && sed -i -e "s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}|g" \ + -e "s|http://security\.ubuntu\.com/ubuntu/|${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}|g" /etc/apt/sources.list \ + && echo 'Acquire::http::Timeout "30";\nAcquire::http::ConnectionAttemptDelayMsec "2000";\nAcquire::https::Timeout "30";\nAcquire::https::ConnectionAttemptDelayMsec "2000";\nAcquire::ftp::Timeout "30";\nAcquire::ftp::ConnectionAttemptDelayMsec "2000";\nAcquire::Retries "15";' > /etc/apt/apt.conf.d/99timeout_and_retries \ && adduser "${BK_USER}" \ && apt-get update \ + && apt-get install -y ca-certificates apt-transport-https \ && apt-get install -y --no-install-recommends openjdk-17-jdk \ && apt-get install -y --no-install-recommends python3 pip \ && ln -s /usr/bin/python3 /usr/bin/python \ + && apt-get -y install netcat dnsutils less procps iputils-ping \ && apt-get install -y --no-install-recommends gpg gpg-agent wget sudo \ && apt-get -y --purge autoremove \ && apt-get autoclean \ @@ -46,7 +48,9 @@ RUN set -x \ && rm -rf /var/lib/apt/lists/* && pip install zk-shell \ && mkdir -pv /opt \ - && cd /opt + && JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java)))) \ + && echo networkaddress.cache.ttl=1 >> $JAVA_HOME/conf/security/java.security \ + && echo networkaddress.cache.negative.ttl=1 >> $JAVA_HOME/conf/security/java.security WORKDIR /opt/bookkeeper RUN mkdir /opt/bookkeeper/lib diff --git a/tests/docker-images/statestore-image/image_builder.sh b/tests/docker-images/statestore-image/image_builder.sh index e17ee608b75..8f305d0ec1d 100755 --- a/tests/docker-images/statestore-image/image_builder.sh +++ b/tests/docker-images/statestore-image/image_builder.sh @@ -42,7 +42,8 @@ cp "${BASE_DIR}"/stream/server/build/distributions/server-bin.tar.gz "${BASE_DIR cp "${BASE_DIR}"/docker/scripts/* "${BASE_DIR}"/tests/docker-images/statestore-image/scripts cp "${BASE_DIR}"/conf/* "${BASE_DIR}"/tests/docker-images/statestore-image/temp_conf cp "${BASE_DIR}"/bin/* "${BASE_DIR}"/tests/docker-images/statestore-image/temp_bin -docker build -t ${IMAGE_NAME} "${BASE_DIR}"/tests/docker-images/statestore-image +docker build --build-arg UBUNTU_MIRROR="${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}" --build-arg UBUNTU_SECURITY_MIRROR="${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}" \ + -t ${IMAGE_NAME} "${BASE_DIR}"/tests/docker-images/statestore-image rm -rf "${BASE_DIR}"/tests/docker-images/statestore-image/dist rm -rf "${BASE_DIR}"/tests/docker-images/statestore-image/scripts diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 5c02d9966c1..5a00d23d5b1 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -38,12 +38,12 @@ + org.apache.maven.plugins maven-compiler-plugin - ${javac.target} - ${javac.target} groovy-eclipse-compiler + true @@ -64,18 +64,6 @@ ${groovy-eclipse-compiler.version} true - - org.codehaus.gmavenplus - gmavenplus-plugin - ${gmavenplus-plugin.version} - - - - compileTests - - - - org.apache.maven.plugins maven-surefire-plugin @@ -93,6 +81,27 @@ + + + + com.github.docker-java + docker-java-bom + ${arquillian-cube.docker-java.version} + pom + import + + + org.arquillian.cube + arquillian-cube-docker + ${arquillian-cube.version} + + + org.yaml + snakeyaml + ${arquillian-cube.snakeyaml.version} + + + org.codehaus.groovy @@ -104,9 +113,8 @@ arquillian-cube-docker - org.jboss.arquillian.junit - arquillian-junit-container - test + javax.ws.rs + javax.ws.rs-api diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index e8a87f87cb8..8b876ef539a 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -47,7 +47,7 @@ org.apache.zookeeper zookeeper - + org.arquillian.cube @@ -71,6 +71,11 @@ pom + + javax.ws.rs + javax.ws.rs-api + + @@ -78,12 +83,9 @@ org.apache.maven.plugins maven-surefire-plugin - - 2.8.1 1 + false false diff --git a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/BookKeeperClusterUtils.java b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/BookKeeperClusterUtils.java index d6f02ca5c22..1e5044999a1 100644 --- a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/BookKeeperClusterUtils.java +++ b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/BookKeeperClusterUtils.java @@ -91,8 +91,12 @@ public static boolean zookeeperRunning(DockerClient docker, String containerId) public static void legacyMetadataFormat(DockerClient docker) throws Exception { @Cleanup ZooKeeper zk = BookKeeperClusterUtils.zookeeperClient(docker); - zk.create("/ledgers", new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); - zk.create("/ledgers/available", new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); + if (zk.exists("/ledgers", false) == null) { + zk.create("/ledgers", new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); + } + if (zk.exists("/ledgers/available", false) == null) { + zk.create("/ledgers/available", new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); + } } public static boolean metadataFormatIfNeeded(DockerClient docker, String version) throws Exception { @@ -259,9 +263,6 @@ public static boolean waitAllBookieUp(DockerClient docker) { } private static String computeBinFilenameByVersion(String version) { - if (OLD_CLIENT_VERSIONS_WITH_OLD_BK_BIN_NAME.contains(version)) { - return "bookkeeper"; - } - return "bookkeeper_gradle"; + return "bookkeeper"; } } diff --git a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/DockerUtils.java b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/DockerUtils.java index 4c8d5bfaeb5..bae9057fa1b 100644 --- a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/DockerUtils.java +++ b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/DockerUtils.java @@ -52,9 +52,9 @@ public class DockerUtils { private static final Logger LOG = LoggerFactory.getLogger(DockerUtils.class); private static File getTargetDirectory(String containerId) { - String base = System.getProperty("gradle.buildDirectory"); + String base = System.getProperty("maven.buildDirectory"); if (base == null) { - base = "build"; + base = "target"; } File directory = new File(base + "/container-logs/" + containerId); if (!directory.exists() && !directory.mkdirs()) { diff --git a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/MavenClassLoader.java b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/MavenClassLoader.java index c393f609c14..2b1fabf6bed 100644 --- a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/MavenClassLoader.java +++ b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/MavenClassLoader.java @@ -17,6 +17,8 @@ */ package org.apache.bookkeeper.tests.integration.utils; +import static org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenDependencies.createExclusion; + import com.google.common.collect.Lists; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import groovy.lang.Closure; @@ -40,21 +42,43 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import java.util.zip.GZIPInputStream; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.archivers.ArchiveStreamFactory; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.jboss.shrinkwrap.resolver.api.maven.ConfigurableMavenResolverSystem; import org.jboss.shrinkwrap.resolver.api.maven.Maven; +import org.jboss.shrinkwrap.resolver.api.maven.MavenResolvedArtifact; import org.jboss.shrinkwrap.resolver.api.maven.ScopeType; +import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenCoordinate; import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenDependencies; import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenDependency; /** * A maven class loader for resolving and loading maven artifacts. */ +@Slf4j public class MavenClassLoader implements AutoCloseable { + private static ScheduledExecutorService delayedCloseExecutor = createExecutorThatShutsDownIdleThreads(); + + private static ScheduledExecutorService createExecutorThatShutsDownIdleThreads() { + ScheduledExecutorService executor = Executors.newScheduledThreadPool(1); + // Cast to ThreadPoolExecutor to access additional configuration methods + ThreadPoolExecutor poolExecutor = (ThreadPoolExecutor) executor; + // Set the timeout for idle threads + poolExecutor.setKeepAliveTime(10, TimeUnit.SECONDS); + // Allow core threads to time out + poolExecutor.allowCoreThreadTimeOut(true); + return executor; + } private static List currentVersionLibs; @@ -77,22 +101,45 @@ private static MavenClassLoader createClassLoader(ConfigurableMavenResolverSyste String mainArtifact) throws Exception { Optional slf4jVersion = Arrays.stream(resolver.resolve(mainArtifact) .withTransitivity().asResolvedArtifact()) - .filter((a) -> a.getCoordinate().getGroupId().equals("org.slf4j") - && a.getCoordinate().getArtifactId().equals("slf4j-1.2-api")) + .filter((a) -> a.getCoordinate().getGroupId().equals("org.slf4j")) .map((a) -> a.getCoordinate().getVersion()) .findFirst(); + MavenDependency dependency = MavenDependencies.createDependency(mainArtifact, ScopeType.COMPILE, false, + createExclusion("log4j", "log4j"), + createExclusion("org.slf4j", "slf4j-log4j12"), + createExclusion("ch.qos.reload4j", "log4j"), + createExclusion("org.slf4j", "slf4j-reload4j"), + createExclusion("org.apache.logging.log4j", "*") + ); List deps = Lists.newArrayList( - MavenDependencies.createDependency( - mainArtifact, ScopeType.COMPILE, false)); + dependency); if (slf4jVersion.isPresent()) { deps.add(MavenDependencies.createDependency("org.slf4j:slf4j-simple:" + slf4jVersion.get(), ScopeType.COMPILE, false)); + deps.add(MavenDependencies.createDependency("org.slf4j:jcl-over-slf4j:" + slf4jVersion.get(), + ScopeType.COMPILE, false)); } - File[] files = resolver.addDependencies(deps.toArray(new MavenDependency[0])) - .resolve().withTransitivity().asFile(); - return createClassLoader(files); + MavenResolvedArtifact[] resolvedArtifact = resolver.addDependencies(deps.toArray(new MavenDependency[0])) + .resolve().withTransitivity().asResolvedArtifact(); + File[] files = Arrays.stream(resolvedArtifact) + .filter((a) -> { + MavenCoordinate c = a.getCoordinate(); + // exclude log4j + if (c.getGroupId().equals("org.apache.logging.log4j") || c.getGroupId().equals("log4j") + || c.getGroupId().equals("ch.qos.reload4j") + || c.getGroupId().equals("commons-logging")) { + return false; + } + if (c.getArtifactId().contains("log4j") || c.getArtifactId().contains("commons-logging")) { + return false; + } + return true; + }).map(MavenResolvedArtifact::asFile) + .collect(Collectors.toList()) + .toArray(new File[0]); + return createClassLoader(files); } private static MavenClassLoader createClassLoader(File[] jars) { @@ -115,6 +162,12 @@ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundE try { loadedClass = findClass(name); } catch (ClassNotFoundException ignored) { + // never load these classes from the parent classloader + if (name.startsWith("org.apache") + || name.startsWith("org.slf4j") + || name.startsWith("log4j")) { + throw ignored; + } } if (loadedClass == null) { try { @@ -139,13 +192,22 @@ public static MavenClassLoader forBookKeeperVersion(String version) throws Excep return forArtifact("org.apache.bookkeeper:bookkeeper-server:" + version); } - private static MavenClassLoader forBookkeeperCurrentVersion() throws Exception { + private static synchronized MavenClassLoader forBookkeeperCurrentVersion() throws Exception { if (currentVersionLibs == null) { final String version = BookKeeperClusterUtils.CURRENT_VERSION; + String rootDirectory = System.getenv("GITHUB_WORKSPACE"); + if (rootDirectory == null) { + File gitDirectory = findGitRoot(new File(".")); + if (gitDirectory != null) { + rootDirectory = gitDirectory.getAbsolutePath(); + } else { + rootDirectory = System.getProperty("maven.buildDirectory", ".") + "/../../../.."; + } + } final String artifactName = "bookkeeper-server-" + version + "-bin"; - final Path tarFile = Paths.get("..", "..", "..", - "bookkeeper-dist", "server", "build", "distributions", artifactName + ".tar.gz"); - final File tempDir = new File("build"); + final Path tarFile = Paths.get(rootDirectory, + "bookkeeper-dist", "server", "target", artifactName + ".tar.gz").toAbsolutePath(); + final File tempDir = new File(System.getProperty("maven.buildDirectory", "target")); extractTarGz(tarFile.toFile(), tempDir); List jars = new ArrayList<>(); Files.list(Paths.get(tempDir.getAbsolutePath(), "bookkeeper-server-" + version, "lib")) @@ -157,6 +219,16 @@ private static MavenClassLoader forBookkeeperCurrentVersion() throws Exception { return createClassLoader(currentVersionLibs.toArray(new File[]{})); } + private static File findGitRoot(File currentDir) { + while (currentDir != null) { + if (new File(currentDir, ".git").exists()) { + return currentDir; + } + currentDir = currentDir.getParentFile(); + } + return null; + } + public Object callStaticMethod(String className, String methodName, ArrayList args) throws Exception { Class klass = Class.forName(className, true, classloader); @@ -216,26 +288,31 @@ public Object newInstance(String className, Object... args) throws Exception { } public Object newBookKeeper(String zookeeper) throws Exception { - Class clientConfigurationClass = Class - .forName("org.apache.bookkeeper.conf.ClientConfiguration", true, classloader); - Object clientConfiguration = newInstance("org.apache.bookkeeper.conf.ClientConfiguration"); - clientConfigurationClass - .getMethod("setZkServers", String.class) - .invoke(clientConfiguration, zookeeper); - - // relax timeouts in order to get tests passing in limited environments - clientConfigurationClass - .getMethod("setReadTimeout", int.class) - .invoke(clientConfiguration, 15); - - clientConfigurationClass - .getMethod("setZkTimeout", int.class) - .invoke(clientConfiguration, 30_000); - Class klass = Class.forName("org.apache.bookkeeper.client.BookKeeper", true, classloader); - return klass - .getConstructor(clientConfigurationClass) - .newInstance(clientConfiguration); + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(classloader); + Class clientConfigurationClass = Class + .forName("org.apache.bookkeeper.conf.ClientConfiguration", true, classloader); + Object clientConfiguration = newInstance("org.apache.bookkeeper.conf.ClientConfiguration"); + clientConfigurationClass + .getMethod("setZkServers", String.class) + .invoke(clientConfiguration, zookeeper); + + // relax timeouts in order to get tests passing in limited environments + clientConfigurationClass + .getMethod("setReadTimeout", int.class) + .invoke(clientConfiguration, 15); + clientConfigurationClass + .getMethod("setZkTimeout", int.class) + .invoke(clientConfiguration, 30_000); + Class klass = Class.forName("org.apache.bookkeeper.client.BookKeeper", true, classloader); + return klass + .getConstructor(clientConfigurationClass) + .newInstance(clientConfiguration); + } finally { + Thread.currentThread().setContextClassLoader(contextClassLoader); + } } public Object digestType(String type) throws Exception { @@ -251,7 +328,14 @@ public Object digestType(String type) throws Exception { @Override public void close() throws Exception { if (classloader instanceof Closeable) { - ((Closeable) classloader).close(); + // delay closing the classloader so that currently executing asynchronous tasks can complete + delayedCloseExecutor.schedule(() -> { + try { + ((Closeable) classloader).close(); + } catch (Exception e) { + log.error("Failed to close classloader", e); + } + }, 5, TimeUnit.SECONDS); } } @@ -283,14 +367,16 @@ private static void unTar(final File inputFile, final File outputDir) throws Exc TarArchiveEntry entry; while ((entry = (TarArchiveEntry) debInputStream.getNextEntry()) != null) { final File outputFile = new File(outputDir, entry.getName()); + if (!outputFile.getParentFile().exists()) { + outputFile.getParentFile().mkdirs(); + } if (entry.isDirectory()) { - if (!outputFile.exists()) { - if (!outputFile.mkdirs()) { - throw new IllegalStateException( - String.format("Couldn't create directory %s.", outputFile.getAbsolutePath())); - } - } else { - outputFile.delete(); + if (outputFile.exists()) { + FileUtils.deleteDirectory(outputFile); + } + if (!outputFile.mkdirs()) { + throw new IllegalStateException( + String.format("Couldn't create directory %s.", outputFile.getAbsolutePath())); } } else { try (final OutputStream outputFileStream = new FileOutputStream(outputFile)) { diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index c4696604416..e9247a62720 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -74,7 +74,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} 0 diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 5bdaa7da3a8..a10dea338cf 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -29,6 +29,28 @@ jar Apache BookKeeper :: Tests :: Integration :: Smoke test + + + + com.github.docker-java + docker-java-bom + ${arquillian-cube.docker-java.version} + pom + import + + + org.arquillian.cube + arquillian-cube-docker + ${arquillian-cube.version} + + + org.yaml + snakeyaml + ${arquillian-cube.snakeyaml.version} + + + + org.apache.bookkeeper @@ -56,6 +78,11 @@ arquillian-junit-standalone test + + + org.arquillian.cube + arquillian-cube-docker + @@ -63,7 +90,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} 0 diff --git a/tests/integration/smoke/src/test/java/org/apache/bookkeeper/tests/integration/BookieShellTestBase.java b/tests/integration/smoke/src/test/java/org/apache/bookkeeper/tests/integration/BookieShellTestBase.java index 05ff030470a..59626881da0 100644 --- a/tests/integration/smoke/src/test/java/org/apache/bookkeeper/tests/integration/BookieShellTestBase.java +++ b/tests/integration/smoke/src/test/java/org/apache/bookkeeper/tests/integration/BookieShellTestBase.java @@ -22,13 +22,17 @@ import lombok.extern.slf4j.Slf4j; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; /** * Test Base for testing bookie shell scripts. */ @Slf4j public abstract class BookieShellTestBase { + @Rule + public Timeout testTimeout = Timeout.seconds(300); String currentVersion = System.getProperty("currentVersion"); String bkScript; diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 1ccfd94f5d7..ff317d13516 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -59,7 +59,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} 0 diff --git a/tests/pom.xml b/tests/pom.xml index 900836365aa..07a96c1a42c 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -28,7 +28,10 @@ Apache BookKeeper :: Tests - 3.0.11 + 3.0.20 + + 3.2.14 + 1.19 diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 00e791ef6f9..498ddaac1d4 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -54,8 +54,8 @@ spotbugs-maven-plugin + org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} diff --git a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommandTest.java b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommandTest.java index b06f0a62c3a..70ffa46f00d 100644 --- a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommandTest.java +++ b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommandTest.java @@ -38,6 +38,7 @@ import java.util.Random; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Collectors; import org.apache.bookkeeper.client.api.CreateBuilder; import org.apache.bookkeeper.client.api.DeleteBuilder; import org.apache.bookkeeper.client.api.DigestType; @@ -79,7 +80,6 @@ public void testCommandLongArgs() throws Exception { public void testCommand(String... args) throws Exception { WriteHandle wh = mock(WriteHandle.class); AtomicLong counter = new AtomicLong(0L); - when(wh.append(any(byte[].class))).thenReturn(counter.get()); CreateBuilder createBuilder = mock(CreateBuilder.class); when(createBuilder.execute()).thenReturn(FutureUtils.value(wh)); when(createBuilder.withEnsembleSize(anyInt())).thenReturn(createBuilder); @@ -90,23 +90,29 @@ public void testCommand(String... args) throws Exception { when(createBuilder.withPassword(any(byte[].class))).thenReturn(createBuilder); when(createBuilder.execute()).thenReturn(CompletableFuture.completedFuture(wh)); when(mockBk.newCreateLedgerOp()).thenReturn(createBuilder); - + long ledgerId = 1234L; + when(wh.getId()).thenReturn(ledgerId); + when(wh.getLastAddPushed()).then(__ -> counter.get() - 1L); List entries = new ArrayList<>(); byte[] data = new byte[100]; // test data Random random = new Random(0); for (int i = 0; i < data.length; i++) { data[i] = (byte) (random.nextInt(26) + 65); } - for (int i = 0; i < 10; i++) { + when(wh.append(any(byte[].class))).then(invocation -> { + long entryId = counter.getAndIncrement(); ByteBuf buffer = UnpooledByteBufAllocator.DEFAULT.heapBuffer(100); buffer.writeBytes(data); - entries.add(LedgerEntryImpl.create(counter.get(), i, data.length, buffer)); - } - - LedgerEntriesImpl ledgerEntries = LedgerEntriesImpl.create(entries); - + entries.add(LedgerEntryImpl.create(ledgerId, entryId, data.length, buffer)); + return entryId; + }); ReadHandle rh = mock(ReadHandle.class); - when(rh.read(anyLong(), anyLong())).thenReturn(ledgerEntries); + when(rh.read(anyLong(), anyLong())).then( + __ -> LedgerEntriesImpl.create(entries.stream() + .map(LedgerEntry::duplicate).collect(Collectors.toList()))); + when(rh.readUnconfirmed(anyLong(), anyLong())).then( + __ -> LedgerEntriesImpl.create(entries.stream() + .map(LedgerEntry::duplicate).collect(Collectors.toList()))); OpenBuilder openBuilder = mock(OpenBuilder.class); when(openBuilder.withLedgerId(anyLong())).thenReturn(openBuilder); when(openBuilder.withDigestType(any())).thenReturn(openBuilder); @@ -134,10 +140,10 @@ public void testCommand(String... args) throws Exception { verify(createBuilder, times(1)).withPassword(eq(new byte[0])); verify(createBuilder, times(1)).execute(); - verify(openBuilder, times(1)).withLedgerId(eq(0L)); - verify(openBuilder, times(1)).execute(); + verify(openBuilder, times(2)).withLedgerId(eq(1234L)); + verify(openBuilder, times(2)).execute(); - verify(deleteBuilder, times(1)).withLedgerId(eq(0L)); + verify(deleteBuilder, times(1)).withLedgerId(eq(1234L)); verify(deleteBuilder, times(1)).execute(); // verify appends From 00538d14b72b293b5582ca492801f358b7559ef8 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Thu, 21 Mar 2024 16:34:08 +0800 Subject: [PATCH 112/233] Advance branch version (#4192) --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 90 files changed, 92 insertions(+), 92 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index bdb82cb5647..1e1f6ea18d5 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index eac95eef2ec..43e0b4edb3d 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 74987bc25df..200584cf12a 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 47d91e6b68d..10708b049df 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 222a9192c67..943d81e7884 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 892b185044f..9bedfcd311f 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 52c40121ba3..6e4e7bbd94d 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index b8923105be2..ee69c1ecb7d 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 729115a0e5d..c9b76422759 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index eef6d199d1e..dcba5d650cd 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index f2601e5a953..423af7be8c2 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index b56a17f5699..5e455906652 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index be0d6d6a40f..2152b6efff6 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 8d936a5f844..5228c4e8a25 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index ddb67bf6d28..23bd7aadf40 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 34d25cb1610..2e4f5224ffe 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f29f77df900..357f89749c6 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 54a46d99abb..a0391e9b013 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 1ff2c12b73e..680bc2debc7 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index a85f033d7d9..52230fb5bdc 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 5c2a0748225..e1174072760 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 5aebdd2ef3f..70c0c06c277 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 1aaa47fb7c2..61b38356da5 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 25c40ef7153..96d53f48617 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 6f531b0605f..c8d70f3cd65 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index b954a0cb60c..e4085575e7d 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 7ca68c96de7..59cc45b88e7 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 6a3680ca5dc..a900ce7c985 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 5448b115681..9197b37ea23 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 5a177e97ef5..2a1b5283b64 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 2255ddeee60..89808ab5579 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 0edc2704dbf..86b8f759461 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index d5cc4f2ccc3..d02349aa8a8 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 39710f59788..cc3f55e707b 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 94b58f077ce..403c247c894 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 912c9c06741..d186065eb67 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 9ee0082b776..138a77fa686 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 701886d62c6..42fb5734034 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 936621fba83..c24841c86b3 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 3cbca66086b..19a6b8f7128 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 6f72e1f835c..44a39a9f746 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index d7f63439df9..4f4063b9088 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 07c00f7a9e6..54657574c1c 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 6436b5740a7..1fc502442d5 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 798889e2cd2..5b39299620a 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 7d58702f080..e471bce02c3 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index cf3b91a3c30..4214a3126e2 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 289ed4f0889..3ee3e143d2e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 943f341b7d2..d1fba9529d3 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index c3cdd0206f0..f2c9f91a4ca 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 514bce17c11..67d1f32f227 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index b0bc7706509..d3b49ce3466 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 0d6d352cea6..290717be4c1 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index cb9b00dd890..28506408b8d 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index be326a996f6..a338c280a63 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 14254cdcb42..e1abeea6f3d 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 3bd0fa870cb..fbd1bed1899 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 59692e55fdf..d6c3bbbca1f 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index dde37c87246..c22193e612a 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index befc066d751..f0c768ba887 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 1241fc732a2..f510c2e3f45 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 090496e3d0f..8715fc5cb43 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index deda6a66428..6b2a6678fed 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 2f54fc1a24d..504f3803c9c 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 43e601d51b3..584350e323a 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 3eebc908f3b..6ee1cfbfa95 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 9a3148eda3e..740d80427ff 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index b6412edb755..e9876d20e11 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 30bb223f8d9..4af406aecc8 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 5a00d23d5b1..aadc38ae53e 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 65cc9ca012c..dff9d4a1951 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 42c9069b845..bf83805abec 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 8b876ef539a..1826d42180d 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index e9247a62720..35d1832dcca 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 03419ec4b33..64708b97a53 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index a10dea338cf..3a8e202bb03 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index ff317d13516..ed82c49e8e0 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 07a96c1a42c..0b88f83ea3b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 0efb891691c..13a75f34e12 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 498ddaac1d4..48e3cdc317e 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 3274c5a5214..b5671a13012 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index e6335c32534..fce4ac44478 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d510eba453c..d23817495df 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 359dbf7ad6e..e3a4cf1847f 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 28190a5f479..1adad3d7430 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 8b2f8988fcc..449e5458800 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 1b055e348ad..0e5e98e3c8e 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 1765770b485..24c67af4a5c 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index c111e75d93e..4a2a7e44956 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index da62a144fdf..fbdc43edd6e 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From 017e7118640fc135566ac67d44a8e8458b6ead96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=A4=E6=9C=88?= <974226358@qq.com> Date: Mon, 29 Jan 2024 20:19:44 +0800 Subject: [PATCH 113/233] [improve][docker] fix yaml and dockerfile (#4186) Descriptions of the changes in this PR: 1. There are multiple spec.ports fields in sts yaml 2. The RUN command specified in dockerfile is not standardized Master Issue: #4185 (cherry picked from commit 1eceb5dd2180ab57e5b21be968206292bb825177) --- deploy/kubernetes/gke/bookkeeper.statefulset.yml | 1 - tests/docker-images/statestore-image/Dockerfile | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/deploy/kubernetes/gke/bookkeeper.statefulset.yml b/deploy/kubernetes/gke/bookkeeper.statefulset.yml index 49548f09d05..ca32b91137d 100644 --- a/deploy/kubernetes/gke/bookkeeper.statefulset.yml +++ b/deploy/kubernetes/gke/bookkeeper.statefulset.yml @@ -124,7 +124,6 @@ metadata: app: bookkeeper component: bookie spec: - ports: ports: - name: bookie port: 3181 diff --git a/tests/docker-images/statestore-image/Dockerfile b/tests/docker-images/statestore-image/Dockerfile index dc48fd5120c..5a7a1688855 100644 --- a/tests/docker-images/statestore-image/Dockerfile +++ b/tests/docker-images/statestore-image/Dockerfile @@ -42,10 +42,10 @@ RUN set -x \ && ln -s /usr/bin/python3 /usr/bin/python \ && apt-get -y install netcat dnsutils less procps iputils-ping \ && apt-get install -y --no-install-recommends gpg gpg-agent wget sudo \ - && apt-get -y --purge autoremove \ - && apt-get autoclean \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* + && apt-get -y --purge autoremove \ + && apt-get autoclean \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ && pip install zk-shell \ && mkdir -pv /opt \ && JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java)))) \ From e10414258fd64e77c47ea759ba4c528970a18560 Mon Sep 17 00:00:00 2001 From: Tom Jorissen Date: Mon, 18 Mar 2024 07:40:44 +0100 Subject: [PATCH 114/233] Issue 2161: set metrics endpoint content-type (#4208) * fix: set metrics endpoint content-type when bookie http server is enabled * fix: checkstyle * fix: use existing prometheus content type constant * chore: use minimal dependency / license fixes * Revert "chore: use minimal dependency / license fixes" This reverts commit 7daf8bec6d18f3d467398a39c012871e2fc059aa. * Revert "fix: use existing prometheus content type constant" This reverts commit c265c493ac3b7a55dd34c970a1ac8380bd0e8623. (cherry picked from commit 382184e71a02c122c4eb88495d10b4895dc9578e) --- .../bookkeeper/http/service/HttpServiceResponse.java | 10 ++++++++++ .../bookkeeper/http/vertx/VertxAbstractHandler.java | 4 ++++ .../bookkeeper/server/http/service/MetricsService.java | 3 +++ .../server/http/service/MetricsServiceTest.java | 6 ++++++ 4 files changed, 23 insertions(+) diff --git a/bookkeeper-http/http-server/src/main/java/org/apache/bookkeeper/http/service/HttpServiceResponse.java b/bookkeeper-http/http-server/src/main/java/org/apache/bookkeeper/http/service/HttpServiceResponse.java index eb300a0effc..75b2a6a7753 100644 --- a/bookkeeper-http/http-server/src/main/java/org/apache/bookkeeper/http/service/HttpServiceResponse.java +++ b/bookkeeper-http/http-server/src/main/java/org/apache/bookkeeper/http/service/HttpServiceResponse.java @@ -28,6 +28,7 @@ */ public class HttpServiceResponse { private String body; + private String contentType; private HttpServer.StatusCode code = HttpServer.StatusCode.OK; public HttpServiceResponse() {} @@ -41,6 +42,10 @@ public String getBody() { return body; } + public String getContentType() { + return contentType; + } + public int getStatusCode() { return code.getValue(); } @@ -50,6 +55,11 @@ public HttpServiceResponse setBody(String body) { return this; } + public HttpServiceResponse setContentType(String contentType) { + this.contentType = contentType; + return this; + } + public HttpServiceResponse setCode(HttpServer.StatusCode code) { this.code = code; return this; diff --git a/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxAbstractHandler.java b/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxAbstractHandler.java index 16c5ffc04b6..9c595511f61 100644 --- a/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxAbstractHandler.java +++ b/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxAbstractHandler.java @@ -20,6 +20,7 @@ */ package org.apache.bookkeeper.http.vertx; +import io.netty.handler.codec.http.HttpHeaderNames; import io.vertx.core.Handler; import io.vertx.core.http.HttpMethod; import io.vertx.core.http.HttpServerRequest; @@ -56,6 +57,9 @@ void processRequest(HttpEndpointService httpEndpointService, RoutingContext cont response = new ErrorHttpService().handle(request); } httpResponse.setStatusCode(response.getStatusCode()); + if (response.getContentType() != null) { + httpResponse.putHeader(HttpHeaderNames.CONTENT_TYPE, response.getContentType()); + } httpResponse.end(response.getBody()); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/MetricsService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/MetricsService.java index 0d62ca9dafe..d3d57f72fa4 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/MetricsService.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/MetricsService.java @@ -35,6 +35,8 @@ */ public class MetricsService implements HttpEndpointService { + public static final String PROMETHEUS_CONTENT_TYPE_004 = "text/plain; version=0.0.4; charset=utf-8"; + private final ServerConfiguration conf; private final StatsProvider statsProvider; @@ -65,6 +67,7 @@ public HttpServiceResponse handle(HttpServiceRequest request) throws Exception { statsProvider.writeAllMetrics(writer); writer.flush(); response.setCode(StatusCode.OK); + response.setContentType(PROMETHEUS_CONTENT_TYPE_004); response.setBody(writer.getBuffer().toString()); } catch (UnsupportedOperationException uoe) { response.setCode(StatusCode.INTERNAL_ERROR); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/MetricsServiceTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/MetricsServiceTest.java index 3f5e63d60b4..c46dfe29976 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/MetricsServiceTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/MetricsServiceTest.java @@ -19,6 +19,7 @@ package org.apache.bookkeeper.server.http.service; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.doAnswer; @@ -55,6 +56,7 @@ public void testForbiddenMethods() throws Exception { HttpServiceRequest request = new HttpServiceRequest().setMethod(Method.PUT); HttpServiceResponse response = service.handle(request); assertEquals(StatusCode.FORBIDDEN.getValue(), response.getStatusCode()); + assertNull(response.getContentType()); assertEquals( "PUT is forbidden. Should be GET method", response.getBody()); @@ -66,6 +68,7 @@ public void testNullStatsProvider() throws Exception { HttpServiceRequest request = new HttpServiceRequest().setMethod(Method.GET); HttpServiceResponse response = service.handle(request); assertEquals(StatusCode.INTERNAL_ERROR.getValue(), response.getStatusCode()); + assertNull(response.getContentType()); assertEquals( "Stats provider is not enabled. Please enable it by set statsProviderClass" + " on bookie configuration", @@ -86,6 +89,7 @@ public void testWriteMetrics() throws Exception { HttpServiceResponse response = service.handle(request); assertEquals(StatusCode.OK.getValue(), response.getStatusCode()); + assertEquals(MetricsService.PROMETHEUS_CONTENT_TYPE_004, response.getContentType()); assertEquals(content, response.getBody()); } @@ -98,6 +102,7 @@ public void testWriteMetricsException() throws Exception { HttpServiceResponse response = service.handle(request); assertEquals(StatusCode.INTERNAL_ERROR.getValue(), response.getStatusCode()); + assertNull(response.getContentType()); assertEquals("Exceptions are thrown when exporting metrics : write-metrics-exception", response.getBody()); } @@ -111,6 +116,7 @@ public void testWriteMetricsUnimplemented() throws Exception { HttpServiceResponse response = service.handle(request); assertEquals(StatusCode.INTERNAL_ERROR.getValue(), response.getStatusCode()); + assertNull(response.getContentType()); assertEquals("Currently stats provider doesn't support exporting metrics in http service", response.getBody()); } From aa03dae1f9864aa5b3b417c8a8cc4f1e77f07e7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:42:14 +0800 Subject: [PATCH 115/233] Bump org.apache.commons:commons-compress from 1.21 to 1.26.0 (#4214) (cherry picked from commit 4a55cce848c7d782d3693a12f35b4016c13da66e) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 96d53f48617..7922d034769 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ 4.1 1.6 1.10 - 1.21 + 1.26.0 2.6 3.6 2.7 From 9359bc1f9d3e3611a5e4a43974187ec322213b18 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 4 Mar 2024 12:08:41 +0800 Subject: [PATCH 116/233] Fix uncontrolled data used in path expression (#4221) * Fix uncontrolled data used in path expression * update code * update code (cherry picked from commit 34d85153f7387a5e1012f31d694ce8956eeed275) --- .../java/org/apache/bookkeeper/util/LocalBookKeeper.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java index dff6d1b8ba4..ca467ab2975 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java @@ -58,6 +58,7 @@ import org.apache.bookkeeper.stats.NullStatsLogger; import org.apache.bookkeeper.zookeeper.ZooKeeperClient; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.Op; @@ -333,6 +334,13 @@ private static LocalBookKeeper getLocalBookiesInternal(ServerConfiguration conf, * @throws IOException */ private void serializeLocalBookieConfig(ServerConfiguration localBookieConfig, String fileName) throws IOException { + if (StringUtils.isBlank(fileName) + || fileName.contains("..") + || fileName.contains("/") + || fileName.contains("\\")) { + throw new IllegalArgumentException("Invalid filename: " + fileName); + } + File localBookieConfFile = new File(localBookiesConfigDir, fileName); if (localBookieConfFile.exists() && !localBookieConfFile.delete()) { throw new IOException( From 081024a3728557c82d9978e23cdde08486e8dd14 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 4 Mar 2024 12:07:49 +0800 Subject: [PATCH 117/233] Add filename check for unTar (#4222) * add filename check for unTar * update code (cherry picked from commit 48b7d1ebb1138074356da9790fb20f3219c887a4) --- .../bookkeeper/tests/integration/utils/DockerUtils.java | 6 +++++- .../tests/integration/utils/MavenClassLoader.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/DockerUtils.java b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/DockerUtils.java index bae9057fa1b..a3b8778946a 100644 --- a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/DockerUtils.java +++ b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/DockerUtils.java @@ -135,7 +135,11 @@ public static void dumpContainerLogDirToTarget(DockerClient docker, String conta TarArchiveEntry entry = stream.getNextTarEntry(); while (entry != null) { if (entry.isFile()) { - File output = new File(getTargetDirectory(containerId), entry.getName().replace("/", "-")); + File targetDir = getTargetDirectory(containerId); + File output = new File(targetDir, entry.getName().replace("/", "-")); + if (!output.toPath().normalize().startsWith(targetDir.toPath())) { + throw new IOException("Bad zip entry"); + } try (FileOutputStream os = new FileOutputStream(output)) { byte[] block = new byte[readBlockSize]; int read = stream.read(block, 0, readBlockSize); diff --git a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/MavenClassLoader.java b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/MavenClassLoader.java index 2b1fabf6bed..d77c3920acf 100644 --- a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/MavenClassLoader.java +++ b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/MavenClassLoader.java @@ -367,6 +367,10 @@ private static void unTar(final File inputFile, final File outputDir) throws Exc TarArchiveEntry entry; while ((entry = (TarArchiveEntry) debInputStream.getNextEntry()) != null) { final File outputFile = new File(outputDir, entry.getName()); + if (!outputFile.toPath().normalize().startsWith(outputDir.toPath())) { + throw new IOException("Bad zip entry"); + } + if (!outputFile.getParentFile().exists()) { outputFile.getParentFile().mkdirs(); } From 59591281e010dfe3834902860a01fb58c56f9438 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Tue, 5 Mar 2024 00:13:05 +0800 Subject: [PATCH 118/233] Fix error stack track may expose to external user (#4223) * fix error stack track may expose to external user * update code * fix check style (cherry picked from commit b5b518182b7cea448273dbfad1e307460d782423) --- .../http/servlet/BookieHttpServiceServlet.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/bookkeeper-http/servlet-http-server/src/main/java/org/apache/bookkeeper/http/servlet/BookieHttpServiceServlet.java b/bookkeeper-http/servlet-http-server/src/main/java/org/apache/bookkeeper/http/servlet/BookieHttpServiceServlet.java index 10f7b119148..30fe063786a 100644 --- a/bookkeeper-http/servlet-http-server/src/main/java/org/apache/bookkeeper/http/servlet/BookieHttpServiceServlet.java +++ b/bookkeeper-http/servlet-http-server/src/main/java/org/apache/bookkeeper/http/servlet/BookieHttpServiceServlet.java @@ -35,7 +35,6 @@ import org.apache.bookkeeper.http.HttpServer; import org.apache.bookkeeper.http.HttpServer.ApiType; import org.apache.bookkeeper.http.HttpServiceProvider; -import org.apache.bookkeeper.http.service.ErrorHttpService; import org.apache.bookkeeper.http.service.HttpEndpointService; import org.apache.bookkeeper.http.service.HttpServiceRequest; import org.apache.bookkeeper.http.service.HttpServiceResponse; @@ -91,16 +90,12 @@ protected void service(HttpServletRequest httpRequest, HttpServletResponse httpR return; } response = httpEndpointService.handle(request); - } catch (Throwable e) { - LOG.error("Error while service Bookie API request " + uri, e); - response = new ErrorHttpService().handle(request); - } - if (response != null) { httpResponse.setStatus(response.getStatusCode()); try (Writer out = httpResponse.getWriter()) { out.write(response.getBody()); } - } else { + } catch (Throwable e) { + LOG.error("Error while service Bookie API request {}", uri, e); httpResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } } From dc326c0737a7411afcfb07fac9225710617eb206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= Date: Thu, 21 Mar 2024 09:46:03 +0100 Subject: [PATCH 119/233] Fix POM version --- tests/docker-images/current-version-image/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 44d3faadab7..24e622bc26d 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.4-SNAPSHOT + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests From 8407f9635839db5db2af09c75198b41f766912c7 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 21 Mar 2024 03:01:50 -0700 Subject: [PATCH 120/233] Simplify getting project version in release script (#4235) (cherry picked from commit ca98a7e482987a3e6daaf9763c0794dde1753598) --- dev/release/000-run-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/release/000-run-docker.sh b/dev/release/000-run-docker.sh index 7854dc49dd3..ab7a313d44a 100755 --- a/dev/release/000-run-docker.sh +++ b/dev/release/000-run-docker.sh @@ -56,7 +56,7 @@ UserSpecificDocker BOOKKEEPER_ROOT=${SCRIPT_DIR}/../.. -VERSION=`cd $BOOKKEEPER_ROOT && mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|Download\w+:)' | sed 's/^\(.*\)-SNAPSHOT/\1/'` +VERSION=`cd $BOOKKEEPER_ROOT && mvn initialize help:evaluate -Dexpression=project.version -pl . -q -DforceStdout | grep -Ev '(^\[|Download\w+:)' | sed 's/^\(.*\)-SNAPSHOT/\1/'` versions_list=(`echo $VERSION | tr '.' ' '`) major_version=${versions_list[0]} minor_version=${versions_list[1]} From cc124dcc7753eb09f141c21e7218dd3cd17da146 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 21 Mar 2024 06:17:52 -0700 Subject: [PATCH 121/233] Fix duplicate artifacts issue with maven-source-plugin in release build (#4237) (cherry picked from commit 5abb87f2705d8f4fc784cc2a27182e8022f384fc) --- bookkeeper-common/pom.xml | 1 - bookkeeper-dist/all/pom.xml | 5 ++--- bookkeeper-dist/bkctl/pom.xml | 5 ++--- bookkeeper-dist/pom.xml | 4 ++-- bookkeeper-dist/server/pom.xml | 5 ++--- bookkeeper-server/pom.xml | 1 - circe-checksum/pom.xml | 1 - cpu-affinity/pom.xml | 6 ------ microbenchmarks/pom.xml | 1 - native-io/pom.xml | 6 ------ pom.xml | 16 +++------------- shaded/bookkeeper-server-shaded/pom.xml | 3 +-- shaded/bookkeeper-server-tests-shaded/pom.xml | 3 +-- shaded/distributedlog-core-shaded/pom.xml | 3 +-- stream/clients/java/all/pom.xml | 3 +-- stream/clients/java/base/pom.xml | 1 - stream/distributedlog/common/pom.xml | 1 - stream/distributedlog/core/pom.xml | 1 - stream/distributedlog/protocol/pom.xml | 1 - stream/proto/pom.xml | 1 - stream/server/pom.xml | 1 - stream/storage/api/pom.xml | 1 - stream/storage/impl/pom.xml | 1 - stream/tests-common/pom.xml | 1 - tests/docker-images/all-versions-image/pom.xml | 1 - .../docker-images/current-version-image/pom.xml | 1 - tests/pom.xml | 1 - 27 files changed, 15 insertions(+), 60 deletions(-) diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 200584cf12a..fafdfdcac02 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -114,7 +114,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 10708b049df..0fa36f13fde 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -28,7 +28,7 @@ bookkeeper-dist-all - jar + pom Apache BookKeeper :: Dist (All) @@ -124,8 +124,8 @@ + org.apache.maven.plugins maven-assembly-plugin - ${maven-assembly-plugin.version} bookkeeper-all-${project.version} false @@ -147,7 +147,6 @@ org.apache.maven.plugins maven-deploy-plugin - ${maven-deploy-plugin.version} true diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 943d81e7884..70c8b27bdc7 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -28,7 +28,7 @@ bkctl - jar + pom Apache BookKeeper :: Dist (Bkctl) @@ -49,8 +49,8 @@ + org.apache.maven.plugins maven-assembly-plugin - ${maven-assembly-plugin.version} bkctl-${project.version} true @@ -72,7 +72,6 @@ org.apache.maven.plugins maven-deploy-plugin - ${maven-deploy-plugin.version} true diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 9bedfcd311f..5861dd6ff9c 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -37,8 +37,8 @@ + org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} default-jar @@ -47,8 +47,8 @@ + org.apache.maven.plugins maven-assembly-plugin - ${maven-assembly-plugin.version} bookkeeper-${project.version} diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 6e4e7bbd94d..353a64f1b51 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -28,7 +28,7 @@ bookkeeper-dist-server - jar + pom Apache BookKeeper :: Dist (Server) @@ -98,8 +98,8 @@ + org.apache.maven.plugins maven-assembly-plugin - ${maven-assembly-plugin.version} bookkeeper-server-${project.version} true @@ -121,7 +121,6 @@ org.apache.maven.plugins maven-deploy-plugin - ${maven-deploy-plugin.version} true diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 2152b6efff6..b3de078d6cf 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -228,7 +228,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index a0391e9b013..f316d775748 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -93,7 +93,6 @@ org.apache.maven.plugins maven-assembly-plugin - ${maven-assembly-plugin.version} src/main/assembly/assembly.xml diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 680bc2debc7..55bccfffea6 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -52,13 +52,11 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true org.apache.maven.plugins maven-assembly-plugin - ${maven-assembly-plugin.version} src/main/assembly/assembly.xml @@ -103,7 +101,6 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true @@ -140,7 +137,6 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true ${nar.runtime} @@ -175,7 +171,6 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true ${nar.runtime} @@ -212,7 +207,6 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true ${nar.runtime} diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 70c0c06c277..1329fe02d9e 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -81,7 +81,6 @@ org.apache.maven.plugins maven-shade-plugin - ${maven-shade-plugin.version} package diff --git a/native-io/pom.xml b/native-io/pom.xml index 61b38356da5..eb80b2c77eb 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -49,13 +49,11 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true org.apache.maven.plugins maven-assembly-plugin - ${maven-assembly-plugin.version} src/main/assembly/assembly.xml @@ -94,7 +92,6 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true @@ -131,7 +128,6 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true ${nar.runtime} @@ -166,7 +162,6 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true ${nar.runtime} @@ -203,7 +198,6 @@ com.github.maven-nar nar-maven-plugin - ${nar-maven-plugin.version} true ${nar.runtime} diff --git a/pom.xml b/pom.xml index 7922d034769..d6a4a5cb874 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.apache apache - 26 + 29 4.0.0 org.apache.bookkeeper @@ -190,17 +190,8 @@ 1.18.20.0 0.8.8 1.8 - 3.6.0 3.3.1 - 3.3.2 3.12.1 - 3.6.1 - 3.1.1 - 3.1.1 - 3.3.0 - 3.6.3 - 3.5.1 - 3.3.0 3.2.5 8.0.2 3.10.1 @@ -963,7 +954,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} true @@ -1070,12 +1060,11 @@ org.apache.maven.plugins maven-source-plugin - ${maven-source-plugin.version} attach-sources - jar + jar-no-fork @@ -1440,6 +1429,7 @@ + org.apache.maven.plugins maven-assembly-plugin diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index c8d70f3cd65..b1e6b306ff7 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -58,7 +58,6 @@ org.apache.maven.plugins maven-shade-plugin - ${maven-shade-plugin.version} package @@ -119,8 +118,8 @@ + org.apache.maven.plugins maven-clean-plugin - ${maven-clean-plugin.version} diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index e4085575e7d..b547339e188 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -83,7 +83,6 @@ org.apache.maven.plugins maven-shade-plugin - ${maven-shade-plugin.version} package @@ -137,8 +136,8 @@ + org.apache.maven.plugins maven-clean-plugin - ${maven-clean-plugin.version} diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 59cc45b88e7..eff484bb4c9 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -63,7 +63,6 @@ org.apache.maven.plugins maven-shade-plugin - ${maven-shade-plugin.version} package @@ -231,8 +230,8 @@ + org.apache.maven.plugins maven-clean-plugin - ${maven-clean-plugin.version} diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 138a77fa686..7733ab9f306 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -50,7 +50,6 @@ org.apache.maven.plugins maven-shade-plugin - ${maven-shade-plugin.version} package @@ -97,8 +96,8 @@ + org.apache.maven.plugins maven-clean-plugin - ${maven-clean-plugin.version} diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 42fb5734034..3c065c112fe 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -66,7 +66,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 54657574c1c..200d7f6534c 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -96,7 +96,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 1fc502442d5..0b8b4ca1bc3 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -96,7 +96,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 3ee3e143d2e..9a89f33de6e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -46,7 +46,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index f2c9f91a4ca..e1575f2df87 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -100,7 +100,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 67d1f32f227..20139d260c0 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -71,7 +71,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 290717be4c1..a4b4ae7a427 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -44,7 +44,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 28506408b8d..ca586a80da6 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -110,7 +110,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index e1abeea6f3d..d589a6b8a36 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -105,7 +105,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index e9876d20e11..d9bc8d1b94f 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -90,7 +90,6 @@ org.apache.maven.plugins maven-dependency-plugin - ${maven-dependency-plugin.version} copy-tarball diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 24e622bc26d..83157558705 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -126,7 +126,6 @@ org.apache.maven.plugins maven-dependency-plugin - ${maven-dependency-plugin.version} copy-docker-dependencies diff --git a/tests/pom.xml b/tests/pom.xml index 0b88f83ea3b..0f9879b87f3 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -50,7 +50,6 @@ org.apache.maven.plugins maven-deploy-plugin - ${maven-deploy-plugin.version} true From 222f42a1d7c3e13c03cd2dc68948186db936e2d0 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 21 Mar 2024 06:28:29 -0700 Subject: [PATCH 122/233] Improve release script instructions (#4236) --- dev/release/000-run-docker.sh | 26 +++++++++++++++++++++++--- dev/release/Dockerfile | 6 ++++-- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dev/release/000-run-docker.sh b/dev/release/000-run-docker.sh index ab7a313d44a..248c2e7fec7 100755 --- a/dev/release/000-run-docker.sh +++ b/dev/release/000-run-docker.sh @@ -50,7 +50,9 @@ fi docker build -t "${IMAGE_NAME}-${USER_NAME}" - < /tmp/dummy && gpg -sa /tmp/dummy' echo bash " diff --git a/dev/release/Dockerfile b/dev/release/Dockerfile index 06e34d38af7..23c28954c17 100644 --- a/dev/release/Dockerfile +++ b/dev/release/Dockerfile @@ -18,6 +18,8 @@ # FROM --platform=linux/amd64 maven:3.9.0-eclipse-temurin-8 +ARG DEBIAN_FRONTEND=noninteractive +RUN apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install -y g++ cmake gnupg2 vim subversion less zip unzip -RUN apt-get update -RUN apt-get install -y g++ cmake gnupg2 vim subversion From 963a5408158b9afcc544f7d5fd76995ea9aebb0c Mon Sep 17 00:00:00 2001 From: Kang Zou Date: Fri, 22 Mar 2024 00:12:02 +0800 Subject: [PATCH 123/233] Issue 4200: fix flaky test DeferredSyncTest.testForceWillAdvanceLacOnlyUpToLastAcknoledgedWrite (#4234) * Issue 4200: fix flaky test DeferredSyncTest.testForceWillAdvanceLacOnlyUpToLastAcknoledgedWrite * add a comment (cherry picked from commit 37708ade69129db1ff05bfd82d1f4f5b75593053) --- .../client/MockBookKeeperTestCase.java | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java index e7710124707..97c690dae10 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java @@ -301,8 +301,15 @@ protected void suspendBookieForceLedgerAcks(BookieId address) { } protected void resumeBookieWriteAcks(BookieId address) { - suspendedBookiesForForceLedgerAcks.remove(address); - List pendingResponses = deferredBookieForceLedgerResponses.remove(address); + List pendingResponses; + + // why use the BookieId instance as the object monitor? there is a date race problem if not + // see https://github.com/apache/bookkeeper/issues/4200 + synchronized (address) { + suspendedBookiesForForceLedgerAcks.remove(address); + pendingResponses = deferredBookieForceLedgerResponses.remove(address); + } + if (pendingResponses != null) { pendingResponses.forEach(Runnable::run); } @@ -654,11 +661,17 @@ protected void setupBookieClientForceLedger() { callback.forceLedgerComplete(BKException.Code.OK, ledgerId, bookieSocketAddress, ctx); }); }; - if (suspendedBookiesForForceLedgerAcks.contains(bookieSocketAddress)) { - List queue = deferredBookieForceLedgerResponses.computeIfAbsent(bookieSocketAddress, - (k) -> new CopyOnWriteArrayList<>()); - queue.add(activity); - } else { + List queue = null; + + synchronized (bookieSocketAddress) { + if (suspendedBookiesForForceLedgerAcks.contains(bookieSocketAddress)) { + queue = deferredBookieForceLedgerResponses.computeIfAbsent(bookieSocketAddress, + (k) -> new CopyOnWriteArrayList<>()); + queue.add(activity); + } + } + + if (queue == null) { activity.run(); } return null; From 88844c76209885d2bd584a6c399ca45a277156b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= Date: Tue, 26 Mar 2024 09:42:16 +0100 Subject: [PATCH 124/233] Update python version to 4.16.5 --- stream/clients/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream/clients/python/setup.py b/stream/clients/python/setup.py index 1dbc63863a2..4f65845305c 100644 --- a/stream/clients/python/setup.py +++ b/stream/clients/python/setup.py @@ -19,7 +19,7 @@ name = 'apache-bookkeeper-client' description = 'Apache BookKeeper client library' -version = '4.16.4' +version = '4.16.5' # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta' From 3160f9628c625310fef322d4d84060248763cb3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= Date: Wed, 27 Mar 2024 10:17:07 +0000 Subject: [PATCH 125/233] [maven-release-plugin] prepare release v4.16.5-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 91 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 1e1f6ea18d5..ab234262280 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 43e0b4edb3d..f461f0a1106 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index fafdfdcac02..62f750dbb63 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 0fa36f13fde..84042bdda3d 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 70c8b27bdc7..7cbdf5cd834 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 5861dd6ff9c..3c787f04421 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 353a64f1b51..5039c4f6774 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index ee69c1ecb7d..49f0c73dbbc 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index c9b76422759..6787d693df8 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index dcba5d650cd..8358e50ddc3 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 423af7be8c2..d6183054c1f 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 5e455906652..6fabb2a6822 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index b3de078d6cf..ec16d494015 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 5228c4e8a25..98950ff581c 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 23bd7aadf40..5de3e189c93 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 2e4f5224ffe..049db8b7559 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 357f89749c6..ca4a4164583 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 buildtools Apache BookKeeper :: Build Tools - 4.16.5-SNAPSHOT + 4.16.5 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index f316d775748..5265beab640 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 55bccfffea6..dda14615f44 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 52230fb5bdc..09177dadc9a 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.5-SNAPSHOT + 4.16.5 .. 4.0.0 diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index e1174072760..53aaab060fb 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 1329fe02d9e..16a3776e6d2 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index eb80b2c77eb..9f37ac33f2e 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/pom.xml b/pom.xml index d6a4a5cb874..1da4c024c36 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.16 + v4.16.5-rc0 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index b1e6b306ff7..412382af29c 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5-SNAPSHOT + 4.16.5 .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index b547339e188..7c2700ff3d7 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5-SNAPSHOT + 4.16.5 .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index eff484bb4c9..26d78a2392c 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index a900ce7c985..6c5ceec2a9b 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 9197b37ea23..7fd69ccdd3d 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 2a1b5283b64..f4dba28d5e5 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 89808ab5579..6cc2fc95dce 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 86b8f759461..915c9fe7467 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index d02349aa8a8..059c25f51a1 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index cc3f55e707b..210e1633d92 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 403c247c894..0b843419835 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index d186065eb67..d9a0647f3ee 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 7733ab9f306..7515abaccd6 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5-SNAPSHOT + 4.16.5 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 3c065c112fe..821157ca113 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5-SNAPSHOT + 4.16.5 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index c24841c86b3..f839b71cc55 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5-SNAPSHOT + 4.16.5 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 19a6b8f7128..c8c5b7a5949 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.5-SNAPSHOT + 4.16.5 .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 44a39a9f746..f1e9f75bbd3 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.5 .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 4f4063b9088..2f1e5066d2d 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 200d7f6534c..1bbdc2232a6 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.5 distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 0b8b4ca1bc3..992c9f944d8 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.5 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 5b39299620a..7d01fd310fa 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.5-SNAPSHOT + 4.16.5 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index e471bce02c3..ac26cb3238e 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 4214a3126e2..4a908cfa586 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 9a89f33de6e..310937ae699 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.5 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index d1fba9529d3..b55da3d3822 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index e1575f2df87..bad83be0828 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 20139d260c0..a26dafd7f38 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.5 stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index d3b49ce3466..4ee665aa021 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index a4b4ae7a427..d64cfc0a1ef 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.5-SNAPSHOT + 4.16.5 .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index ca586a80da6..532ddfe52df 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.5-SNAPSHOT + 4.16.5 .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index a338c280a63..ae954d05a99 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.5 .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index d589a6b8a36..272af230d55 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index fbd1bed1899..859da12a2b5 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index d6c3bbbca1f..e2c0f3f9395 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index c22193e612a..d342ec5f2fc 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index f0c768ba887..b13fb299827 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index f510c2e3f45..c4ac10e6678 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 8715fc5cb43..3de4029281e 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.5-SNAPSHOT + 4.16.5 ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 6b2a6678fed..b0686f9c2ed 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 504f3803c9c..2795c8032b3 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 584350e323a..d5f4ee522c5 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 6ee1cfbfa95..2fc24a573f2 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 740d80427ff..bec6e78bc66 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index d9bc8d1b94f..12e7598c254 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 83157558705..74abb88101d 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 4af406aecc8..fadca4d654b 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index aadc38ae53e..3323bdd33a9 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.5-SNAPSHOT + 4.16.5 ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index dff9d4a1951..dbd039b852d 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index bf83805abec..89f2bcdeaf7 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 1826d42180d..4be476644ce 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 35d1832dcca..ed80c12dfa3 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 64708b97a53..930903df02c 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 3a8e202bb03..e1b7d2d4e02 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index ed82c49e8e0..859c0992d0e 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/pom.xml b/tests/pom.xml index 0f9879b87f3..3fccf4e3f11 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 13a75f34e12..e63da96a425 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 48e3cdc317e..fe05201505b 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5-SNAPSHOT + 4.16.5 .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index b5671a13012..e7a83de147d 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5-SNAPSHOT + 4.16.5 .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index fce4ac44478..be822e79c08 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5-SNAPSHOT + 4.16.5 .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d23817495df..da05a242c02 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index e3a4cf1847f..6ac744f2314 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 testtools Apache BookKeeper :: Test Tools - 4.16.5-SNAPSHOT + 4.16.5 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 1adad3d7430..de8048c098a 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 449e5458800..6f630379469 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 0e5e98e3c8e..e2452fde547 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 24c67af4a5c..cf130b12465 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 4a2a7e44956..60cbbc65ecd 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index fbdc43edd6e..c96a6c6b7e7 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.5-SNAPSHOT + 4.16.5 stream-storage-cli Apache BookKeeper :: Tools :: Stream From 67a58194a527d7542d535f0ca22b64bc3225e481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= Date: Wed, 27 Mar 2024 10:17:11 +0000 Subject: [PATCH 126/233] [maven-release-plugin] rollback changes from release preparation of v4.16.5-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 91 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index ab234262280..1e1f6ea18d5 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index f461f0a1106..43e0b4edb3d 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 62f750dbb63..fafdfdcac02 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 84042bdda3d..0fa36f13fde 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 7cbdf5cd834..70c8b27bdc7 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 3c787f04421..5861dd6ff9c 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 5039c4f6774..353a64f1b51 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 49f0c73dbbc..ee69c1ecb7d 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 6787d693df8..c9b76422759 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 8358e50ddc3..dcba5d650cd 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index d6183054c1f..423af7be8c2 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 6fabb2a6822..5e455906652 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index ec16d494015..b3de078d6cf 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 98950ff581c..5228c4e8a25 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 5de3e189c93..23bd7aadf40 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 049db8b7559..2e4f5224ffe 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index ca4a4164583..357f89749c6 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.5 + 4.16.5-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 5265beab640..f316d775748 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index dda14615f44..55bccfffea6 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 09177dadc9a..52230fb5bdc 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.5 + 4.16.5-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 53aaab060fb..e1174072760 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 16a3776e6d2..1329fe02d9e 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 9f37ac33f2e..eb80b2c77eb 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 1da4c024c36..d6a4a5cb874 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.5-rc0 + branch-4.16 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 412382af29c..b1e6b306ff7 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5 + 4.16.5-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 7c2700ff3d7..b547339e188 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5 + 4.16.5-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 26d78a2392c..eff484bb4c9 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 6c5ceec2a9b..a900ce7c985 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 7fd69ccdd3d..9197b37ea23 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index f4dba28d5e5..2a1b5283b64 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 6cc2fc95dce..89808ab5579 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 915c9fe7467..86b8f759461 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 059c25f51a1..d02349aa8a8 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 210e1633d92..cc3f55e707b 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 0b843419835..403c247c894 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index d9a0647f3ee..d186065eb67 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 7515abaccd6..7733ab9f306 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5 + 4.16.5-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 821157ca113..3c065c112fe 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5 + 4.16.5-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index f839b71cc55..c24841c86b3 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5 + 4.16.5-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index c8c5b7a5949..19a6b8f7128 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.5 + 4.16.5-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index f1e9f75bbd3..44a39a9f746 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5 + 4.16.5-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 2f1e5066d2d..4f4063b9088 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 1bbdc2232a6..200d7f6534c 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5 + 4.16.5-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 992c9f944d8..0b8b4ca1bc3 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5 + 4.16.5-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 7d01fd310fa..5b39299620a 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.5 + 4.16.5-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index ac26cb3238e..e471bce02c3 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 4a908cfa586..4214a3126e2 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 310937ae699..9a89f33de6e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5 + 4.16.5-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index b55da3d3822..d1fba9529d3 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bad83be0828..e1575f2df87 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index a26dafd7f38..20139d260c0 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5 + 4.16.5-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 4ee665aa021..d3b49ce3466 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index d64cfc0a1ef..a4b4ae7a427 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.5 + 4.16.5-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 532ddfe52df..ca586a80da6 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.5 + 4.16.5-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index ae954d05a99..a338c280a63 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5 + 4.16.5-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 272af230d55..d589a6b8a36 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 859da12a2b5..fbd1bed1899 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index e2c0f3f9395..d6c3bbbca1f 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index d342ec5f2fc..c22193e612a 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index b13fb299827..f0c768ba887 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index c4ac10e6678..f510c2e3f45 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 3de4029281e..8715fc5cb43 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.5 + 4.16.5-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index b0686f9c2ed..6b2a6678fed 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 2795c8032b3..504f3803c9c 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index d5f4ee522c5..584350e323a 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 2fc24a573f2..6ee1cfbfa95 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index bec6e78bc66..740d80427ff 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 12e7598c254..d9bc8d1b94f 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 74abb88101d..83157558705 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index fadca4d654b..4af406aecc8 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 3323bdd33a9..aadc38ae53e 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.5 + 4.16.5-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index dbd039b852d..dff9d4a1951 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 89f2bcdeaf7..bf83805abec 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 4be476644ce..1826d42180d 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index ed80c12dfa3..35d1832dcca 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 930903df02c..64708b97a53 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index e1b7d2d4e02..3a8e202bb03 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 859c0992d0e..ed82c49e8e0 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 3fccf4e3f11..0f9879b87f3 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index e63da96a425..13a75f34e12 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index fe05201505b..48e3cdc317e 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5 + 4.16.5-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index e7a83de147d..b5671a13012 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5 + 4.16.5-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index be822e79c08..fce4ac44478 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5 + 4.16.5-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index da05a242c02..d23817495df 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 6ac744f2314..e3a4cf1847f 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.5 + 4.16.5-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index de8048c098a..1adad3d7430 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 6f630379469..449e5458800 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index e2452fde547..0e5e98e3c8e 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index cf130b12465..24c67af4a5c 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 60cbbc65ecd..4a2a7e44956 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index c96a6c6b7e7..fbdc43edd6e 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.5 + 4.16.5-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From a23b1a02949f580f4e584dbff9131b26bd0712ff Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Tue, 2 Apr 2024 18:56:10 -0700 Subject: [PATCH 127/233] Fixed creation of temporary dir in NativeUtils (#4262) ### Motivation Creating the temp directory for unpacking the native library is failing for the affinity library. ### Changes Use `Files.createTempDirectory()` instead. --- .../scurrilous/circe/utils/NativeUtils.java | 12 ++++----- .../util/affinity/impl/NativeUtils.java | 26 ++++++++++++------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/circe-checksum/src/main/java/com/scurrilous/circe/utils/NativeUtils.java b/circe-checksum/src/main/java/com/scurrilous/circe/utils/NativeUtils.java index 2932c650004..988264c9521 100644 --- a/circe-checksum/src/main/java/com/scurrilous/circe/utils/NativeUtils.java +++ b/circe-checksum/src/main/java/com/scurrilous/circe/utils/NativeUtils.java @@ -26,6 +26,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Locale; /** @@ -50,13 +52,9 @@ public static void loadLibraryFromJar(String path) throws Exception { String[] parts = path.split("/"); String filename = (parts.length > 0) ? parts[parts.length - 1] : null; - File dir = File.createTempFile("native", ""); - dir.delete(); - if (!(dir.mkdir())) { - throw new IOException("Failed to create temp directory " + dir.getAbsolutePath()); - } - dir.deleteOnExit(); - File temp = new File(dir, filename); + Path dir = Files.createTempDirectory("native"); + dir.toFile().deleteOnExit(); + File temp = new File(dir.toString(), filename); temp.deleteOnExit(); byte[] buffer = new byte[1024]; diff --git a/cpu-affinity/src/main/java/org/apache/bookkeeper/common/util/affinity/impl/NativeUtils.java b/cpu-affinity/src/main/java/org/apache/bookkeeper/common/util/affinity/impl/NativeUtils.java index 2dbec828d34..fde69f90114 100644 --- a/cpu-affinity/src/main/java/org/apache/bookkeeper/common/util/affinity/impl/NativeUtils.java +++ b/cpu-affinity/src/main/java/org/apache/bookkeeper/common/util/affinity/impl/NativeUtils.java @@ -24,9 +24,11 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import lombok.NonNull; import lombok.experimental.UtilityClass; /** @@ -46,17 +48,17 @@ public class NativeUtils { value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", justification = "work around for java 9: https://github.com/spotbugs/spotbugs/issues/493") public static void loadLibraryFromJar(String path) throws Exception { - com.google.common.base.Preconditions.checkArgument(path.startsWith("/"), "absolute path must start with /"); + checkArgument(path.startsWith("/"), "absolute path must start with /"); String[] parts = path.split("/"); - String filename = (parts.length > 0) ? parts[parts.length - 1] : null; + checkArgument(parts.length > 0, "absolute path must contain file name"); - File dir = File.createTempFile("native", ""); - if (!(dir.mkdir())) { - throw new IOException("Failed to create temp directory " + dir.getAbsolutePath()); - } - dir.deleteOnExit(); - File temp = new File(dir, filename); + String filename = parts[parts.length - 1]; + checkArgument(path.startsWith("/"), "absolute path must start with /"); + + Path dir = Files.createTempDirectory("native"); + dir.toFile().deleteOnExit(); + File temp = new File(dir.toString(), filename); temp.deleteOnExit(); byte[] buffer = new byte[1024]; @@ -79,4 +81,10 @@ public static void loadLibraryFromJar(String path) throws Exception { System.load(temp.getAbsolutePath()); } + + private static void checkArgument(boolean expression, @NonNull Object errorMessage) { + if (!expression) { + throw new IllegalArgumentException(String.valueOf(errorMessage)); + } + } } From 7018e3a1ac9f8d64e57d3f141e95dcdada48342a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= Date: Wed, 3 Apr 2024 09:18:42 +0000 Subject: [PATCH 128/233] [maven-release-plugin] prepare release v4.16.5-rc1 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 91 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 1e1f6ea18d5..ab234262280 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 43e0b4edb3d..f461f0a1106 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index fafdfdcac02..62f750dbb63 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 0fa36f13fde..84042bdda3d 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 70c8b27bdc7..7cbdf5cd834 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 5861dd6ff9c..3c787f04421 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 353a64f1b51..5039c4f6774 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index ee69c1ecb7d..49f0c73dbbc 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index c9b76422759..6787d693df8 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index dcba5d650cd..8358e50ddc3 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 423af7be8c2..d6183054c1f 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 5e455906652..6fabb2a6822 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index b3de078d6cf..ec16d494015 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 5228c4e8a25..98950ff581c 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 23bd7aadf40..5de3e189c93 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 2e4f5224ffe..049db8b7559 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 357f89749c6..ca4a4164583 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 buildtools Apache BookKeeper :: Build Tools - 4.16.5-SNAPSHOT + 4.16.5 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index f316d775748..5265beab640 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 55bccfffea6..dda14615f44 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 52230fb5bdc..09177dadc9a 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.5-SNAPSHOT + 4.16.5 .. 4.0.0 diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index e1174072760..53aaab060fb 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 1329fe02d9e..16a3776e6d2 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index eb80b2c77eb..9f37ac33f2e 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/pom.xml b/pom.xml index d6a4a5cb874..f16e1b54ff7 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.16 + v4.16.5-rc1 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index b1e6b306ff7..412382af29c 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5-SNAPSHOT + 4.16.5 .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index b547339e188..7c2700ff3d7 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5-SNAPSHOT + 4.16.5 .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index eff484bb4c9..26d78a2392c 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index a900ce7c985..6c5ceec2a9b 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 9197b37ea23..7fd69ccdd3d 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 2a1b5283b64..f4dba28d5e5 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 89808ab5579..6cc2fc95dce 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 86b8f759461..915c9fe7467 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index d02349aa8a8..059c25f51a1 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index cc3f55e707b..210e1633d92 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 403c247c894..0b843419835 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index d186065eb67..d9a0647f3ee 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 7733ab9f306..7515abaccd6 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5-SNAPSHOT + 4.16.5 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 3c065c112fe..821157ca113 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5-SNAPSHOT + 4.16.5 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index c24841c86b3..f839b71cc55 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5-SNAPSHOT + 4.16.5 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 19a6b8f7128..c8c5b7a5949 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.5-SNAPSHOT + 4.16.5 .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 44a39a9f746..f1e9f75bbd3 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.5 .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 4f4063b9088..2f1e5066d2d 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 200d7f6534c..1bbdc2232a6 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.5 distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 0b8b4ca1bc3..992c9f944d8 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.5 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 5b39299620a..7d01fd310fa 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.5-SNAPSHOT + 4.16.5 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index e471bce02c3..ac26cb3238e 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 4214a3126e2..4a908cfa586 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 9a89f33de6e..310937ae699 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.5 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index d1fba9529d3..b55da3d3822 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index e1575f2df87..bad83be0828 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 20139d260c0..a26dafd7f38 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.5 stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index d3b49ce3466..4ee665aa021 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index a4b4ae7a427..d64cfc0a1ef 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.5-SNAPSHOT + 4.16.5 .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index ca586a80da6..532ddfe52df 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.5-SNAPSHOT + 4.16.5 .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index a338c280a63..ae954d05a99 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.5 .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index d589a6b8a36..272af230d55 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index fbd1bed1899..859da12a2b5 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index d6c3bbbca1f..e2c0f3f9395 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index c22193e612a..d342ec5f2fc 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index f0c768ba887..b13fb299827 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index f510c2e3f45..c4ac10e6678 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 8715fc5cb43..3de4029281e 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.5-SNAPSHOT + 4.16.5 ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 6b2a6678fed..b0686f9c2ed 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 504f3803c9c..2795c8032b3 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 584350e323a..d5f4ee522c5 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 6ee1cfbfa95..2fc24a573f2 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 740d80427ff..bec6e78bc66 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index d9bc8d1b94f..12e7598c254 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 83157558705..74abb88101d 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5-SNAPSHOT + 4.16.5 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 4af406aecc8..fadca4d654b 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index aadc38ae53e..3323bdd33a9 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.5-SNAPSHOT + 4.16.5 ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index dff9d4a1951..dbd039b852d 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index bf83805abec..89f2bcdeaf7 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 1826d42180d..4be476644ce 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 35d1832dcca..ed80c12dfa3 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 64708b97a53..930903df02c 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 3a8e202bb03..e1b7d2d4e02 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index ed82c49e8e0..859c0992d0e 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.5-SNAPSHOT + 4.16.5 .. diff --git a/tests/pom.xml b/tests/pom.xml index 0f9879b87f3..3fccf4e3f11 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 13a75f34e12..e63da96a425 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 48e3cdc317e..fe05201505b 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5-SNAPSHOT + 4.16.5 .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index b5671a13012..e7a83de147d 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5-SNAPSHOT + 4.16.5 .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index fce4ac44478..be822e79c08 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5-SNAPSHOT + 4.16.5 .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d23817495df..da05a242c02 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.5 .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index e3a4cf1847f..6ac744f2314 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 testtools Apache BookKeeper :: Test Tools - 4.16.5-SNAPSHOT + 4.16.5 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 1adad3d7430..de8048c098a 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 449e5458800..6f630379469 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 0e5e98e3c8e..e2452fde547 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 24c67af4a5c..cf130b12465 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 4a2a7e44956..60cbbc65ecd 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.5 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index fbdc43edd6e..c96a6c6b7e7 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.5-SNAPSHOT + 4.16.5 stream-storage-cli Apache BookKeeper :: Tools :: Stream From 3ad229cd8945a1a14ca205ff275d5324727d2903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= Date: Wed, 3 Apr 2024 09:18:47 +0000 Subject: [PATCH 129/233] [maven-release-plugin] rollback changes from release preparation of v4.16.5-rc1 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 91 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index ab234262280..1e1f6ea18d5 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index f461f0a1106..43e0b4edb3d 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 62f750dbb63..fafdfdcac02 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 84042bdda3d..0fa36f13fde 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 7cbdf5cd834..70c8b27bdc7 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 3c787f04421..5861dd6ff9c 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 5039c4f6774..353a64f1b51 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 49f0c73dbbc..ee69c1ecb7d 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 6787d693df8..c9b76422759 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 8358e50ddc3..dcba5d650cd 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index d6183054c1f..423af7be8c2 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 6fabb2a6822..5e455906652 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index ec16d494015..b3de078d6cf 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 98950ff581c..5228c4e8a25 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 5de3e189c93..23bd7aadf40 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 049db8b7559..2e4f5224ffe 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index ca4a4164583..357f89749c6 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.5 + 4.16.5-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 5265beab640..f316d775748 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index dda14615f44..55bccfffea6 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 09177dadc9a..52230fb5bdc 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.5 + 4.16.5-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 53aaab060fb..e1174072760 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 16a3776e6d2..1329fe02d9e 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 9f37ac33f2e..eb80b2c77eb 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index f16e1b54ff7..d6a4a5cb874 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.5-rc1 + branch-4.16 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 412382af29c..b1e6b306ff7 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5 + 4.16.5-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index 7c2700ff3d7..b547339e188 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5 + 4.16.5-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 26d78a2392c..eff484bb4c9 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 6c5ceec2a9b..a900ce7c985 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 7fd69ccdd3d..9197b37ea23 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index f4dba28d5e5..2a1b5283b64 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 6cc2fc95dce..89808ab5579 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 915c9fe7467..86b8f759461 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 059c25f51a1..d02349aa8a8 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 210e1633d92..cc3f55e707b 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 0b843419835..403c247c894 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index d9a0647f3ee..d186065eb67 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 7515abaccd6..7733ab9f306 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5 + 4.16.5-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 821157ca113..3c065c112fe 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5 + 4.16.5-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index f839b71cc55..c24841c86b3 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5 + 4.16.5-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index c8c5b7a5949..19a6b8f7128 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.5 + 4.16.5-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index f1e9f75bbd3..44a39a9f746 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5 + 4.16.5-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 2f1e5066d2d..4f4063b9088 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 1bbdc2232a6..200d7f6534c 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5 + 4.16.5-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 992c9f944d8..0b8b4ca1bc3 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5 + 4.16.5-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 7d01fd310fa..5b39299620a 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.5 + 4.16.5-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index ac26cb3238e..e471bce02c3 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 4a908cfa586..4214a3126e2 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 310937ae699..9a89f33de6e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5 + 4.16.5-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index b55da3d3822..d1fba9529d3 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bad83be0828..e1575f2df87 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index a26dafd7f38..20139d260c0 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5 + 4.16.5-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 4ee665aa021..d3b49ce3466 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index d64cfc0a1ef..a4b4ae7a427 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.5 + 4.16.5-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 532ddfe52df..ca586a80da6 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.5 + 4.16.5-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index ae954d05a99..a338c280a63 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5 + 4.16.5-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 272af230d55..d589a6b8a36 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index 859da12a2b5..fbd1bed1899 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index e2c0f3f9395..d6c3bbbca1f 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index d342ec5f2fc..c22193e612a 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index b13fb299827..f0c768ba887 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index c4ac10e6678..f510c2e3f45 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 3de4029281e..8715fc5cb43 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.5 + 4.16.5-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index b0686f9c2ed..6b2a6678fed 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 2795c8032b3..504f3803c9c 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index d5f4ee522c5..584350e323a 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 2fc24a573f2..6ee1cfbfa95 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index bec6e78bc66..740d80427ff 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 12e7598c254..d9bc8d1b94f 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 74abb88101d..83157558705 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5 + 4.16.5-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index fadca4d654b..4af406aecc8 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 3323bdd33a9..aadc38ae53e 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.5 + 4.16.5-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index dbd039b852d..dff9d4a1951 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 89f2bcdeaf7..bf83805abec 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 4be476644ce..1826d42180d 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index ed80c12dfa3..35d1832dcca 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 930903df02c..64708b97a53 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index e1b7d2d4e02..3a8e202bb03 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 859c0992d0e..ed82c49e8e0 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.5 + 4.16.5-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 3fccf4e3f11..0f9879b87f3 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index e63da96a425..13a75f34e12 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index fe05201505b..48e3cdc317e 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5 + 4.16.5-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index e7a83de147d..b5671a13012 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5 + 4.16.5-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index be822e79c08..fce4ac44478 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5 + 4.16.5-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index da05a242c02..d23817495df 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5 + 4.16.5-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 6ac744f2314..e3a4cf1847f 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.5 + 4.16.5-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index de8048c098a..1adad3d7430 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 6f630379469..449e5458800 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index e2452fde547..0e5e98e3c8e 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index cf130b12465..24c67af4a5c 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 60cbbc65ecd..4a2a7e44956 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5 + 4.16.5-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index c96a6c6b7e7..fbdc43edd6e 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.5 + 4.16.5-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From 058cea2d19b79583ae9433eb66cce000819d7b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= Date: Thu, 11 Apr 2024 02:29:56 +0200 Subject: [PATCH 130/233] [branch-4.16] Move version to 4.16.6-SNAPSHOT (#4276) --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 91 files changed, 93 insertions(+), 93 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 1e1f6ea18d5..83cc994918f 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 43e0b4edb3d..be5b64444b6 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index fafdfdcac02..02d8798767f 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 0fa36f13fde..2929d08b7a4 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 70c8b27bdc7..69dcc80b8cc 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 5861dd6ff9c..288f39ae295 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 353a64f1b51..a35318ec5d8 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index ee69c1ecb7d..62d310cf25d 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index c9b76422759..5003e9e57aa 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index dcba5d650cd..530cafe1d3a 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 423af7be8c2..f42a226b123 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 5e455906652..9e9a457c35a 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index b3de078d6cf..e1d5e7f7383 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 5228c4e8a25..d0d43d0180f 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 23bd7aadf40..1a53566cdaa 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 2e4f5224ffe..bb50d49c975 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 357f89749c6..f9f7b7ba09a 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index f316d775748..51efa827c8e 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 55bccfffea6..2651364bb5b 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 52230fb5bdc..08be63c4678 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index e1174072760..d80bfc0e56e 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 1329fe02d9e..36f70f5e606 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index eb80b2c77eb..0d5b099a2cc 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index d6a4a5cb874..8f552eef420 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index b1e6b306ff7..b1b79bf558a 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index b547339e188..ff6cf749521 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index eff484bb4c9..2a558af6cb9 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index a900ce7c985..230d5b20242 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 9197b37ea23..f4f5bcab3d3 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 2a1b5283b64..f9c7c7d9f01 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 89808ab5579..5f0c9e65be0 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 86b8f759461..a9e82fcf483 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index d02349aa8a8..e0b0a4ddf36 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index cc3f55e707b..323493515ed 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 403c247c894..91942436f44 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index d186065eb67..6a334d5c174 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 7733ab9f306..a25e6959296 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 3c065c112fe..7e7c23ec396 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index c24841c86b3..c4e2c0f3200 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 19a6b8f7128..7969286fc56 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 44a39a9f746..ee058054a1d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 4f4063b9088..bc871bca532 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 200d7f6534c..e7129dd2693 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 0b8b4ca1bc3..d273d8f690d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 5b39299620a..9dbd945c3b3 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index e471bce02c3..235d74dc02a 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 4214a3126e2..f016ade4cb9 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 9a89f33de6e..80799527416 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index d1fba9529d3..6cc63c3c701 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index e1575f2df87..bd529fa6250 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 20139d260c0..0e214c5f2f4 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index d3b49ce3466..2e9d229f972 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index a4b4ae7a427..ab58c05c752 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index ca586a80da6..10465d67b16 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index a338c280a63..88d9a3c0d73 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index d589a6b8a36..8aded3c6663 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index fbd1bed1899..eea31f3f091 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index d6c3bbbca1f..7dcdd19822e 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index c22193e612a..bd81e175f71 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index f0c768ba887..b0dec42b6ab 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index f510c2e3f45..da40c5473de 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 8715fc5cb43..1077cccbad7 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 6b2a6678fed..6aabdd64d27 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 504f3803c9c..a25c95dcf06 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 584350e323a..3f7d4ab9bcd 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 6ee1cfbfa95..afc9e2dc408 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 740d80427ff..ec0b19684fd 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index d9bc8d1b94f..4d5ac4ec7d5 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 83157558705..1d8a0cc771f 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 4af406aecc8..9c2ddcc9ceb 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index aadc38ae53e..18abba77317 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index dff9d4a1951..3351d669510 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index bf83805abec..704a8c88719 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 1826d42180d..07ac1759235 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 35d1832dcca..f382f30456c 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 64708b97a53..e6f4dcdfed8 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 3a8e202bb03..5be3d6048a3 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index ed82c49e8e0..4dc8f179298 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 0f9879b87f3..14d77f2bd6f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 13a75f34e12..c7b7ffd73df 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 48e3cdc317e..efd22239e19 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index b5671a13012..fff4401f36a 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index fce4ac44478..f3a669e47c2 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d23817495df..e81e92dedba 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index e3a4cf1847f..1818277c202 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 1adad3d7430..8ba96038822 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 449e5458800..299b2fd9350 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 0e5e98e3c8e..8698951c356 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 24c67af4a5c..8fead65b8e8 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 4a2a7e44956..9f7fc44de54 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index fbdc43edd6e..689aae999c6 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.5-SNAPSHOT + 4.16.6-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From a77458d56cf22e3b79d5beded8dbc0beca3ff22c Mon Sep 17 00:00:00 2001 From: fengyubiao Date: Thu, 18 Apr 2024 06:37:29 +0800 Subject: [PATCH 131/233] [fix] Fix ByteBuf release/retain in PerChannelBookClient (#4289) * [fix] ByteBuf release/retain incorrect * improve the code comment * fix other cases * modify the code comment * improve the code * improve the test * add description --- .../bookkeeper/proto/PerChannelBookieClient.java | 11 ++++++++--- .../org/apache/bookkeeper/test/BookieClientTest.java | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java index b4cf194e247..3a7af5b99a6 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java @@ -841,10 +841,10 @@ void addEntry(final long ledgerId, byte[] masterKey, final long entryId, Referen cb, ctx, ledgerId, entryId)); final Channel c = channel; if (c == null) { - // usually checked in writeAndFlush, but we have extra check - // because we need to release toSend. + // Manually release the binary data(variable "request") that we manually created when it can not be sent out + // because the channel is switching. errorOut(completionKey); - ReferenceCountUtil.release(toSend); + ReferenceCountUtil.release(request); return; } else { // addEntry times out on backpressure @@ -1136,6 +1136,7 @@ private void writeAndFlush(final Channel channel, if (channel == null) { LOG.warn("Operation {} failed: channel == null", StringUtils.requestToString(request)); errorOut(key); + ReferenceCountUtil.release(request); return; } @@ -1150,6 +1151,7 @@ private void writeAndFlush(final Channel channel, StringUtils.requestToString(request)); errorOut(key, BKException.Code.TooManyRequestsException); + ReferenceCountUtil.release(request); return; } @@ -1171,6 +1173,9 @@ private void writeAndFlush(final Channel channel, } catch (Throwable e) { LOG.warn("Operation {} failed", StringUtils.requestToString(request), e); errorOut(key); + // If the request goes into the writeAndFlush, it should be handled well by Netty. So all the exceptions we + // get here, we can release the request. + ReferenceCountUtil.release(request); } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java index a110e833ac3..f5202d8c0ee 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java @@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledByteBufAllocator; @@ -36,6 +35,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.bookie.MockUncleanShutdownDetection; import org.apache.bookkeeper.bookie.TestBookieImpl; import org.apache.bookkeeper.client.BKException; @@ -69,6 +69,7 @@ /** * Test the bookie client. */ +@Slf4j public class BookieClientTest { BookieServer bs; File tmpDir; From 3ef5eb923bb56467675acaca914235ed7c33a84c Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 22 Apr 2024 13:24:53 +0800 Subject: [PATCH 132/233] Fix check style (#4302) --- .../test/java/org/apache/bookkeeper/test/BookieClientTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java index f5202d8c0ee..066a88e721f 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledByteBufAllocator; From d86ca0b160a2bfd3ed968b623ab8c5ef5e44cb48 Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Fri, 3 May 2024 15:58:27 +0800 Subject: [PATCH 133/233] Adjust Log Level for LedgerFencedException in WriteEntryProcessor (#4327) Signed-off-by: ZhangJian He (cherry picked from commit eee9492f2d3d7983911c50f13f7589e845c80179) --- .../org/apache/bookkeeper/proto/WriteEntryProcessor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java index 0cd01c7970d..d611ab963af 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java @@ -81,7 +81,7 @@ protected void processPacket() { } } catch (OperationRejectedException e) { requestProcessor.getRequestStats().getAddEntryRejectedCounter().inc(); - // Avoid to log each occurence of this exception as this can happen when the ledger storage is + // Avoid to log each occurrence of this exception as this can happen when the ledger storage is // unable to keep up with the write rate. if (LOG.isDebugEnabled()) { LOG.debug("Operation rejected while writing {}", request, e); @@ -91,7 +91,8 @@ protected void processPacket() { LOG.error("Error writing {}", request, e); rc = BookieProtocol.EIO; } catch (BookieException.LedgerFencedException lfe) { - LOG.error("Attempt to write to fenced ledger", lfe); + LOG.warn("Write attempt on fenced ledger {} by client {}", request.getLedgerId(), + requestHandler.ctx().channel().remoteAddress()); rc = BookieProtocol.EFENCED; } catch (BookieException e) { LOG.error("Unauthorized access to ledger {}", request.getLedgerId(), e); From f0ec6b22081833c8ed8041b6c536686dd47824f0 Mon Sep 17 00:00:00 2001 From: thetumbled <52550727+thetumbled@users.noreply.github.com> Date: Mon, 29 Apr 2024 06:02:48 +0800 Subject: [PATCH 134/233] [fix] Fix ArrayIndexOut0fBoundsException caused by optimistic lock (#4066) --- .../collections/ConcurrentLongHashMap.java | 22 ++++--- .../collections/ConcurrentLongHashSet.java | 10 ++- .../ConcurrentLongLongHashMap.java | 46 +++++++------ .../ConcurrentLongLongPairHashMap.java | 41 +++++++----- .../collections/ConcurrentOpenHashMap.java | 41 +++++++----- .../collections/ConcurrentOpenHashSet.java | 22 +++---- .../ConcurrentLongHashMapTest.java | 61 ++++++++++++++++++ .../ConcurrentLongHashSetTest.java | 64 +++++++++++++++++++ .../ConcurrentLongLongHashMapTest.java | 63 ++++++++++++++++++ .../ConcurrentLongLongPairHashMapTest.java | 64 +++++++++++++++++++ .../ConcurrentOpenHashMapTest.java | 64 +++++++++++++++++++ .../ConcurrentOpenHashSetTest.java | 64 +++++++++++++++++++ 12 files changed, 488 insertions(+), 74 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashMap.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashMap.java index 7ff465f0798..ec8b700c994 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashMap.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashMap.java @@ -327,15 +327,18 @@ private static final class Section extends StampedLock { } V get(long key, int keyHash) { - int bucket = keyHash; long stamp = tryOptimisticRead(); boolean acquiredLock = false; + // add local variable here, so OutOfBound won't happen + long[] keys = this.keys; + V[] values = this.values; + // calculate table.length as capacity to avoid rehash changing capacity + int bucket = signSafeMod(keyHash, values.length); + try { while (true) { - int capacity = this.capacity; - bucket = signSafeMod(bucket, capacity); // First try optimistic locking long storedKey = keys[bucket]; @@ -354,16 +357,15 @@ V get(long key, int keyHash) { if (!acquiredLock) { stamp = readLock(); acquiredLock = true; + + // update local variable + keys = this.keys; + values = this.values; + bucket = signSafeMod(keyHash, values.length); storedKey = keys[bucket]; storedValue = values[bucket]; } - if (capacity != this.capacity) { - // There has been a rehashing. We need to restart the search - bucket = keyHash; - continue; - } - if (storedKey == key) { return storedValue != DeletedValue ? storedValue : null; } else if (storedValue == EmptyValue) { @@ -372,7 +374,7 @@ V get(long key, int keyHash) { } } - ++bucket; + bucket = (bucket + 1) & (values.length - 1); } } finally { if (acquiredLock) { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashSet.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashSet.java index a66de9ed8b4..d98b3062a7b 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashSet.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashSet.java @@ -290,7 +290,11 @@ private static final class Section extends StampedLock { boolean contains(long item, int hash) { long stamp = tryOptimisticRead(); boolean acquiredLock = false; - int bucket = signSafeMod(hash, capacity); + + // add local variable here, so OutOfBound won't happen + long[] table = this.table; + // calculate table.length as capacity to avoid rehash changing capacity + int bucket = signSafeMod(hash, table.length); try { while (true) { @@ -311,7 +315,9 @@ boolean contains(long item, int hash) { stamp = readLock(); acquiredLock = true; - bucket = signSafeMod(hash, capacity); + // update local variable + table = this.table; + bucket = signSafeMod(hash, table.length); storedItem = table[bucket]; } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongHashMap.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongHashMap.java index 25bcb4061a8..3cf5be37d58 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongHashMap.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongHashMap.java @@ -370,6 +370,9 @@ public Map asMap() { // A section is a portion of the hash map that is covered by a single @SuppressWarnings("serial") private static final class Section extends StampedLock { + // Each item take up 2 continuous array space. + private static final int ITEM_SIZE = 2; + // Keys and values are stored interleaved in the table array private volatile long[] table; @@ -389,7 +392,7 @@ private static final class Section extends StampedLock { float expandFactor, float shrinkFactor) { this.capacity = alignToPowerOfTwo(capacity); this.initCapacity = this.capacity; - this.table = new long[2 * this.capacity]; + this.table = new long[ITEM_SIZE * this.capacity]; this.size = 0; this.usedBuckets = 0; this.autoShrink = autoShrink; @@ -405,7 +408,10 @@ private static final class Section extends StampedLock { long get(long key, int keyHash) { long stamp = tryOptimisticRead(); boolean acquiredLock = false; - int bucket = signSafeMod(keyHash, capacity); + // add local variable here, so OutOfBound won't happen + long[] table = this.table; + // calculate table.length/2 as capacity to avoid rehash changing capacity + int bucket = signSafeMod(keyHash, table.length / ITEM_SIZE); try { while (true) { @@ -427,7 +433,9 @@ long get(long key, int keyHash) { stamp = readLock(); acquiredLock = true; - bucket = signSafeMod(keyHash, capacity); + // update local variable + table = this.table; + bucket = signSafeMod(keyHash, table.length / ITEM_SIZE); storedKey = table[bucket]; storedValue = table[bucket + 1]; } @@ -440,7 +448,7 @@ long get(long key, int keyHash) { } } - bucket = (bucket + 2) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } finally { if (acquiredLock) { @@ -493,7 +501,7 @@ long put(long key, long value, int keyHash, boolean onlyIfAbsent, LongLongFuncti } } - bucket = (bucket + 2) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } finally { if (usedBuckets > resizeThresholdUp) { @@ -551,7 +559,7 @@ long addAndGet(long key, long delta, int keyHash) { } } - bucket = (bucket + 2) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } finally { if (usedBuckets > resizeThresholdUp) { @@ -611,7 +619,7 @@ boolean compareAndSet(long key, long currentValue, long newValue, int keyHash) { } } - bucket = (bucket + 2) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } finally { if (usedBuckets > resizeThresholdUp) { @@ -650,7 +658,7 @@ private long remove(long key, long value, int keyHash) { return ValueNotFound; } - bucket = (bucket + 2) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } finally { @@ -681,7 +689,7 @@ int removeIf(LongPredicate filter) { int removedCount = 0; try { // Go through all the buckets for this section - for (int bucket = 0; size > 0 && bucket < table.length; bucket += 2) { + for (int bucket = 0; size > 0 && bucket < table.length; bucket += ITEM_SIZE) { long storedKey = table[bucket]; if (storedKey != DeletedKey && storedKey != EmptyKey) { @@ -719,7 +727,7 @@ int removeIf(LongLongPredicate filter) { int removedCount = 0; try { // Go through all the buckets for this section - for (int bucket = 0; size > 0 && bucket < table.length; bucket += 2) { + for (int bucket = 0; size > 0 && bucket < table.length; bucket += ITEM_SIZE) { long storedKey = table[bucket]; long storedValue = table[bucket + 1]; @@ -753,20 +761,20 @@ int removeIf(LongLongPredicate filter) { } private void cleanBucket(int bucket) { - int nextInArray = (bucket + 2) & (table.length - 1); + int nextInArray = (bucket + ITEM_SIZE) & (table.length - 1); if (table[nextInArray] == EmptyKey) { table[bucket] = EmptyKey; table[bucket + 1] = ValueNotFound; --usedBuckets; // Cleanup all the buckets that were in `DeletedKey` state, so that we can reduce unnecessary expansions - bucket = (bucket - 2) & (table.length - 1); + bucket = (bucket - ITEM_SIZE) & (table.length - 1); while (table[bucket] == DeletedKey) { table[bucket] = EmptyKey; table[bucket + 1] = ValueNotFound; --usedBuckets; - bucket = (bucket - 2) & (table.length - 1); + bucket = (bucket - ITEM_SIZE) & (table.length - 1); } } else { table[bucket] = DeletedKey; @@ -807,7 +815,7 @@ public void forEach(BiConsumerLong processor) { } // Go through all the buckets for this section - for (int bucket = 0; bucket < table.length; bucket += 2) { + for (int bucket = 0; bucket < table.length; bucket += ITEM_SIZE) { long storedKey = table[bucket]; long storedValue = table[bucket + 1]; @@ -833,11 +841,11 @@ public void forEach(BiConsumerLong processor) { private void rehash(int newCapacity) { // Expand the hashmap - long[] newTable = new long[2 * newCapacity]; + long[] newTable = new long[ITEM_SIZE * newCapacity]; Arrays.fill(newTable, EmptyKey); // Re-hash table - for (int i = 0; i < table.length; i += 2) { + for (int i = 0; i < table.length; i += ITEM_SIZE) { long storedKey = table[i]; long storedValue = table[i + 1]; if (storedKey != EmptyKey && storedKey != DeletedKey) { @@ -855,7 +863,7 @@ private void rehash(int newCapacity) { } private void shrinkToInitCapacity() { - long[] newTable = new long[2 * initCapacity]; + long[] newTable = new long[ITEM_SIZE * initCapacity]; Arrays.fill(newTable, EmptyKey); table = newTable; @@ -881,7 +889,7 @@ private static void insertKeyValueNoLock(long[] table, int capacity, long key, l return; } - bucket = (bucket + 2) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } } @@ -897,6 +905,8 @@ static final long hash(long key) { } static final int signSafeMod(long n, int max) { + // as the ITEM_SIZE of Section is 2, so the index is the multiple of 2 + // that is to left shift 1 bit return (int) (n & (max - 1)) << 1; } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongPairHashMap.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongPairHashMap.java index 536eeb74488..5b23acbe014 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongPairHashMap.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongPairHashMap.java @@ -309,6 +309,9 @@ public Map asMap() { // A section is a portion of the hash map that is covered by a single @SuppressWarnings("serial") private static final class Section extends StampedLock { + // Each item take up 4 continuous array space. + private static final int ITEM_SIZE = 4; + // Keys and values are stored interleaved in the table array private volatile long[] table; @@ -328,7 +331,7 @@ private static final class Section extends StampedLock { float expandFactor, float shrinkFactor) { this.capacity = alignToPowerOfTwo(capacity); this.initCapacity = this.capacity; - this.table = new long[4 * this.capacity]; + this.table = new long[ITEM_SIZE * this.capacity]; this.size = 0; this.usedBuckets = 0; this.autoShrink = autoShrink; @@ -344,7 +347,10 @@ private static final class Section extends StampedLock { LongPair get(long key1, long key2, int keyHash) { long stamp = tryOptimisticRead(); boolean acquiredLock = false; - int bucket = signSafeMod(keyHash, capacity); + // add local variable here, so OutOfBound won't happen + long[] table = this.table; + // calculate table.length / 4 as capacity to avoid rehash changing capacity + int bucket = signSafeMod(keyHash, table.length / ITEM_SIZE); try { while (true) { @@ -367,8 +373,9 @@ LongPair get(long key1, long key2, int keyHash) { if (!acquiredLock) { stamp = readLock(); acquiredLock = true; - - bucket = signSafeMod(keyHash, capacity); + // update local variable + table = this.table; + bucket = signSafeMod(keyHash, table.length / ITEM_SIZE); storedKey1 = table[bucket]; storedKey2 = table[bucket + 1]; storedValue1 = table[bucket + 2]; @@ -383,7 +390,7 @@ LongPair get(long key1, long key2, int keyHash) { } } - bucket = (bucket + 4) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } finally { if (acquiredLock) { @@ -435,7 +442,7 @@ boolean put(long key1, long key2, long value1, long value2, int keyHash, boolean } } - bucket = (bucket + 4) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } finally { if (usedBuckets > resizeThresholdUp) { @@ -476,7 +483,7 @@ private boolean remove(long key1, long key2, long value1, long value2, int keyHa return false; } - bucket = (bucket + 4) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } finally { @@ -502,7 +509,7 @@ private boolean remove(long key1, long key2, long value1, long value2, int keyHa } private void cleanBucket(int bucket) { - int nextInArray = (bucket + 4) & (table.length - 1); + int nextInArray = (bucket + ITEM_SIZE) & (table.length - 1); if (table[nextInArray] == EmptyKey) { table[bucket] = EmptyKey; table[bucket + 1] = EmptyKey; @@ -512,7 +519,7 @@ private void cleanBucket(int bucket) { // Cleanup all the buckets that were in `DeletedKey` state, // so that we can reduce unnecessary expansions - bucket = (bucket - 4) & (table.length - 1); + bucket = (bucket - ITEM_SIZE) & (table.length - 1); while (table[bucket] == DeletedKey) { table[bucket] = EmptyKey; table[bucket + 1] = EmptyKey; @@ -520,7 +527,7 @@ private void cleanBucket(int bucket) { table[bucket + 3] = ValueNotFound; --usedBuckets; - bucket = (bucket - 4) & (table.length - 1); + bucket = (bucket - ITEM_SIZE) & (table.length - 1); } } else { table[bucket] = DeletedKey; @@ -563,7 +570,7 @@ public void forEach(BiConsumerLongPair processor) { } // Go through all the buckets for this section - for (int bucket = 0; bucket < table.length; bucket += 4) { + for (int bucket = 0; bucket < table.length; bucket += ITEM_SIZE) { long storedKey1 = table[bucket]; long storedKey2 = table[bucket + 1]; long storedValue1 = table[bucket + 2]; @@ -592,11 +599,11 @@ public void forEach(BiConsumerLongPair processor) { } private void rehash(int newCapacity) { - long[] newTable = new long[4 * newCapacity]; + long[] newTable = new long[ITEM_SIZE * newCapacity]; Arrays.fill(newTable, EmptyKey); // Re-hash table - for (int i = 0; i < table.length; i += 4) { + for (int i = 0; i < table.length; i += ITEM_SIZE) { long storedKey1 = table[i]; long storedKey2 = table[i + 1]; long storedValue1 = table[i + 2]; @@ -616,7 +623,7 @@ private void rehash(int newCapacity) { } private void shrinkToInitCapacity() { - long[] newTable = new long[4 * initCapacity]; + long[] newTable = new long[ITEM_SIZE * initCapacity]; Arrays.fill(newTable, EmptyKey); table = newTable; @@ -630,7 +637,7 @@ private void shrinkToInitCapacity() { } private static void insertKeyValueNoLock(long[] table, int capacity, long key1, long key2, long value1, - long value2) { + long value2) { int bucket = signSafeMod(hash(key1, key2), capacity); while (true) { @@ -645,7 +652,7 @@ private static void insertKeyValueNoLock(long[] table, int capacity, long key1, return; } - bucket = (bucket + 4) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } } @@ -664,6 +671,8 @@ static final long hash(long key1, long key2) { } static final int signSafeMod(long n, int max) { + // as the ITEM_SIZE of Section is 4, so the index is the multiple of 4 + // that is to left shift 2 bits return (int) (n & (max - 1)) << 2; } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashMap.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashMap.java index cab3ce8ea3b..163918adbcd 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashMap.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashMap.java @@ -278,6 +278,9 @@ public List values() { // A section is a portion of the hash map that is covered by a single @SuppressWarnings("serial") private static final class Section extends StampedLock { + // Each item take up 2 continuous array space. + private static final int ITEM_SIZE = 2; + // Keys and values are stored interleaved in the table array private volatile Object[] table; @@ -297,7 +300,7 @@ private static final class Section extends StampedLock { float expandFactor, float shrinkFactor) { this.capacity = alignToPowerOfTwo(capacity); this.initCapacity = this.capacity; - this.table = new Object[2 * this.capacity]; + this.table = new Object[ITEM_SIZE * this.capacity]; this.size = 0; this.usedBuckets = 0; this.autoShrink = autoShrink; @@ -312,7 +315,11 @@ private static final class Section extends StampedLock { V get(K key, int keyHash) { long stamp = tryOptimisticRead(); boolean acquiredLock = false; - int bucket = signSafeMod(keyHash, capacity); + + // add local variable here, so OutOfBound won't happen + Object[] table = this.table; + // calculate table.length / 2 as capacity to avoid rehash changing capacity + int bucket = signSafeMod(keyHash, table.length / ITEM_SIZE); try { while (true) { @@ -334,7 +341,9 @@ V get(K key, int keyHash) { stamp = readLock(); acquiredLock = true; - bucket = signSafeMod(keyHash, capacity); + // update local variable + table = this.table; + bucket = signSafeMod(keyHash, table.length / ITEM_SIZE); storedKey = (K) table[bucket]; storedValue = (V) table[bucket + 1]; } @@ -347,7 +356,7 @@ V get(K key, int keyHash) { } } - bucket = (bucket + 2) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } finally { if (acquiredLock) { @@ -400,7 +409,7 @@ V put(K key, V value, int keyHash, boolean onlyIfAbsent, Function valuePro } } - bucket = (bucket + 2) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } finally { if (usedBuckets > resizeThresholdUp) { @@ -438,7 +447,7 @@ private V remove(K key, Object value, int keyHash) { return null; } - bucket = (bucket + 2) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } finally { @@ -496,7 +505,7 @@ public void forEach(BiConsumer processor) { } // Go through all the buckets for this section - for (int bucket = 0; bucket < table.length; bucket += 2) { + for (int bucket = 0; bucket < table.length; bucket += ITEM_SIZE) { K storedKey = (K) table[bucket]; V storedValue = (V) table[bucket + 1]; @@ -526,7 +535,7 @@ int removeIf(BiPredicate filter) { int removedCount = 0; try { // Go through all the buckets for this section - for (int bucket = 0; size > 0 && bucket < table.length; bucket += 2) { + for (int bucket = 0; size > 0 && bucket < table.length; bucket += ITEM_SIZE) { K storedKey = (K) table[bucket]; V storedValue = (V) table[bucket + 1]; @@ -564,7 +573,7 @@ int removeIf(BiPredicate filter) { } private void cleanBucket(int bucket) { - int nextInArray = (bucket + 2) & (table.length - 1); + int nextInArray = (bucket + ITEM_SIZE) & (table.length - 1); if (table[nextInArray] == EmptyKey) { table[bucket] = EmptyKey; table[bucket + 1] = null; @@ -572,13 +581,13 @@ private void cleanBucket(int bucket) { // Cleanup all the buckets that were in `DeletedKey` state, // so that we can reduce unnecessary expansions - bucket = (bucket - 2) & (table.length - 1); + bucket = (bucket - ITEM_SIZE) & (table.length - 1); while (table[bucket] == DeletedKey) { table[bucket] = EmptyKey; table[bucket + 1] = null; --usedBuckets; - bucket = (bucket - 2) & (table.length - 1); + bucket = (bucket - ITEM_SIZE) & (table.length - 1); } } else { table[bucket] = DeletedKey; @@ -588,10 +597,10 @@ private void cleanBucket(int bucket) { private void rehash(int newCapacity) { // Expand the hashmap - Object[] newTable = new Object[2 * newCapacity]; + Object[] newTable = new Object[ITEM_SIZE * newCapacity]; // Re-hash table - for (int i = 0; i < table.length; i += 2) { + for (int i = 0; i < table.length; i += ITEM_SIZE) { K storedKey = (K) table[i]; V storedValue = (V) table[i + 1]; if (storedKey != EmptyKey && storedKey != DeletedKey) { @@ -609,7 +618,7 @@ private void rehash(int newCapacity) { } private void shrinkToInitCapacity() { - Object[] newTable = new Object[2 * initCapacity]; + Object[] newTable = new Object[ITEM_SIZE * initCapacity]; table = newTable; size = 0; @@ -634,7 +643,7 @@ private static void insertKeyValueNoLock(Object[] table, int capacity, K return; } - bucket = (bucket + 2) & (table.length - 1); + bucket = (bucket + ITEM_SIZE) & (table.length - 1); } } } @@ -650,6 +659,8 @@ static final long hash(K key) { } static final int signSafeMod(long n, int max) { + // as the ITEM_SIZE of Section is 2, so the index is the multiple of 2 + // that is to left shift 1 bit return (int) (n & (max - 1)) << 1; } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSet.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSet.java index a7f39173d39..a5e12d10fa2 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSet.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSet.java @@ -265,16 +265,16 @@ private static final class Section extends StampedLock { } boolean contains(V value, int keyHash) { - int bucket = keyHash; - long stamp = tryOptimisticRead(); boolean acquiredLock = false; + // add local variable here, so OutOfBound won't happen + V[] values = this.values; + // calculate table.length as capacity to avoid rehash changing capacity + int bucket = signSafeMod(keyHash, values.length); + try { while (true) { - int capacity = this.capacity; - bucket = signSafeMod(bucket, capacity); - // First try optimistic locking V storedValue = values[bucket]; @@ -292,15 +292,12 @@ boolean contains(V value, int keyHash) { stamp = readLock(); acquiredLock = true; + // update local variable + values = this.values; + bucket = signSafeMod(keyHash, values.length); storedValue = values[bucket]; } - if (capacity != this.capacity) { - // There has been a rehashing. We need to restart the search - bucket = keyHash; - continue; - } - if (value.equals(storedValue)) { return true; } else if (storedValue == EmptyValue) { @@ -308,8 +305,7 @@ boolean contains(V value, int keyHash) { return false; } } - - ++bucket; + bucket = (bucket + 1) & (values.length - 1); } } finally { if (acquiredLock) { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashMapTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashMapTest.java index f1372b28944..b1f1b5437d4 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashMapTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashMapTest.java @@ -41,6 +41,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.LongFunction; import org.junit.Test; @@ -187,6 +188,66 @@ public void testExpandAndShrink() { assertTrue(map.capacity() == 8); } + @Test + public void testConcurrentExpandAndShrinkAndGet() throws Throwable { + ConcurrentLongHashMap map = ConcurrentLongHashMap.newBuilder() + .expectedItems(2) + .concurrencyLevel(1) + .autoShrink(true) + .mapIdleFactor(0.25f) + .build(); + assertEquals(map.capacity(), 4); + + ExecutorService executor = Executors.newCachedThreadPool(); + final int readThreads = 16; + final int writeThreads = 1; + final int n = 1_000; + CyclicBarrier barrier = new CyclicBarrier(writeThreads + readThreads); + Future future = null; + AtomicReference ex = new AtomicReference<>(); + + for (int i = 0; i < readThreads; i++) { + executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + try { + map.get(1); + } catch (Exception e) { + ex.set(e); + } + }); + } + + assertNull(map.put(1, "v1")); + future = executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + + for (int i = 0; i < n; i++) { + // expand hashmap + assertNull(map.put(2, "v2")); + assertNull(map.put(3, "v3")); + assertEquals(map.capacity(), 8); + + // shrink hashmap + assertTrue(map.remove(2, "v2")); + assertTrue(map.remove(3, "v3")); + assertEquals(map.capacity(), 4); + } + }); + + future.get(); + assertTrue(ex.get() == null); + // shut down pool + executor.shutdown(); + } + @Test public void testExpandShrinkAndClear() { ConcurrentLongHashMap map = ConcurrentLongHashMap.newBuilder() diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashSetTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashSetTest.java index 2c28e882930..1c6bf12c695 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashSetTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongHashSetTest.java @@ -31,9 +31,11 @@ import java.util.Collections; import java.util.List; import java.util.Random; +import java.util.concurrent.CyclicBarrier; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicReference; import org.junit.Test; /** @@ -295,6 +297,68 @@ public void testExpandAndShrink() { assertTrue(map.capacity() == 8); } + @Test + public void testConcurrentExpandAndShrinkAndGet() throws Throwable { + ConcurrentLongHashSet set = ConcurrentLongHashSet.newBuilder() + .expectedItems(2) + .concurrencyLevel(1) + .autoShrink(true) + .mapIdleFactor(0.25f) + .build(); + assertEquals(set.capacity(), 4); + + ExecutorService executor = Executors.newCachedThreadPool(); + final int readThreads = 16; + final int writeThreads = 1; + final int n = 1_000; + CyclicBarrier barrier = new CyclicBarrier(writeThreads + readThreads); + Future future = null; + AtomicReference ex = new AtomicReference<>(); + + for (int i = 0; i < readThreads; i++) { + executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + while (true) { + try { + set.contains(1); + } catch (Exception e) { + ex.set(e); + } + } + }); + } + + assertTrue(set.add(1)); + future = executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + + for (int i = 0; i < n; i++) { + // expand hashmap + assertTrue(set.add(2)); + assertTrue(set.add(3)); + assertEquals(set.capacity(), 8); + + // shrink hashmap + assertTrue(set.remove(2)); + assertTrue(set.remove(3)); + assertEquals(set.capacity(), 4); + } + }); + + future.get(); + assertTrue(ex.get() == null); + // shut down pool + executor.shutdown(); + } + @Test public void testExpandShrinkAndClear() { ConcurrentLongHashSet map = ConcurrentLongHashSet.newBuilder() diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongHashMapTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongHashMapTest.java index aca46946746..8121e3364c7 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongHashMapTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongHashMapTest.java @@ -32,10 +32,12 @@ import java.util.List; import java.util.Map; import java.util.Random; +import java.util.concurrent.CyclicBarrier; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; import org.apache.bookkeeper.util.collections.ConcurrentLongLongHashMap.LongLongFunction; import org.junit.Test; @@ -159,6 +161,67 @@ public void testExpandAndShrink() { assertTrue(map.capacity() == 8); } + @Test + public void testConcurrentExpandAndShrinkAndGet() throws Throwable { + ConcurrentLongLongHashMap map = ConcurrentLongLongHashMap.newBuilder() + .expectedItems(2) + .concurrencyLevel(1) + .autoShrink(true) + .mapIdleFactor(0.25f) + .build(); + assertEquals(map.capacity(), 4); + + ExecutorService executor = Executors.newCachedThreadPool(); + final int readThreads = 16; + final int writeThreads = 1; + final int n = 1_000; + CyclicBarrier barrier = new CyclicBarrier(writeThreads + readThreads); + Future future = null; + AtomicReference ex = new AtomicReference<>(); + + for (int i = 0; i < readThreads; i++) { + executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + while (true) { + try { + map.get(1); + } catch (Exception e) { + ex.set(e); + } + } + }); + } + map.put(1, 11); + future = executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + + for (int i = 0; i < n; i++) { + // expand hashmap + map.put(2, 22); + map.put(3, 33); + assertEquals(map.capacity(), 8); + + // shrink hashmap + map.remove(2, 22); + map.remove(3, 33); + assertEquals(map.capacity(), 4); + } + }); + + future.get(); + assertTrue(ex.get() == null); + // shut down pool + executor.shutdown(); + } + @Test public void testExpandShrinkAndClear() { ConcurrentLongLongHashMap map = ConcurrentLongLongHashMap.newBuilder() diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongPairHashMapTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongPairHashMapTest.java index b13625fcc9b..36605c5b96f 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongPairHashMapTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentLongLongPairHashMapTest.java @@ -32,9 +32,11 @@ import java.util.List; import java.util.Map; import java.util.Random; +import java.util.concurrent.CyclicBarrier; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicReference; import org.apache.bookkeeper.util.collections.ConcurrentLongLongPairHashMap.LongPair; import org.junit.Test; @@ -175,6 +177,68 @@ public void testExpandAndShrink() { assertTrue(map.capacity() == 8); } + @Test + public void testConcurrentExpandAndShrinkAndGet() throws Throwable { + ConcurrentLongLongPairHashMap map = ConcurrentLongLongPairHashMap.newBuilder() + .expectedItems(2) + .concurrencyLevel(1) + .autoShrink(true) + .mapIdleFactor(0.25f) + .build(); + assertEquals(map.capacity(), 4); + + ExecutorService executor = Executors.newCachedThreadPool(); + final int readThreads = 16; + final int writeThreads = 1; + final int n = 1_000; + CyclicBarrier barrier = new CyclicBarrier(writeThreads + readThreads); + Future future = null; + AtomicReference ex = new AtomicReference<>(); + + for (int i = 0; i < readThreads; i++) { + executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + while (true) { + try { + map.get(1, 1); + } catch (Exception e) { + ex.set(e); + } + } + }); + } + + assertTrue(map.put(1, 1, 11, 11)); + future = executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + + for (int i = 0; i < n; i++) { + // expand hashmap + assertTrue(map.put(2, 2, 22, 22)); + assertTrue(map.put(3, 3, 33, 33)); + assertEquals(map.capacity(), 8); + + // shrink hashmap + assertTrue(map.remove(2, 2, 22, 22)); + assertTrue(map.remove(3, 3, 33, 33)); + assertEquals(map.capacity(), 4); + } + }); + + future.get(); + assertTrue(ex.get() == null); + // shut down pool + executor.shutdown(); + } + @Test public void testExpandShrinkAndClear() { ConcurrentLongLongPairHashMap map = ConcurrentLongLongPairHashMap.newBuilder() diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashMapTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashMapTest.java index 3ed17edb57a..a7835e63897 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashMapTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashMapTest.java @@ -33,11 +33,13 @@ import java.util.List; import java.util.Random; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CyclicBarrier; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiPredicate; import java.util.function.Function; import org.junit.Test; @@ -180,6 +182,68 @@ public void testExpandAndShrink() { assertTrue(map.capacity() == 8); } + @Test + public void testConcurrentExpandAndShrinkAndGet() throws Throwable { + ConcurrentOpenHashMap map = ConcurrentOpenHashMap.newBuilder() + .expectedItems(2) + .concurrencyLevel(1) + .autoShrink(true) + .mapIdleFactor(0.25f) + .build(); + assertEquals(map.capacity(), 4); + + ExecutorService executor = Executors.newCachedThreadPool(); + final int readThreads = 16; + final int writeThreads = 1; + final int n = 1_000; + CyclicBarrier barrier = new CyclicBarrier(writeThreads + readThreads); + Future future = null; + AtomicReference ex = new AtomicReference<>(); + + for (int i = 0; i < readThreads; i++) { + executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + while (true) { + try { + map.get("k3"); + } catch (Exception e) { + ex.set(e); + } + } + }); + } + + assertNull(map.put("k1", "v1")); + future = executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + + for (int i = 0; i < n; i++) { + // expand hashmap + assertNull(map.put("k2", "v2")); + assertNull(map.put("k3", "v3")); + assertEquals(map.capacity(), 8); + + // shrink hashmap + assertTrue(map.remove("k2", "v2")); + assertTrue(map.remove("k3", "v3")); + assertEquals(map.capacity(), 4); + } + }); + + future.get(); + assertTrue(ex.get() == null); + // shut down pool + executor.shutdown(); + } + @Test public void testExpandShrinkAndClear() { ConcurrentOpenHashMap map = ConcurrentOpenHashMap.newBuilder() diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSetTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSetTest.java index 8875be2f579..8840eacb09d 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSetTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSetTest.java @@ -30,9 +30,11 @@ import java.util.Collections; import java.util.List; import java.util.Random; +import java.util.concurrent.CyclicBarrier; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicReference; import org.junit.Test; /** @@ -190,6 +192,68 @@ public void testExpandShrinkAndClear() { assertTrue(map.capacity() == initCapacity); } + @Test + public void testConcurrentExpandAndShrinkAndGet() throws Throwable { + ConcurrentOpenHashSet set = ConcurrentOpenHashSet.newBuilder() + .expectedItems(2) + .concurrencyLevel(1) + .autoShrink(true) + .mapIdleFactor(0.25f) + .build(); + assertEquals(set.capacity(), 4); + + ExecutorService executor = Executors.newCachedThreadPool(); + final int readThreads = 16; + final int writeThreads = 1; + final int n = 1_000; + CyclicBarrier barrier = new CyclicBarrier(writeThreads + readThreads); + Future future = null; + AtomicReference ex = new AtomicReference<>(); + + for (int i = 0; i < readThreads; i++) { + executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + while (true) { + try { + set.contains("k2"); + } catch (Exception e) { + ex.set(e); + } + } + }); + } + + assertTrue(set.add("k1")); + future = executor.submit(() -> { + try { + barrier.await(); + } catch (Exception e) { + throw new RuntimeException(e); + } + + for (int i = 0; i < n; i++) { + // expand hashmap + assertTrue(set.add("k2")); + assertTrue(set.add("k3")); + assertEquals(set.capacity(), 8); + + // shrink hashmap + assertTrue(set.remove("k2")); + assertTrue(set.remove("k3")); + assertEquals(set.capacity(), 4); + } + }); + + future.get(); + assertTrue(ex.get() == null); + // shut down pool + executor.shutdown(); + } + @Test public void testReduceUnnecessaryExpansions(){ ConcurrentOpenHashSet set = From 6fb5a39e053b7e81c2104249a2eb711f48f82446 Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Thu, 9 May 2024 17:58:02 +0800 Subject: [PATCH 135/233] Bump jackson from 2.13.4.20221013 to 2.17.1 to address CVE list (#4345) --- .../src/main/resources/LICENSE-all.bin.txt | 12 ++++++------ .../src/main/resources/LICENSE-bkctl.bin.txt | 12 ++++++------ .../src/main/resources/LICENSE-server.bin.txt | 12 ++++++------ pom.xml | 8 ++++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index f77aaced453..ab8ea8bad30 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -205,9 +205,9 @@ The following bundled 3rd party jars are distributed under the Apache Software License, Version 2. -- lib/com.fasterxml.jackson.core-jackson-annotations-2.13.4.jar [1] -- lib/com.fasterxml.jackson.core-jackson-core-2.13.4.jar [2] -- lib/com.fasterxml.jackson.core-jackson-databind-2.13.4.2.jar [3] +- lib/com.fasterxml.jackson.core-jackson-annotations-2.17.1.jar [1] +- lib/com.fasterxml.jackson.core-jackson-core-2.17.1.jar [2] +- lib/com.fasterxml.jackson.core-jackson-databind-2.17.1.jar [3] - lib/com.google.guava-guava-32.0.1-jre.jar [4] - lib/com.google.guava-failureaccess-1.0.1.jar [4] - lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4] @@ -321,9 +321,9 @@ Apache Software License, Version 2. - lib/org.hdrhistogram-HdrHistogram-2.1.10.jar [52] - lib/com.carrotsearch-hppc-0.9.1.jar [53] -[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.13.4 -[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.13.4 -[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.13.4.2 +[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1 +[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1 +[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1 [4] Source available at https://github.com/google/guava/tree/v32.0.1 [5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2 [6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index 4a45e43f055..1e6c1b95188 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -205,9 +205,9 @@ The following bundled 3rd party jars are distributed under the Apache Software License, Version 2. -- lib/com.fasterxml.jackson.core-jackson-annotations-2.13.4.jar [1] -- lib/com.fasterxml.jackson.core-jackson-core-2.13.4.jar [2] -- lib/com.fasterxml.jackson.core-jackson-databind-2.13.4.2.jar [3] +- lib/com.fasterxml.jackson.core-jackson-annotations-2.17.1.jar [1] +- lib/com.fasterxml.jackson.core-jackson-core-2.17.1.jar [2] +- lib/com.fasterxml.jackson.core-jackson-databind-2.17.1.jar [3] - lib/com.google.guava-guava-32.0.1-jre.jar [4] - lib/com.google.guava-failureaccess-1.0.1.jar [4] - lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4] @@ -292,9 +292,9 @@ Apache Software License, Version 2. - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/com.carrotsearch-hppc-0.9.1.jar [52] -[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.13.4 -[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.13.4 -[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.13.4.2 +[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1 +[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1 +[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1 [4] Source available at https://github.com/google/guava/tree/v32.0.1 [5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2 [6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index 6914715a13d..f6f8d9783d8 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -205,9 +205,9 @@ The following bundled 3rd party jars are distributed under the Apache Software License, Version 2. -- lib/com.fasterxml.jackson.core-jackson-annotations-2.13.4.jar [1] -- lib/com.fasterxml.jackson.core-jackson-core-2.13.4.jar [2] -- lib/com.fasterxml.jackson.core-jackson-databind-2.13.4.2.jar [3] +- lib/com.fasterxml.jackson.core-jackson-annotations-2.17.1.jar [1] +- lib/com.fasterxml.jackson.core-jackson-core-2.17.1.jar [2] +- lib/com.fasterxml.jackson.core-jackson-databind-2.17.1.jar [3] - lib/com.google.guava-guava-32.0.1-jre.jar [4] - lib/com.google.guava-failureaccess-1.0.1.jar [4] - lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4] @@ -317,9 +317,9 @@ Apache Software License, Version 2. - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/com.carrotsearch-hppc-0.9.1.jar [52] -[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.13.4 -[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.13.4 -[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.13.4.2 +[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1 +[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1 +[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1 [4] Source available at https://github.com/google/guava/tree/v32.0.1 [5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2 [6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2 diff --git a/pom.xml b/pom.xml index 8f552eef420..680d711b6c5 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.apache apache - 29 + 31 4.0.0 org.apache.bookkeeper @@ -78,14 +78,14 @@ user-subscribe@bookkeeper.apache.org user-unsubscribe@bookkeeper.apache.org user@bookkeeper.apache.org - http://www.mail-archive.com/user@bookkeeper.apache.org + https://www.mail-archive.com/user@bookkeeper.apache.org BookKeeper Dev dev-subscribe@bookkeeper.apache.org dev-unsubscribe@bookkeeper.apache.org dev@bookkeeper.apache.org - http://www.mail-archive.com/dev@bookkeeper.apache.org + https://www.mail-archive.com/dev@bookkeeper.apache.org BookKeeper Commits @@ -138,7 +138,7 @@ 1.1.1 3.3.5 2.1.10 - 2.13.4.20221013 + 2.17.1 1.82 9.4.53.v20231009 1.37 From a71775c7e8cab07a33ac19bec6adb768946926f9 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Sat, 11 May 2024 20:39:44 +0800 Subject: [PATCH 136/233] Fix disk weight ensemble infinite loop bug (#4324) ### Motivation In the RackawareEnsemblePlacementPolicyImpl#selectRandomInternal method, if bookieNode in the ensemble list is not added to the excludeBookies set and the diskWeight feature is enabled, this method will fall into an infinite loop. https://github.com/apache/bookkeeper/blob/3ed93a0342ccff8c30ea472d731a7b593b4d32b0/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java#L773-L777 The root cause is the newly selected bookies already exist in the ensemble list, leading the `ensemble.addNode(bookie)` method to return `false` and the while loop continues. https://github.com/apache/bookkeeper/blob/3ed93a0342ccff8c30ea472d731a7b593b4d32b0/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java#L841 In the next round of the loop, `bookiesSeenSoFar.size()` will never equal to `bookiesToSelectFrom.size()` due to the wRSelection set doesn't exclude the bookies in the ensemble set. https://github.com/apache/bookkeeper/blob/3ed93a0342ccff8c30ea472d731a7b593b4d32b0/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java#L815-L822 ### Changes Remove the following code to make sure the items in bookiesToSelectFrom are all included in `wRSelection` https://github.com/apache/bookkeeper/blob/3ed93a0342ccff8c30ea472d731a7b593b4d32b0/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java#L795-L797 (cherry picked from commit a51f94dbf015c69efad9fcc4b99a88efda443e3c) --- .../RackawareEnsemblePlacementPolicyImpl.java | 3 - .../TestRackawareEnsemblePlacementPolicy.java | 57 ++++++++++++++++++- 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java index 6ec9e5b1589..4f9ed29f15e 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java @@ -738,9 +738,6 @@ protected List selectRandomInternal(List bookiesToSelect Map rackMap = new HashMap(); for (BookieNode n : bookiesToSelectFrom) { - if (excludeBookies.contains(n)) { - continue; - } if (this.bookieInfoMap.containsKey(n)) { rackMap.put(n, this.bookieInfoMap.get(n)); } else { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java index 95a7d5b40d7..4d0606f9021 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java @@ -17,6 +17,7 @@ */ package org.apache.bookkeeper.client; +import static org.apache.bookkeeper.client.RackawareEnsemblePlacementPolicyImpl.RACKNAME_DISTANCE_FROM_LEAVES; import static org.apache.bookkeeper.client.RackawareEnsemblePlacementPolicyImpl.REPP_DNS_RESOLVER_CLASS; import static org.apache.bookkeeper.client.RackawareEnsemblePlacementPolicyImpl.shuffleWithMask; import static org.apache.bookkeeper.client.RoundRobinDistributionSchedule.writeSetFromValues; @@ -790,6 +791,55 @@ public void testNewEnsembleWithSingleRack() throws Exception { } } + @Test(timeout = 30_000) + public void testNewEnsembleWithExcludeBookies() throws Exception { + repp.uninitalize(); + updateMyRack(NetworkTopology.DEFAULT_REGION_AND_RACK); + + repp = new RackawareEnsemblePlacementPolicy(); + conf.setDiskWeightBasedPlacementEnabled(true); + repp.initialize(conf, Optional.empty(), timer, + DISABLE_ALL, NullStatsLogger.INSTANCE, BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER); + repp.withDefaultRack(NetworkTopology.DEFAULT_REGION_AND_RACK); + + BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181); + BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.3", 3181); + BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.4", 3181); + + BookieNode addr1Node = new BookieNode(addr1.toBookieId(), repp.resolveNetworkLocation(addr1.toBookieId())); + BookieNode addr2Node = new BookieNode(addr2.toBookieId(), repp.resolveNetworkLocation(addr2.toBookieId())); + BookieNode addr3Node = new BookieNode(addr3.toBookieId(), repp.resolveNetworkLocation(addr3.toBookieId())); + // update dns mapping + StaticDNSResolver.addNodeToRack(addr1.getHostName(), "/default-region/r1"); + StaticDNSResolver.addNodeToRack(addr2.getHostName(), "/default-region/r2"); + StaticDNSResolver.addNodeToRack(addr3.getHostName(), "/default-region/r1"); + // Update cluster + Set addrs = new HashSet(); + addrs.add(addr1.toBookieId()); + addrs.add(addr2.toBookieId()); + addrs.add(addr3.toBookieId()); + repp.onClusterChanged(addrs, new HashSet()); + + Set excludeBookies = new HashSet<>(); + excludeBookies.add(addr2Node); + excludeBookies.add(addr3Node); + + TopologyAwareEnsemblePlacementPolicy.RRTopologyAwareCoverageEnsemble ensemble = + new TopologyAwareEnsemblePlacementPolicy.RRTopologyAwareCoverageEnsemble( + 2, 2, 2, + RACKNAME_DISTANCE_FROM_LEAVES, + null, null, 1); + ensemble.addNode(new BookieNode(addr1.toBookieId(), repp.resolveNetworkLocation(addr1.toBookieId()))); + try { + repp.selectRandomInternal(null, 1, excludeBookies, null, ensemble); + fail("Should fail with not enough bookies exception"); + } catch (BKNotEnoughBookiesException ex) { + // + } + + conf.setDiskWeightBasedPlacementEnabled(false); + } + @Test public void testSingleRackWithEnforceMinNumRacks() throws Exception { repp.uninitalize(); @@ -1977,10 +2027,11 @@ public void testWeightedPlacementAndReplaceBookieWithoutEnoughBookiesInSameRack( selectionCounts.put(replacedBookie, selectionCounts.get(replacedBookie) + 1); } /* - * since addr2 has to be replaced, the remaining bookies weight are - 50, 100, 200, 500 (10*50) - * So the median calculated by WeightedRandomSelection is (100 + 200) / 2 = 150 + * Even though addr2 has to be replaced, but being excluded bookie weight is not excluded in the choose list. + * All the bookies weight are - 50, 100, 100, 200, 500 (10*50) + * So the median calculated by WeightedRandomSelection is 100 */ - double medianWeight = 150; + double medianWeight = 100; double medianSelectionCounts = (double) (medianWeight / bookieInfoMap.get(addr1.toBookieId()).getWeight()) * selectionCounts.get(addr1.toBookieId()); double observedMultiple1 = ((double) selectionCounts.get(addr4.toBookieId()) From d39e923ed003e3e687c035ef28abb2d8e519e94a Mon Sep 17 00:00:00 2001 From: Lishen Yao Date: Sat, 11 May 2024 19:18:10 +0900 Subject: [PATCH 137/233] Skip mount command error (#4360) ### Motivation Fix ![image](https://github.com/apache/bookkeeper/assets/10069311/c7256c52-ebb5-4577-935a-cccdd4625f47) (cherry picked from commit d89dbc87f2995175876d445393f87b2b45569d04) --- .github/actions/tune-runner-vm/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/tune-runner-vm/action.yml b/.github/actions/tune-runner-vm/action.yml index 402b9201dc2..7e5f77f9a83 100644 --- a/.github/actions/tune-runner-vm/action.yml +++ b/.github/actions/tune-runner-vm/action.yml @@ -53,8 +53,8 @@ runs: # tune filesystem mount options, https://www.kernel.org/doc/Documentation/filesystems/ext4.txt # commit=999999, effectively disables automatic syncing to disk (default is every 5 seconds) # nobarrier/barrier=0, loosen data consistency on system crash (no negative impact to empheral CI nodes) - sudo mount -o remount,nodiscard,commit=999999,barrier=0 / - sudo mount -o remount,nodiscard,commit=999999,barrier=0 /mnt + sudo mount -o remount,nodiscard,commit=999999,barrier=0 / || true + sudo mount -o remount,nodiscard,commit=999999,barrier=0 /mnt || true # disable discard/trim at device level since remount with nodiscard doesn't seem to be effective # https://www.spinics.net/lists/linux-ide/msg52562.html for i in /sys/block/sd*/queue/discard_max_bytes; do From 7d81552f2c805933f8940d73510c6f9f6fb4097a Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Mon, 8 Apr 2024 01:24:16 -0700 Subject: [PATCH 138/233] Use vertx blockingHandlers that allow blocking without warnings (#4266) ### Motivation - The http handler implementations in Bookkeeper aren't necessarily non-blocking. That's why they should be executed on the blocking thread pool in vertx. ### Changes Executing on blocking thread pool in vertx can be achieved by registering the handlers using the `blockingHandler` method instead of the `handler` method. --- .../org/apache/bookkeeper/http/vertx/VertxHttpServer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxHttpServer.java b/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxHttpServer.java index 331ed6566b0..94bb83a03f5 100644 --- a/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxHttpServer.java +++ b/bookkeeper-http/vertx-http-server/src/main/java/org/apache/bookkeeper/http/vertx/VertxHttpServer.java @@ -83,10 +83,10 @@ public boolean startServer(int port, String host, HttpServerConfiguration httpSe HttpRouter requestRouter = new HttpRouter(handlerFactory) { @Override public void bindHandler(String endpoint, VertxAbstractHandler handler) { - router.get(endpoint).handler(handler); - router.put(endpoint).handler(handler); - router.post(endpoint).handler(handler); - router.delete(endpoint).handler(handler); + router.get(endpoint).blockingHandler(handler); + router.put(endpoint).blockingHandler(handler); + router.post(endpoint).blockingHandler(handler); + router.delete(endpoint).blockingHandler(handler); } }; requestRouter.bindAll(); From 38d433f1593e575b24011f05513c793d6375a2d9 Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Sat, 20 Apr 2024 08:13:58 +0800 Subject: [PATCH 139/233] improve: change scheduleAtFixedRate to scheduleWithFixedDelay in GarbageCollectorThread (#4296) ### Motivation Current scheduling mechanism for garbage collection uses scheduleAtFixedRate. This approach schedules the next execution without considering whether the current task has finished, potentially leading to overlapping executions if a task takes longer than expected. In my test environment, After task accumulation in gc thread pool, sometimes there is no entrylog to extract and no entrylogger to compact. But every round of gc, still need to compare ledger meta between local and metadata store (zk), which will result in highly frequently access to metadata store and each access will bring considerable unnecessary data flow. See https://lists.apache.org/thread/023vkc5rwyq0j776zcv8dtp7c8cml6vp Signed-off-by: ZhangJian He (cherry picked from commit f62a81dda4f1f782a3fc50067bbdffd5b6f438df) --- .../apache/bookkeeper/bookie/GarbageCollectorThread.java | 6 +++--- conf/bk_server.conf | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java index 451aecfe578..4a1c0289879 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java @@ -62,12 +62,12 @@ public class GarbageCollectorThread implements Runnable { private static final long MINUTE = TimeUnit.MINUTES.toMillis(1); // Maps entry log files to the set of ledgers that comprise the file and the size usage per ledger - private EntryLogMetadataMap entryLogMetaMap; + private final EntryLogMetadataMap entryLogMetaMap; private final ScheduledExecutorService gcExecutor; Future scheduledFuture = null; - // This is how often we want to run the Garbage Collector Thread (in milliseconds). + // This is the fixed delay in milliseconds before running the Garbage Collector Thread again. final long gcWaitTime; // Compaction parameters @@ -370,7 +370,7 @@ public void start() { scheduledFuture.cancel(false); } long initialDelay = getModInitialDelay(); - scheduledFuture = gcExecutor.scheduleAtFixedRate(this, initialDelay, gcWaitTime, TimeUnit.MILLISECONDS); + scheduledFuture = gcExecutor.scheduleWithFixedDelay(this, initialDelay, gcWaitTime, TimeUnit.MILLISECONDS); } /** diff --git a/conf/bk_server.conf b/conf/bk_server.conf index 812c5b072d0..f7dbf380329 100755 --- a/conf/bk_server.conf +++ b/conf/bk_server.conf @@ -590,7 +590,7 @@ ledgerDirectories=/tmp/bk-data ## Garbage collection settings ############################################################################# -# How long the interval to trigger next garbage collection, in milliseconds +# Fixed delay in milliseconds to trigger the next garbage collection # Since garbage collection is running in background, too frequent gc # will heart performance. It is better to give a higher number of gc # interval if there is enough disk capacity. From 5fb19fe47fd22a76cc6a9dc6321b750d08a5be88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= Date: Tue, 30 Apr 2024 15:15:46 +0200 Subject: [PATCH 140/233] fix: bookie http endpoint info always return 0.0.0.0 (#4325) (cherry picked from commit fe5bbfe6b12621cdb5b7433acf320c1e5f20b745) --- .../java/org/apache/bookkeeper/server/service/HttpService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/service/HttpService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/service/HttpService.java index 2173b756b99..cee00f84c91 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/service/HttpService.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/service/HttpService.java @@ -77,7 +77,7 @@ public void publishInfo(ComponentInfoPublisher componentInfoPublisher) { if (conf.getServerConf().isHttpServerEnabled()) { EndpointInfo endpoint = new EndpointInfo("httpserver", conf.getServerConf().getHttpServerPort(), - "0.0.0.0", + conf.getServerConf().getHttpServerHost(), "http", null, null); componentInfoPublisher.publishEndpoint(endpoint); } From 2fa28a843f7959370592cc4dc83ea6b7b00a8284 Mon Sep 17 00:00:00 2001 From: ken <1647023764@qq.com> Date: Sat, 25 May 2024 10:30:23 +0800 Subject: [PATCH 141/233] fix OrderedExecutor lost some metric (#4374) Fix [#4373](https://github.com/apache/bookkeeper/issues/4373) ### Motivation As shown in the issue. This is the first pr to fix the lost metric problem. And the other pr improve the metric in SingleThreadExecutor. Co-authored-by: fanjianye (cherry picked from commit e5300a0a2cbee6f50e20e24e79d1927d6500652a) --- .../common/util/OrderedExecutor.java | 46 ++------------- .../common/util/TestOrderedExecutor.java | 58 +++++++++++++++++++ 2 files changed, 63 insertions(+), 41 deletions(-) create mode 100644 bookkeeper-common/src/test/java/org/apache/bookkeeper/common/util/TestOrderedExecutor.java diff --git a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java index 982a5d49516..f856a4ea329 100644 --- a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java +++ b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java @@ -391,6 +391,10 @@ protected OrderedExecutor(String baseName, int numThreads, ThreadFactory threadF ExecutorService thread = createSingleThreadExecutor( new ThreadFactoryBuilder().setNameFormat(name + "-" + getClass().getSimpleName() + "-" + i + "-%d") .setThreadFactory(threadFactory).build()); + SingleThreadExecutor ste = null; + if (thread instanceof SingleThreadExecutor) { + ste = (SingleThreadExecutor) thread; + } if (traceTaskExecution || preserveMdcForTaskExecution) { thread = addExecutorDecorators(thread); @@ -425,48 +429,8 @@ protected OrderedExecutor(String baseName, int numThreads, ThreadFactory threadF throw new RuntimeException("Couldn't start thread " + i, e); } - if (thread instanceof SingleThreadExecutor) { - SingleThreadExecutor ste = (SingleThreadExecutor) thread; + if (ste != null) { ste.registerMetrics(statsLogger); - } else if (thread instanceof ThreadPoolExecutor) { - ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) thread; - // Register gauges - statsLogger.scopeLabel("thread", String.valueOf(idx)) - .registerGauge(String.format("%s-queue", name), new Gauge() { - @Override - public Number getDefaultValue() { - return 0; - } - - @Override - public Number getSample() { - return threadPoolExecutor.getQueue().size(); - } - }); - statsLogger.scopeLabel("thread", String.valueOf(idx)) - .registerGauge(String.format("%s-completed-tasks", name), new Gauge() { - @Override - public Number getDefaultValue() { - return 0; - } - - @Override - public Number getSample() { - return threadPoolExecutor.getCompletedTaskCount(); - } - }); - statsLogger.scopeLabel("thread", String.valueOf(idx)) - .registerGauge(String.format("%s-total-tasks", name), new Gauge() { - @Override - public Number getDefaultValue() { - return 0; - } - - @Override - public Number getSample() { - return threadPoolExecutor.getTaskCount(); - } - }); } } diff --git a/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/util/TestOrderedExecutor.java b/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/util/TestOrderedExecutor.java new file mode 100644 index 00000000000..f8419ec3049 --- /dev/null +++ b/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/util/TestOrderedExecutor.java @@ -0,0 +1,58 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.apache.bookkeeper.common.util; + +import org.apache.bookkeeper.test.TestStatsProvider; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test OrderedExecutor/Scheduler . + */ +public class TestOrderedExecutor { + + @Test + public void testOrderExecutorPrometheusMetric() { + testGenerateMetric(false); + testGenerateMetric(true); + } + + private void testGenerateMetric(boolean isTraceTaskExecution) { + TestStatsProvider provider = new TestStatsProvider(); + + TestStatsProvider.TestStatsLogger rootStatsLogger = provider.getStatsLogger(""); + TestStatsProvider.TestStatsLogger bookieStats = + (TestStatsProvider.TestStatsLogger) rootStatsLogger.scope("bookkeeper_server"); + + OrderedExecutor executor = OrderedExecutor.newBuilder().statsLogger(bookieStats) + .name("test").numThreads(1).traceTaskExecution(isTraceTaskExecution).build(); + + TestStatsProvider.TestStatsLogger testStatsLogger = (TestStatsProvider.TestStatsLogger) + bookieStats.scope("thread_test_OrderedExecutor_0_0"); + + Assert.assertNotNull(testStatsLogger.getGauge("thread_executor_queue").getSample()); + Assert.assertNotNull(testStatsLogger.getGauge("thread_executor_completed").getSample()); + Assert.assertNotNull(testStatsLogger.getGauge("thread_executor_tasks_completed").getSample()); + Assert.assertNotNull(testStatsLogger.getGauge("thread_executor_tasks_rejected").getSample()); + Assert.assertNotNull(testStatsLogger.getGauge("thread_executor_tasks_failed").getSample()); + } +} From eb4ce0e85f35b23983db4f728e545a8c32cf336f Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Sun, 28 Apr 2024 15:40:23 +0800 Subject: [PATCH 142/233] fix guava shade error in distributedlog (#4319) Fix #2700 ## Changes - shade jar should include com.google.guava:failureaccess. - remove unused exclude dependency now. Signed-off-by: ZhangJian He (cherry picked from commit 459d440fa02170b757528311d41cf4a880f4ecb9) --- shaded/distributedlog-core-shaded/pom.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 2a558af6cb9..de957d44343 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -35,22 +35,10 @@ distributedlog-core ${project.version} - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-reload4j - log4j log4j - - ch.qos.reload4j - reload4j - io.netty netty-buffer @@ -83,6 +71,7 @@ com.fasterxml.jackson.core:jackson-core com.fasterxml.jackson.core:jackson-databind com.fasterxml.jackson.core:jackson-annotations + com.google.guava:failureaccess com.google.guava:guava com.google.protobuf:protobuf-java net.jpountz.lz4:lz4 From 581349580d3cbc9bc8ae461ba107f2b1f40e437f Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Fri, 12 Apr 2024 17:01:52 +0800 Subject: [PATCH 143/233] fix: miss test log in prometheus-metrics-provider module (#4279) Signed-off-by: ZhangJian He (cherry picked from commit a9aae83096f44813961f2f656831c0ab50700164) --- .../prometheus-metrics-provider/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index a9e82fcf483..2f10aadf03c 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -71,5 +71,11 @@ sketches-core + + org.apache.bookkeeper + testtools + ${project.parent.version} + test + From 0fb6ab586d623a77a38fa5ab259b6fa7f5e7ce55 Mon Sep 17 00:00:00 2001 From: WuYunlong Date: Mon, 22 Apr 2024 16:50:09 +0800 Subject: [PATCH 144/233] fix wrong implementation for `percentile` in bookkeeper-benchmark (#3864) According to `https://stackoverflow.com/questions/12808934/what-is-p99-latency`, the implementation for `percentile` in bookkeeper-benchmark is wrong. Signed-off-by: ZhangJian He Co-authored-by: ZhangJian He (cherry picked from commit 55ffbd77d2447dda1ac96f34d7d38b1e9b684bdb) --- .../bookkeeper/benchmark/BenchThroughputLatency.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java b/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java index 3c4294e7217..9eeae28f1a3 100644 --- a/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java +++ b/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java @@ -431,14 +431,9 @@ public void process(WatchedEvent event) { private static double percentile(long[] latency, int percentile) { int size = latency.length; double percent = (double) percentile / 100; - int sampleSize = (int) (size * percent); - long total = 0; - int count = 0; - for (int i = 0; i < sampleSize; i++) { - total += latency[i]; - count++; - } - return ((double) total / (double) count) / 1000000.0; + int index = (int) (size * percent); + double lat = index > 0 ? (double) latency[index - 1] / 1000000.0 : 0.0; + return lat; } /** From 6ea6de757774bd9460faef567e1161f0ff35f61a Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 24 May 2024 14:07:00 +0300 Subject: [PATCH 145/233] Remove unused code from ByteBufVisitor (#4383) ### Motivation ByteBufVisitor added in #4196 contains some code that isn't used and covered by unit tests. It's better to remove such code since it makes it harder to reason about the solution. The ByteBufVisitor solution will unwrap all direct buffers that can be unwrapped without the code that is to be removed. I believe that I forgot this code from some earlier phase of the solution where it was necessary to include this. I ran some local tests and didn't see that the code was used for the original purpose that it was added for (supporting read-only buffers). ### Changes Remove the unused code. (cherry picked from commit 84fd25505abced9dbe5269f421899f8c6499787e) --- .../java/org/apache/bookkeeper/util/ByteBufVisitor.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufVisitor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufVisitor.java index 32e9c8c55a4..4bb60f40c6e 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufVisitor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufVisitor.java @@ -162,12 +162,6 @@ private void passBufferToCallback(ByteBuf visitBuffer, int visitIndex, int visit handleArray(visitBuffer.array(), visitBuffer.arrayOffset() + visitIndex, visitLength); } else if (visitBuffer.hasMemoryAddress() && callback.acceptsMemoryAddress(callbackContext)) { callback.visitBuffer(callbackContext, visitBuffer, visitIndex, visitLength); - } else if (callback.acceptsMemoryAddress(callbackContext) && visitBuffer.isDirect() - && visitBuffer.alloc().isDirectBufferPooled()) { - // read-only buffers need to be copied before they can be directly accessed - ByteBuf copyBuffer = visitBuffer.copy(visitIndex, visitLength); - callback.visitBuffer(callbackContext, copyBuffer, 0, visitLength); - copyBuffer.release(); } else { // fallback to reading the visited buffer into the copy buffer in a loop byte[] copyBuffer = TL_COPY_BUFFER.get(); From e424a1aa76e17828b561de7bb36dd5037e08dd83 Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Thu, 9 May 2024 18:00:25 +0800 Subject: [PATCH 146/233] fix: resource leak when JournalChannel is not fully initialized (#4340) (cherry picked from commit 82a7dd3064bafbdc5be5fedd2bb99b77b814f5cd) --- .../java/org/apache/bookkeeper/bookie/JournalChannel.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java index 5c5a02252d7..b3759b68787 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java @@ -192,7 +192,7 @@ private JournalChannel(File journalDirectory, long logId, writeHeader(bcBuilder, writeBufferSize); } else { // open an existing file to read. fc = channel.getFileChannel(); - bc = null; // readonly + // readonly, use fileChannel directly, no need to use BufferedChannel ByteBuffer bb = ByteBuffer.allocate(VERSION_HEADER_SIZE); int c = fc.read(bb); @@ -299,6 +299,8 @@ int read(ByteBuffer dst) public void close() throws IOException { if (bc != null) { bc.close(); + } else if (fc != null) { + fc.close(); } } From 537eeab3bb8bc85beabd903c075d277c63c9603f Mon Sep 17 00:00:00 2001 From: wenbingshen Date: Mon, 29 Apr 2024 11:13:34 +0800 Subject: [PATCH 147/233] Prevent bookie shutdown due to rest api when bookie prohibits readOnlyMode (#3972) (cherry picked from commit 1d9e35dc1f27af8e615e16e5e4a8ef979382e013) --- .../bookkeeper/bookie/BookieStateManager.java | 5 +++ .../bookkeeper/bookie/StateManager.java | 5 +++ .../service/BookieStateReadOnlyService.java | 5 +++ .../server/http/TestHttpService.java | 40 +++++++++++++++++-- 4 files changed, 51 insertions(+), 4 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java index 80226bd38e3..620a1c2aaa4 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java @@ -198,6 +198,11 @@ public boolean isForceReadOnly(){ return forceReadOnly.get(); } + @Override + public boolean isReadOnlyModeEnabled() { + return conf.isReadOnlyModeEnabled(); + } + @Override public boolean isAvailableForHighPriorityWrites() { return availableForHighPriorityWrites; diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java index d279893a8ac..7ed3f0b6572 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java @@ -53,6 +53,11 @@ public interface StateManager extends AutoCloseable { */ boolean isForceReadOnly(); + /** + * Check is readOnlyModeEnabled. + */ + boolean isReadOnlyModeEnabled(); + /** * Check is Running. */ diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java index 23211d5218f..d32074e2bb3 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java @@ -60,6 +60,11 @@ public HttpServiceResponse handle(HttpServiceRequest request) throws Exception { } stateManager.transitionToWritableMode().get(); } else if (!stateManager.isReadOnly() && inState.isReadOnly()) { + if (!stateManager.isReadOnlyModeEnabled()) { + response.setCode(HttpServer.StatusCode.BAD_REQUEST); + response.setBody("Bookie is disabled ReadOnly mode, cannot transit to readOnly mode"); + return response; + } stateManager.transitionToReadOnlyMode().get(); } } else if (!HttpServer.Method.GET.equals(request.getMethod())) { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java index a59adcf6aff..9d856cb13ce 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java @@ -1023,11 +1023,43 @@ public void testBookieReadOnlyState() throws Exception { assertFalse(readOnlyState.isReadOnly()); //forceReadonly to writable - baseConf.setForceReadOnlyBookie(true); - baseConf.setReadOnlyModeEnabled(true); - restartBookies(); + MetadataBookieDriver metadataDriver = BookieResources.createMetadataDriver( + baseConf, NullStatsLogger.INSTANCE); + restartBookies(c -> { + c.setForceReadOnlyBookie(true); + c.setReadOnlyModeEnabled(true); + return c; + }); + // the old bkHttpServiceProvider has an old bookie instance who has been shutdown + // so we need create a new bkHttpServiceProvider2 to contains a new bookie which has created by restart. + BKHttpServiceProvider bkHttpServiceProvider2 = new BKHttpServiceProvider.Builder() + .setBookieServer(serverByIndex(numberOfBookies - 1)) + .setServerConfiguration(baseConf) + .setLedgerManagerFactory(metadataDriver.getLedgerManagerFactory()) + .build(); + HttpEndpointService bookieReadOnlyService2 = bkHttpServiceProvider2 + .provideHttpEndpointService(HttpServer.ApiType.BOOKIE_STATE_READONLY); + request = new HttpServiceRequest(JsonUtil.toJson(new ReadOnlyState(false)), HttpServer.Method.PUT, null); - response = bookieReadOnlyService.handle(request); + response = bookieReadOnlyService2.handle(request); + assertEquals(400, response.getStatusCode()); + + // disable readOnly mode + restartBookies(c -> { + c.setForceReadOnlyBookie(false); + c.setReadOnlyModeEnabled(false); + return c; + }); + bkHttpServiceProvider2 = new BKHttpServiceProvider.Builder() + .setBookieServer(serverByIndex(numberOfBookies - 1)) + .setServerConfiguration(baseConf) + .setLedgerManagerFactory(metadataDriver.getLedgerManagerFactory()) + .build(); + bookieReadOnlyService2 = bkHttpServiceProvider2 + .provideHttpEndpointService(HttpServer.ApiType.BOOKIE_STATE_READONLY); + + request = new HttpServiceRequest(JsonUtil.toJson(new ReadOnlyState(true)), HttpServer.Method.PUT, null); + response = bookieReadOnlyService2.handle(request); assertEquals(400, response.getStatusCode()); } From b334d9f20dc94c17d4f74354a03bc05cccc5992b Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Sat, 25 May 2024 08:25:38 +0800 Subject: [PATCH 148/233] Enhance the SimpleTestCommand test, make it cover more case. (#4387) (cherry picked from commit 4d3c0e01127cf7b134fc0c76db90e2acf75a7678) --- .../tools/cli/commands/client/SimpleTestCommandTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommandTest.java b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommandTest.java index 70ffa46f00d..24a10a9ffea 100644 --- a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommandTest.java +++ b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommandTest.java @@ -149,7 +149,13 @@ public void testCommand(String... args) throws Exception { // verify appends verify(wh, times(10)).append(eq(data)); - verify(rh, times(1)).read(anyLong(), anyLong()); + // verify close write handle. + verify(wh, times(1)).close(); + // verify close the read handle. + verify(rh, times(2)).close(); + // verify read entry 0-9 + verify(rh, times(1)).readUnconfirmed(0, 9); + verify(rh, times(1)).read(0, 9); } } From 29a74ac02a5a53a9b23e0bcee97b9a710f65b79b Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Mon, 27 May 2024 14:40:02 +0300 Subject: [PATCH 149/233] fix: reference counting (retain/release) in PerChannelBookieClient (#4293) (#4396) ### Motivation This addresses the remaining gaps of #4289 in handling ByteBuf retain/release. This PR will also address the concern about NioBuffer lifecycle brought up in the review of the original PR review: https://github.com/apache/bookkeeper/issues/791#issuecomment-383237059 . This PR fixes several problems: * ByteString buffer lifecycle in client, follows ByteBufList lifecycle * ByteBufList lifecycle, moved to write promise * Calling of write promises in AuthHandler which buffers messages while authentication is in progress. It was ignoring the promises. ### Changes - add 2 callback parameters to writeAndFlush: cleanupActionFailedBeforeWrite and cleanupActionAfterWrite - use these callback actions for proper cleanup - extract a utility class ByteStringUtil for wrapping ByteBufList or ByteBuf as concatenated zero copy ByteString - properly handle releasing of ByteBufList in the write promise - properly handle calling promises that are buffered while authentication is in progress (cherry picked from commit 0ef2f997ffda66dbc98fedaa21f99f0c4f5cb1be) # Conflicts: # bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java --- .../apache/bookkeeper/proto/AuthHandler.java | 33 +++++-- .../bookkeeper/proto/BookieClientImpl.java | 38 ++++---- .../bookkeeper/proto/ByteStringUtil.java | 80 +++++++++++++++ .../proto/PerChannelBookieClient.java | 97 +++++++++---------- .../apache/bookkeeper/util/ByteBufList.java | 34 ++++--- .../bookkeeper/util/ByteBufListTest.java | 30 +++++- 6 files changed, 222 insertions(+), 90 deletions(-) create mode 100644 bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ByteStringUtil.java diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java index 720e7279f5a..a11fad102dd 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java @@ -355,7 +355,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) super.write(ctx, msg, promise); super.flush(ctx); } else { - waitingForAuth.add(msg); + addMsgAndPromiseToQueue(msg, promise); } } else if (msg instanceof BookieProtocol.Request) { // let auth messages through, queue the rest @@ -364,16 +364,26 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) super.write(ctx, msg, promise); super.flush(ctx); } else { - waitingForAuth.add(msg); + addMsgAndPromiseToQueue(msg, promise); } } else if (msg instanceof ByteBuf || msg instanceof ByteBufList) { - waitingForAuth.add(msg); + addMsgAndPromiseToQueue(msg, promise); } else { LOG.info("[{}] dropping write of message {}", ctx.channel(), msg); } } } + // Add the message and the associated promise to the queue. + // The promise is added to the same queue as the message without an additional wrapper object so + // that object allocations can be avoided. A similar solution is used in Netty codebase. + private void addMsgAndPromiseToQueue(Object msg, ChannelPromise promise) { + waitingForAuth.add(msg); + if (promise != null && !promise.isVoid()) { + waitingForAuth.add(promise); + } + } + long newTxnId() { return transactionIdGenerator.incrementAndGet(); } @@ -433,10 +443,19 @@ public void operationComplete(int rc, Void v) { if (rc == BKException.Code.OK) { synchronized (this) { authenticated = true; - Object msg = waitingForAuth.poll(); - while (msg != null) { - NettyChannelUtil.writeAndFlushWithVoidPromise(ctx, msg); - msg = waitingForAuth.poll(); + while (true) { + Object msg = waitingForAuth.poll(); + if (msg == null) { + break; + } + ChannelPromise promise; + // check if the message has an associated promise as the next element in the queue + if (waitingForAuth.peek() instanceof ChannelPromise) { + promise = (ChannelPromise) waitingForAuth.poll(); + } else { + promise = ctx.voidPromise(); + } + ctx.writeAndFlush(msg, promise); } } } else { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java index c305a51ea42..5dde52bc3f5 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java @@ -260,18 +260,20 @@ public void writeLac(final BookieId addr, final long ledgerId, final byte[] mast toSend.retain(); client.obtain((rc, pcbc) -> { - if (rc != BKException.Code.OK) { - try { - executor.executeOrdered(ledgerId, - () -> cb.writeLacComplete(rc, ledgerId, addr, ctx)); - } catch (RejectedExecutionException re) { - cb.writeLacComplete(getRc(BKException.Code.InterruptedException), ledgerId, addr, ctx); + try { + if (rc != BKException.Code.OK) { + try { + executor.executeOrdered(ledgerId, + () -> cb.writeLacComplete(rc, ledgerId, addr, ctx)); + } catch (RejectedExecutionException re) { + cb.writeLacComplete(getRc(BKException.Code.InterruptedException), ledgerId, addr, ctx); + } + } else { + pcbc.writeLac(ledgerId, masterKey, lac, toSend, cb, ctx); } - } else { - pcbc.writeLac(ledgerId, masterKey, lac, toSend, cb, ctx); + } finally { + ReferenceCountUtil.release(toSend); } - - ReferenceCountUtil.release(toSend); }, ledgerId, useV3Enforced); } @@ -392,14 +394,16 @@ static ChannelReadyForAddEntryCallback create( @Override public void operationComplete(final int rc, PerChannelBookieClient pcbc) { - if (rc != BKException.Code.OK) { - bookieClient.completeAdd(rc, ledgerId, entryId, addr, cb, ctx); - } else { - pcbc.addEntry(ledgerId, masterKey, entryId, - toSend, cb, ctx, options, allowFastFail, writeFlags); + try { + if (rc != BKException.Code.OK) { + bookieClient.completeAdd(rc, ledgerId, entryId, addr, cb, ctx); + } else { + pcbc.addEntry(ledgerId, masterKey, entryId, + toSend, cb, ctx, options, allowFastFail, writeFlags); + } + } finally { + ReferenceCountUtil.release(toSend); } - - ReferenceCountUtil.release(toSend); recycle(); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ByteStringUtil.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ByteStringUtil.java new file mode 100644 index 00000000000..b26ac7b36ab --- /dev/null +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ByteStringUtil.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.bookkeeper.proto; + +import com.google.protobuf.ByteString; +import com.google.protobuf.UnsafeByteOperations; +import io.netty.buffer.ByteBuf; +import java.nio.ByteBuffer; +import org.apache.bookkeeper.util.ByteBufList; + +public class ByteStringUtil { + + /** + * Wrap the internal buffers of a ByteBufList into a single ByteString. + * The lifecycle of the wrapped ByteString is tied to the ByteBufList. + * + * @param bufList ByteBufList to wrap + * @return ByteString wrapping the internal buffers of the ByteBufList + */ + public static ByteString byteBufListToByteString(ByteBufList bufList) { + ByteString aggregated = null; + for (int i = 0; i < bufList.size(); i++) { + ByteBuf buffer = bufList.getBuffer(i); + if (buffer.readableBytes() > 0) { + aggregated = byteBufToByteString(aggregated, buffer); + } + } + return aggregated != null ? aggregated : ByteString.EMPTY; + } + + /** + * Wrap the internal buffers of a ByteBuf into a single ByteString. + * The lifecycle of the wrapped ByteString is tied to the ByteBuf. + * + * @param byteBuf ByteBuf to wrap + * @return ByteString wrapping the internal buffers of the ByteBuf + */ + public static ByteString byteBufToByteString(ByteBuf byteBuf) { + return byteBufToByteString(null, byteBuf); + } + + // internal method to aggregate a ByteBuf into a single aggregated ByteString + private static ByteString byteBufToByteString(ByteString aggregated, ByteBuf byteBuf) { + if (byteBuf.readableBytes() == 0) { + return ByteString.EMPTY; + } + if (byteBuf.nioBufferCount() > 1) { + for (ByteBuffer nioBuffer : byteBuf.nioBuffers()) { + ByteString piece = UnsafeByteOperations.unsafeWrap(nioBuffer); + aggregated = (aggregated == null) ? piece : aggregated.concat(piece); + } + } else { + ByteString piece; + if (byteBuf.hasArray()) { + piece = UnsafeByteOperations.unsafeWrap(byteBuf.array(), byteBuf.arrayOffset() + byteBuf.readerIndex(), + byteBuf.readableBytes()); + } else { + piece = UnsafeByteOperations.unsafeWrap(byteBuf.nioBuffer()); + } + aggregated = (aggregated == null) ? piece : aggregated.concat(piece); + } + return aggregated; + } +} diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java index 3a7af5b99a6..ca1448c7682 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java @@ -699,14 +699,10 @@ void writeLac(final long ledgerId, final byte[] masterKey, final long lac, ByteB .setVersion(ProtocolVersion.VERSION_THREE) .setOperation(OperationType.WRITE_LAC) .setTxnId(txnId); - ByteString body; - if (toSend.hasArray()) { - body = UnsafeByteOperations.unsafeWrap(toSend.array(), toSend.arrayOffset(), toSend.readableBytes()); - } else if (toSend.size() == 1) { - body = UnsafeByteOperations.unsafeWrap(toSend.getBuffer(0).nioBuffer()); - } else { - body = UnsafeByteOperations.unsafeWrap(toSend.toArray()); - } + ByteString body = ByteStringUtil.byteBufListToByteString(toSend); + toSend.retain(); + Runnable cleanupActionFailedBeforeWrite = toSend::release; + Runnable cleanupActionAfterWrite = cleanupActionFailedBeforeWrite; WriteLacRequest.Builder writeLacBuilder = WriteLacRequest.newBuilder() .setLedgerId(ledgerId) .setLac(lac) @@ -717,7 +713,8 @@ void writeLac(final long ledgerId, final byte[] masterKey, final long lac, ByteB .setHeader(headerBuilder) .setWriteLacRequest(writeLacBuilder) .build(); - writeAndFlush(channel, completionKey, writeLacRequest); + writeAndFlush(channel, completionKey, writeLacRequest, false, cleanupActionFailedBeforeWrite, + cleanupActionAfterWrite); } void forceLedger(final long ledgerId, ForceLedgerCallback cb, Object ctx) { @@ -776,6 +773,8 @@ void addEntry(final long ledgerId, byte[] masterKey, final long entryId, Referen Object ctx, final int options, boolean allowFastFail, final EnumSet writeFlags) { Object request = null; CompletionKey completionKey = null; + Runnable cleanupActionFailedBeforeWrite = null; + Runnable cleanupActionAfterWrite = null; if (useV2WireProtocol) { if (writeFlags.contains(WriteFlag.DEFERRED_SYNC)) { LOG.error("invalid writeflags {} for v2 protocol", writeFlags); @@ -785,9 +784,14 @@ void addEntry(final long ledgerId, byte[] masterKey, final long entryId, Referen completionKey = acquireV2Key(ledgerId, entryId, OperationType.ADD_ENTRY); if (toSend instanceof ByteBuf) { - request = ((ByteBuf) toSend).retainedDuplicate(); + ByteBuf byteBuf = ((ByteBuf) toSend).retainedDuplicate(); + request = byteBuf; + cleanupActionFailedBeforeWrite = byteBuf::release; } else { - request = ByteBufList.clone((ByteBufList) toSend); + ByteBufList byteBufList = (ByteBufList) toSend; + byteBufList.retain(); + request = byteBufList; + cleanupActionFailedBeforeWrite = byteBufList::release; } } else { final long txnId = getTxnId(); @@ -802,19 +806,11 @@ void addEntry(final long ledgerId, byte[] masterKey, final long entryId, Referen headerBuilder.setPriority(DEFAULT_HIGH_PRIORITY_VALUE); } - ByteString body = null; ByteBufList bufToSend = (ByteBufList) toSend; - - if (bufToSend.hasArray()) { - body = UnsafeByteOperations.unsafeWrap(bufToSend.array(), bufToSend.arrayOffset(), - bufToSend.readableBytes()); - } else { - for (int i = 0; i < bufToSend.size(); i++) { - ByteString piece = UnsafeByteOperations.unsafeWrap(bufToSend.getBuffer(i).nioBuffer()); - // use ByteString.concat to avoid byte[] allocation when toSend has multiple ByteBufs - body = (body == null) ? piece : body.concat(piece); - } - } + ByteString body = ByteStringUtil.byteBufListToByteString(bufToSend); + bufToSend.retain(); + cleanupActionFailedBeforeWrite = bufToSend::release; + cleanupActionAfterWrite = cleanupActionFailedBeforeWrite; AddRequest.Builder addBuilder = AddRequest.newBuilder() .setLedgerId(ledgerId) .setEntryId(entryId) @@ -839,17 +835,9 @@ void addEntry(final long ledgerId, byte[] masterKey, final long entryId, Referen putCompletionKeyValue(completionKey, acquireAddCompletion(completionKey, cb, ctx, ledgerId, entryId)); - final Channel c = channel; - if (c == null) { - // Manually release the binary data(variable "request") that we manually created when it can not be sent out - // because the channel is switching. - errorOut(completionKey); - ReferenceCountUtil.release(request); - return; - } else { - // addEntry times out on backpressure - writeAndFlush(c, completionKey, request, allowFastFail); - } + // addEntry times out on backpressure + writeAndFlush(channel, completionKey, request, allowFastFail, cleanupActionFailedBeforeWrite, + cleanupActionAfterWrite); } public void readLac(final long ledgerId, ReadLacCallback cb, Object ctx) { @@ -1004,7 +992,7 @@ private void readEntryInternal(final long ledgerId, ReadCompletion readCompletion = new ReadCompletion(completionKey, cb, ctx, ledgerId, entryId); putCompletionKeyValue(completionKey, readCompletion); - writeAndFlush(channel, completionKey, request, allowFastFail); + writeAndFlush(channel, completionKey, request, allowFastFail, null, null); } public void getBookieInfo(final long requested, GetBookieInfoCallback cb, Object ctx) { @@ -1126,17 +1114,20 @@ public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exceptio private void writeAndFlush(final Channel channel, final CompletionKey key, final Object request) { - writeAndFlush(channel, key, request, false); + writeAndFlush(channel, key, request, false, null, null); } private void writeAndFlush(final Channel channel, final CompletionKey key, final Object request, - final boolean allowFastFail) { + final boolean allowFastFail, final Runnable cleanupActionFailedBeforeWrite, + final Runnable cleanupActionAfterWrite) { if (channel == null) { LOG.warn("Operation {} failed: channel == null", StringUtils.requestToString(request)); errorOut(key); - ReferenceCountUtil.release(request); + if (cleanupActionFailedBeforeWrite != null) { + cleanupActionFailedBeforeWrite.run(); + } return; } @@ -1151,7 +1142,9 @@ private void writeAndFlush(final Channel channel, StringUtils.requestToString(request)); errorOut(key, BKException.Code.TooManyRequestsException); - ReferenceCountUtil.release(request); + if (cleanupActionFailedBeforeWrite != null) { + cleanupActionFailedBeforeWrite.run(); + } return; } @@ -1159,23 +1152,29 @@ private void writeAndFlush(final Channel channel, final long startTime = MathUtils.nowInNano(); ChannelPromise promise = channel.newPromise().addListener(future -> { - if (future.isSuccess()) { - nettyOpLogger.registerSuccessfulEvent(MathUtils.elapsedNanos(startTime), TimeUnit.NANOSECONDS); - CompletionValue completion = completionObjects.get(key); - if (completion != null) { - completion.setOutstanding(); + try { + if (future.isSuccess()) { + nettyOpLogger.registerSuccessfulEvent(MathUtils.elapsedNanos(startTime), TimeUnit.NANOSECONDS); + CompletionValue completion = completionObjects.get(key); + if (completion != null) { + completion.setOutstanding(); + } + } else { + nettyOpLogger.registerFailedEvent(MathUtils.elapsedNanos(startTime), TimeUnit.NANOSECONDS); + } + } finally { + if (cleanupActionAfterWrite != null) { + cleanupActionAfterWrite.run(); } - } else { - nettyOpLogger.registerFailedEvent(MathUtils.elapsedNanos(startTime), TimeUnit.NANOSECONDS); } }); channel.writeAndFlush(request, promise); } catch (Throwable e) { LOG.warn("Operation {} failed", StringUtils.requestToString(request), e); errorOut(key); - // If the request goes into the writeAndFlush, it should be handled well by Netty. So all the exceptions we - // get here, we can release the request. - ReferenceCountUtil.release(request); + if (cleanupActionFailedBeforeWrite != null) { + cleanupActionFailedBeforeWrite.run(); + } } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java index f690b99197b..1f85a16db8b 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java @@ -286,19 +286,29 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) if (msg instanceof ByteBufList) { ByteBufList b = (ByteBufList) msg; - try { - // Write each buffer individually on the socket. The retain() here is needed to preserve the fact - // that ByteBuf are automatically released after a write. If the ByteBufPair ref count is increased - // and it gets written multiple times, the individual buffers refcount should be reflected as well. - int buffersCount = b.buffers.size(); - for (int i = 0; i < buffersCount; i++) { - ByteBuf bx = b.buffers.get(i); - // Last buffer will carry on the final promise to notify when everything was written on the - // socket - ctx.write(bx.retainedDuplicate(), i == (buffersCount - 1) ? promise : ctx.voidPromise()); + ChannelPromise compositePromise = ctx.newPromise(); + compositePromise.addListener(future -> { + // release the ByteBufList after the write operation is completed + ReferenceCountUtil.safeRelease(b); + // complete the promise passed as an argument unless it's a void promise + if (promise != null && !promise.isVoid()) { + if (future.isSuccess()) { + promise.setSuccess(); + } else { + promise.setFailure(future.cause()); + } } - } finally { - ReferenceCountUtil.release(b); + }); + + // Write each buffer individually on the socket. The retain() here is needed to preserve the fact + // that ByteBuf are automatically released after a write. If the ByteBufPair ref count is increased + // and it gets written multiple times, the individual buffers refcount should be reflected as well. + int buffersCount = b.buffers.size(); + for (int i = 0; i < buffersCount; i++) { + ByteBuf bx = b.buffers.get(i); + // Last buffer will carry on the final promise to notify when everything was written on the + // socket + ctx.write(bx.retainedDuplicate(), i == (buffersCount - 1) ? compositePromise : ctx.voidPromise()); } } else { ctx.write(msg, promise); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java index 88de17d0a9d..822d4a7c48e 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java @@ -20,6 +20,8 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; @@ -32,6 +34,8 @@ import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelProgressivePromise; import io.netty.channel.ChannelPromise; +import io.netty.channel.DefaultChannelPromise; +import io.netty.channel.VoidChannelPromise; import io.netty.util.Attribute; import io.netty.util.AttributeKey; import io.netty.util.ReferenceCountUtil; @@ -195,7 +199,8 @@ public void testEncoder() throws Exception { b2.writerIndex(b2.capacity()); ByteBufList buf = ByteBufList.get(b1, b2); - ChannelHandlerContext ctx = new MockChannelHandlerContext(); + Channel channel = mock(Channel.class); + MockChannelHandlerContext ctx = new MockChannelHandlerContext(channel); ByteBufList.ENCODER.write(ctx, buf, null); @@ -205,6 +210,15 @@ public void testEncoder() throws Exception { } class MockChannelHandlerContext implements ChannelHandlerContext { + private final Channel channel; + private final EventExecutor eventExecutor; + + public MockChannelHandlerContext(Channel channel) { + this.channel = channel; + eventExecutor = mock(EventExecutor.class); + when(eventExecutor.inEventLoop()).thenReturn(true); + } + @Override public ChannelFuture bind(SocketAddress localAddress) { return null; @@ -274,12 +288,18 @@ public ChannelFuture write(Object msg) { @Override public ChannelFuture write(Object msg, ChannelPromise promise) { ReferenceCountUtil.release(msg); + if (promise != null && !promise.isVoid()) { + promise.setSuccess(); + } return null; } @Override public ChannelFuture writeAndFlush(Object msg, ChannelPromise promise) { ReferenceCountUtil.release(msg); + if (promise != null && !promise.isVoid()) { + promise.setSuccess(); + } return null; } @@ -291,7 +311,7 @@ public ChannelFuture writeAndFlush(Object msg) { @Override public ChannelPromise newPromise() { - return null; + return new DefaultChannelPromise(channel, eventExecutor); } @Override @@ -311,17 +331,17 @@ public ChannelFuture newFailedFuture(Throwable cause) { @Override public ChannelPromise voidPromise() { - return null; + return new VoidChannelPromise(channel, false); } @Override public Channel channel() { - return null; + return channel; } @Override public EventExecutor executor() { - return null; + return eventExecutor; } @Override From 3f2b88b3f0cba151b6e9a9d595c7797a6022639a Mon Sep 17 00:00:00 2001 From: zhiheng123 <903292776@qq.com> Date: Tue, 28 May 2024 14:16:30 +0800 Subject: [PATCH 150/233] Fix ThreadRegistry#register behavior to ensure correct Prom metrics (#4300) (#4399) Cherry-pick #4300 to branch-4.16 --- .../executors/MockExecutorController.java | 5 ++ .../apache/bookkeeper/bookie/BookieImpl.java | 2 +- .../org/apache/bookkeeper/bookie/Journal.java | 4 +- .../apache/bookkeeper/bookie/SyncThread.java | 11 ++- .../ldb/SingleDirectoryDbLedgerStorage.java | 8 ++- .../bookkeeper/proto/BookieNettyServer.java | 8 ++- .../bookie/LedgerStorageCheckpointTest.java | 3 + .../test/BookKeeperClusterTestCase.java | 6 ++ .../bookkeeper/stats/ThreadRegistry.java | 69 ++++++++++++++++++- .../prometheus/DataSketchesOpStatsLogger.java | 5 ++ .../ThreadScopedDataSketchesStatsLogger.java | 26 ++++++- 11 files changed, 137 insertions(+), 10 deletions(-) diff --git a/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/testing/executors/MockExecutorController.java b/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/testing/executors/MockExecutorController.java index 4942e348bac..7299d1d9311 100644 --- a/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/testing/executors/MockExecutorController.java +++ b/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/testing/executors/MockExecutorController.java @@ -42,6 +42,7 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.common.concurrent.FutureUtils; +import org.apache.bookkeeper.stats.ThreadRegistry; import org.mockito.stubbing.Answer; /** @@ -172,6 +173,10 @@ private static Answer> answerDelay(MockExecutorController exe private static Answer> answerNow() { return invocationOnMock -> { + // this method executes everything in the caller thread + // this messes up assertions that verify + // that a thread is part of only a threadpool + ThreadRegistry.forceClearRegistrationForTests(Thread.currentThread().getId()); Runnable task = invocationOnMock.getArgument(0); task.run(); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java index 6aac4ecf68a..d0874ffa165 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java @@ -642,7 +642,7 @@ private void replay(Journal journal, JournalScanner scanner) throws IOException @Override public synchronized void start() { setDaemon(true); - ThreadRegistry.register("BookieThread", 0); + ThreadRegistry.register("BookieThread", true); if (LOG.isDebugEnabled()) { LOG.debug("I'm starting a bookie with journal directories {}", journalDirectories.stream().map(File::getName).collect(Collectors.joining(", "))); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java index 000a013881d..cc1b6f891b9 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java @@ -478,7 +478,7 @@ public ForceWriteThread(Thread threadToNotifyOnEx, @Override public void run() { LOG.info("ForceWrite Thread started"); - ThreadRegistry.register(super.getName(), 0); + ThreadRegistry.register(super.getName()); if (conf.isBusyWaitEnabled()) { try { @@ -939,7 +939,7 @@ public int getJournalQueueLength() { @Override public void run() { LOG.info("Starting journal on {}", journalDirectory); - ThreadRegistry.register(journalThreadName, 0); + ThreadRegistry.register(journalThreadName); if (conf.isBusyWaitEnabled()) { try { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java index b6a994e174f..7c5ad7c4991 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java @@ -82,7 +82,16 @@ public SyncThread(ServerConfiguration conf, this.checkpointSource = checkpointSource; this.executor = Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory(executorName)); this.syncExecutorTime = statsLogger.getThreadScopedCounter("sync-thread-time"); - this.executor.submit(() -> ThreadRegistry.register(executorName, 0)); + } + + @VisibleForTesting + static ScheduledExecutorService newExecutor() { + return Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory(executorName) { + @Override + protected Thread newThread(Runnable r, String name) { + return super.newThread(ThreadRegistry.registerThread(r, executorName), name); + } + }); } @Override diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java index f97559dde94..7f004c20e5a 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java @@ -117,7 +117,12 @@ public class SingleDirectoryDbLedgerStorage implements CompactableLedgerStorage private static String dbStoragerExecutorName = "db-storage"; private final ExecutorService executor = Executors.newSingleThreadExecutor( - new DefaultThreadFactory(dbStoragerExecutorName)); + new DefaultThreadFactory(dbStoragerExecutorName) { + @Override + protected Thread newThread(Runnable r, String name) { + return super.newThread(ThreadRegistry.registerThread(r, dbStoragerExecutorName), name); + } + }); // Executor used to for db index cleanup private final ScheduledExecutorService cleanupExecutor = Executors @@ -215,7 +220,6 @@ public SingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager le flushExecutorTime = ledgerIndexDirStatsLogger.getThreadScopedCounter("db-storage-thread-time"); executor.submit(() -> { - ThreadRegistry.register(dbStoragerExecutorName, 0); // ensure the metric gets registered on start-up as this thread only executes // when the write cache is full which may not happen or not for a long time flushExecutorTime.addLatency(0, TimeUnit.NANOSECONDS); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java index eeffcac0d97..a834208ce06 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java @@ -79,6 +79,7 @@ import org.apache.bookkeeper.net.BookieId; import org.apache.bookkeeper.net.BookieSocketAddress; import org.apache.bookkeeper.processor.RequestProcessor; +import org.apache.bookkeeper.stats.ThreadRegistry; import org.apache.bookkeeper.util.ByteBufList; import org.apache.bookkeeper.util.EventLoopUtil; import org.apache.zookeeper.KeeperException; @@ -122,7 +123,12 @@ class BookieNettyServer { if (!conf.isDisableServerSocketBind()) { this.eventLoopGroup = EventLoopUtil.getServerEventLoopGroup(conf, - new DefaultThreadFactory("bookie-io")); + new DefaultThreadFactory("bookie-io") { + @Override + protected Thread newThread(Runnable r, String name) { + return super.newThread(ThreadRegistry.registerThread(r, "bookie-id"), name); + } + }); this.acceptorGroup = EventLoopUtil.getServerAcceptorGroup(conf, new DefaultThreadFactory("bookie-acceptor")); allChannels = new CleanupChannelGroup(eventLoopGroup); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerStorageCheckpointTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerStorageCheckpointTest.java index 8a094fcd4f3..f3cb7a1660c 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerStorageCheckpointTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerStorageCheckpointTest.java @@ -53,6 +53,7 @@ import org.apache.bookkeeper.conf.TestBKConfiguration; import org.apache.bookkeeper.proto.BookieServer; import org.apache.bookkeeper.stats.NullStatsLogger; +import org.apache.bookkeeper.stats.ThreadRegistry; import org.apache.bookkeeper.test.ZooKeeperUtil; import org.apache.bookkeeper.util.IOUtils; import org.apache.bookkeeper.util.PortManager; @@ -95,6 +96,7 @@ public class LedgerStorageCheckpointTest { @Before public void setUp() throws Exception { + ThreadRegistry.clear(); LOG.info("Setting up test {}", getClass()); PowerMockito.mockStatic(Executors.class); @@ -116,6 +118,7 @@ public void setUp() throws Exception { @After public void tearDown() throws Exception { + ThreadRegistry.clear(); LOG.info("TearDown"); Exception tearDownException = null; // stop zookeeper service diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java index 76b21ecea2e..5e705f724ed 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java @@ -76,6 +76,7 @@ import org.apache.bookkeeper.replication.ReplicationWorker; import org.apache.bookkeeper.server.Main; import org.apache.bookkeeper.stats.StatsLogger; +import org.apache.bookkeeper.stats.ThreadRegistry; import org.apache.bookkeeper.util.DiskChecker; import org.apache.bookkeeper.util.PortManager; import org.apache.zookeeper.KeeperException; @@ -225,6 +226,11 @@ public void tearDown() throws Exception { } } + @After + public void clearMetricsThreadRegistry() throws Exception { + ThreadRegistry.clear(); + } + /** * Start zookeeper cluster. * diff --git a/stats/bookkeeper-stats-api/src/main/java/org/apache/bookkeeper/stats/ThreadRegistry.java b/stats/bookkeeper-stats-api/src/main/java/org/apache/bookkeeper/stats/ThreadRegistry.java index e890660ebb1..5bc7259a09f 100644 --- a/stats/bookkeeper-stats-api/src/main/java/org/apache/bookkeeper/stats/ThreadRegistry.java +++ b/stats/bookkeeper-stats-api/src/main/java/org/apache/bookkeeper/stats/ThreadRegistry.java @@ -18,6 +18,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * For mapping thread ids to thread pools and threads within those pools * or just for lone named threads. Thread scoped metrics add labels to @@ -25,7 +28,42 @@ * For flexibility, this registry is not based on TLS. */ public class ThreadRegistry { + private static Logger logger = LoggerFactory.getLogger(ThreadRegistry.class); private static ConcurrentMap threadPoolMap = new ConcurrentHashMap<>(); + private static ConcurrentMap threadPoolThreadMap = new ConcurrentHashMap<>(); + + /* + Threads can register themselves as their first act before carrying out + any work. By calling this method, the ThreadPoolThread is incremented + for the given thread pool. + */ + public static void register(String threadPool) { + register(threadPool, false); + } + + public static void register(String threadPool, boolean force) { + Integer threadPoolThread = threadPoolThreadMap.compute(threadPool, (k, v) -> v == null ? 0 : v + 1); + if (force) { + threadPoolMap.remove(Thread.currentThread().getId()); + } + register(threadPool, threadPoolThread, Thread.currentThread().getId()); + } + + /** + * In some tests we run in the same thread activities that should + * run in different threads from different thread-pools + * this would trigger assertions to fail. + * This is a convenience method to work around such cases. + * This method shouldn't be used in production code. + */ + public static void forceClearRegistrationForTests(long threadId) { + threadPoolMap.compute(threadId, (id, value) -> { + if (value != null) { + logger.info("Forcibly clearing registry entry {} for thread id {}", value, id); + } + return null; + }); + } /* Threads can register themselves as their first act before carrying out @@ -37,10 +75,22 @@ public static void register(String threadPool, int threadPoolThread) { /* Thread factories can register a thread by its id. + The assumption is that one thread belongs only to one threadpool. + The doesn't hold in tests, in which we use mock Executors that + run the code in the same thread as the caller */ public static void register(String threadPool, int threadPoolThread, long threadId) { ThreadPoolThread tpt = new ThreadPoolThread(threadPool, threadPoolThread, threadId); - threadPoolMap.put(threadId, tpt); + ThreadPoolThread previous = threadPoolMap.put(threadId, tpt); + if (previous != null) { + throw new IllegalStateException("Thread " + threadId + " was already registered in thread pool " + + previous.threadPool + " as thread " + previous.ordinal + " with threadId " + previous.threadId + + " trying to overwrite with " + threadPool + " and ordinal " + threadPoolThread); + } + } + + public static Runnable registerThread(Runnable runnable, String threadPool) { + return new RegisteredRunnable(threadPool, runnable); } /* @@ -48,6 +98,7 @@ public static void register(String threadPool, int threadPoolThread, long thread */ public static void clear() { threadPoolMap.clear(); + threadPoolThreadMap.clear(); } /* @@ -79,4 +130,20 @@ public int getOrdinal() { return ordinal; } } + + private static class RegisteredRunnable implements Runnable { + private final String threadPool; + private final Runnable runnable; + + public RegisteredRunnable(String threadPool, Runnable runnable) { + this.threadPool = threadPool; + this.runnable = runnable; + } + + @Override + public void run() { + register(threadPool); + runnable.run(); + } + } } diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/DataSketchesOpStatsLogger.java b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/DataSketchesOpStatsLogger.java index 015c3d3b247..057fed65c18 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/DataSketchesOpStatsLogger.java +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/DataSketchesOpStatsLogger.java @@ -212,4 +212,9 @@ protected void onRemoval(LocalData value) throws Exception { } }; } + + @Override + public String toString() { + return "DataSketchesOpStatsLogger{labels=" + labels + ", id=" + System.identityHashCode(this) + "}"; + } } diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/ThreadScopedDataSketchesStatsLogger.java b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/ThreadScopedDataSketchesStatsLogger.java index 53aca527928..cee895b0c54 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/ThreadScopedDataSketchesStatsLogger.java +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/ThreadScopedDataSketchesStatsLogger.java @@ -22,6 +22,8 @@ import org.apache.bookkeeper.stats.OpStatsData; import org.apache.bookkeeper.stats.OpStatsLogger; import org.apache.bookkeeper.stats.ThreadRegistry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * OpStatsLogger implementation that lazily registers OpStatsLoggers per thread @@ -29,6 +31,8 @@ */ public class ThreadScopedDataSketchesStatsLogger implements OpStatsLogger { + private static Logger logger = LoggerFactory.getLogger(ThreadScopedDataSketchesStatsLogger.class); + private ThreadLocal statsLoggers; private DataSketchesOpStatsLogger defaultStatsLogger; private Map originalLabels; @@ -95,8 +99,18 @@ private DataSketchesOpStatsLogger getStatsLogger() { if (!statsLogger.isThreadInitialized()) { ThreadRegistry.ThreadPoolThread tpt = ThreadRegistry.get(); if (tpt == null) { + logger.warn("Thread {} was not registered in the thread registry. Using default stats logger {}.", + Thread.currentThread(), defaultStatsLogger); statsLoggers.set(defaultStatsLogger); - provider.opStats.put(new ScopeContext(scopeContext.getScope(), originalLabels), defaultStatsLogger); + DataSketchesOpStatsLogger previous = provider.opStats + .put(new ScopeContext(scopeContext.getScope(), originalLabels), defaultStatsLogger); + // If we overwrite a logger, metrics will not be collected correctly + if (previous != null && previous != defaultStatsLogger) { + logger.error("Invalid state for thead " + Thread.currentThread() + ". Overwrote a stats logger." + + "New is {}, previous was {}", + defaultStatsLogger, previous); + throw new IllegalStateException("Invalid state. Overwrote a stats logger."); + } return defaultStatsLogger; } else { Map threadScopedlabels = new HashMap<>(originalLabels); @@ -104,7 +118,15 @@ private DataSketchesOpStatsLogger getStatsLogger() { threadScopedlabels.put("thread", String.valueOf(tpt.getOrdinal())); statsLogger.initializeThread(threadScopedlabels); - provider.opStats.put(new ScopeContext(scopeContext.getScope(), threadScopedlabels), statsLogger); + DataSketchesOpStatsLogger previous = provider.opStats + .put(new ScopeContext(scopeContext.getScope(), threadScopedlabels), statsLogger); + // If we overwrite a logger, metrics will not be collected correctly + if (previous != null && previous != statsLogger) { + logger.error("Invalid state for thead " + Thread.currentThread() + ". Overwrote a stats logger." + + "New is {}, previous was {}", + defaultStatsLogger, previous); + throw new IllegalStateException("Invalid state. Overwrote a stats logger."); + } } } From 504d20693a7dd90193f247405c74a3a9bd97b1d6 Mon Sep 17 00:00:00 2001 From: zhiheng123 <903292776@qq.com> Date: Tue, 28 May 2024 16:51:41 +0800 Subject: [PATCH 151/233] Gbuild: remove tests module from owasp check (#4391) (#4401) `integrate-tests` module depends on `arquillian-cube`, which are updates infrequently. Lastly release was in 2018, and it depends on a lot of dependency with CVEs, like `bcprov-jdk15on-1.64.jar` etc. But it still merging code frequently, my team will trying to ask for new release, I think we can remove tests module from owasp check for now. I run the check locally, fix 7 error, and no new errors generated compared to daily build result. ``` [ERROR] amqp-client-5.5.3.jar: CVE-2023-46120(7.5) [ERROR] jetcd-core-0.7.7.jar: CVE-2020-15113(7.1) [ERROR] jetcd-grpc-0.7.7.jar: CVE-2023-44487(7.5), CVE-2017-8359(9.8), CVE-2023-33953(7.5), CVE-2020-15113(7.1), CVE-2020-7768(9.8), CVE-2017-7861(9.8), CVE-2017-9431(9.8), CVE-2017-7860(9.8) [ERROR] okio-3.2.0.jar: CVE-2023-3635(7.5) ``` After refresh the suppression list(jetcd required jdk11, amqp is independent dependency from dropwizard metrics. There is only, I think we can fix it though upgrading OTEL version. ``` [ERROR] okio-3.2.0.jar: CVE-2023-3635(7.5) ``` ``` Error: amqp-client-5.5.3.jar: CVE-2023-46120(7.5) Error: bcprov-jdk15on-1.64.jar: CVE-2024-29857(7.5), CVE-2024-34447(7.699999809265137) Error: jetcd-core-0.7.7.jar: CVE-2020-151[13](https://github.com/apache/bookkeeper/actions/runs/9239112134/job/25417858696#step:5:14)(7.1) Error: jetcd-grpc-0.7.7.jar: CVE-2023-44487(7.5), CVE-2017-8359(9.8), CVE-2023-33953(7.5), CVE-2020-15113(7.1), CVE-2020-7768(9.8), CVE-2017-7861(9.8), CVE-2017-9431(9.8), CVE-2017-7860(9.8) Error: okio-3.2.0.jar: CVE-2023-3635(7.5) Error: plexus-cipher-2.0.jar: CVE-2022-4244(7.5) Error: plexus-classworlds-2.7.0.jar: CVE-2022-4244(7.5) Error: plexus-component-annotations-2.1.0.jar: CVE-2022-4244(7.5) Error: plexus-interpolation-1.26.jar: CVE-2022-4244(7.5) Error: plexus-sec-dispatcher-2.0.jar: CVE-2022-4244(7.5) Error: snakeyaml-1.19.jar: CVE-20[17](https://github.com/apache/bookkeeper/actions/runs/9239112134/job/25417858696#step:5:18)-18640(7.5), CVE-2022-25857(7.5) ``` Signed-off-by: ZhangJian He (cherry picked from commit f81dcea37d25a0da53206d533f11b75a8ea4982d) Conflicts: .github/workflows/bk-ci.yml .github/workflows/owasp-daily-build.yml src/owasp-dependency-check-suppressions.xml Co-authored-by: ZhangJian He --- .github/workflows/bk-ci.yml | 4 +- src/owasp-dependency-check-suppressions.xml | 235 ++++---------------- 2 files changed, 47 insertions(+), 192 deletions(-) diff --git a/.github/workflows/bk-ci.yml b/.github/workflows/bk-ci.yml index 035c2c5e27e..e04462f0f54 100644 --- a/.github/workflows/bk-ci.yml +++ b/.github/workflows/bk-ci.yml @@ -512,8 +512,8 @@ jobs: - name: run "clean install verify" to trigger dependency check # excluding dlfs because it includes hadoop lib with - # CVEs that we cannot patch up anyways - run: mvn -q -B -ntp clean install verify -Powasp-dependency-check -DskipTests -pl '!stream/distributedlog/io/dlfs' + # CVEs that we cannot patch up anyway + run: mvn -q -B -ntp clean install verify -Powasp-dependency-check -DskipTests -pl '!stream/distributedlog/io/dlfs,!tests' - name: Upload report uses: actions/upload-artifact@v4 diff --git a/src/owasp-dependency-check-suppressions.xml b/src/owasp-dependency-check-suppressions.xml index 6ffecf176c7..d49a9fae24c 100644 --- a/src/owasp-dependency-check-suppressions.xml +++ b/src/owasp-dependency-check-suppressions.xml @@ -20,227 +20,82 @@ --> - + - + - - c85851ca3ea8128d480d3f75c568a37e64e8a77b - CVE-2020-15106 - - - - c85851ca3ea8128d480d3f75c568a37e64e8a77b - CVE-2020-15112 - - - - c85851ca3ea8128d480d3f75c568a37e64e8a77b + CVE-2020-15113 + .*jetcd.*\.jar CVE-2020-15113 - - - - 6dac6efe035a2be9ba299fbf31be5f903401869f - CVE-2020-15106 - - 6dac6efe035a2be9ba299fbf31be5f903401869f - CVE-2020-15112 + file name: jetcd-grpc-0.7.7.jar + ]]> + 0fa26f72729edb39b506efa96e119f953f59c5a3 + CVE-2023-44487 - 6dac6efe035a2be9ba299fbf31be5f903401869f - CVE-2020-15113 + file name: jetcd-grpc-0.7.7.jar + ]]> + 0fa26f72729edb39b506efa96e119f953f59c5a3 + CVE-2017-8359 - - ^pkg:maven/org\.apache\.bookkeeper\.http/http\-server@.*$ - cpe:/a:apache:http_server + file name: jetcd-grpc-0.7.7.jar + ]]> + 0fa26f72729edb39b506efa96e119f953f59c5a3 + CVE-2023-33953 - ^pkg:maven/org\.apache\.bookkeeper\.http/vertx\-http\-server@.*$ - CVE-2009-1890 - - - CVE-2021-43045 affects only .NET distro, see https://github.com/apache/avro/pull/1357 - org\.apache\.avro:.* - CVE-2021-43045 + file name: jetcd-grpc-0.7.7.jar + ]]> + 0fa26f72729edb39b506efa96e119f953f59c5a3 + CVE-2020-15113 - CVE-2011-1797 FP, see https://github.com/jeremylong/DependencyCheck/issues/4154 - .*netty-tcnative-boringssl-static.*\.jar - CVE-2011-1797 - - - ^pkg:maven/io\.netty/netty\-tcnative\-classes@.*$ - cpe:/a:netty:netty + file name: jetcd-grpc-0.7.7.jar + ]]> + 0fa26f72729edb39b506efa96e119f953f59c5a3 + CVE-2020-7768 - - ^pkg:maven/org\.arquillian\.cube/arquillian\-cube\-docker@.*$ - cpe:/a:docker:docker + file name: jetcd-grpc-0.7.7.jar + ]]> + 0fa26f72729edb39b506efa96e119f953f59c5a3 + CVE-2017-7861 - ^pkg:maven/org\.arquillian\.cube/arquillian\-cube\-docker@.*$ - cpe:/a:redhat:docker + file name: jetcd-grpc-0.7.7.jar + ]]> + 0fa26f72729edb39b506efa96e119f953f59c5a3 + CVE-2017-9431 - - - - - e395c1d8a71557b7569cc6a83487b2e30e2e58fe - CVE-2021-28164 - - e395c1d8a71557b7569cc6a83487b2e30e2e58fe - CVE-2021-28165 + file name: jetcd-grpc-0.7.7.jar + ]]> + 0fa26f72729edb39b506efa96e119f953f59c5a3 + CVE-2017-7860 - - - e395c1d8a71557b7569cc6a83487b2e30e2e58fe - CVE-2021-29425 - - - - e395c1d8a71557b7569cc6a83487b2e30e2e58fe - CVE-2021-34429 - - - - 849e8ece2845cb0185d721233906d487a7f1e4cf - CVE-2021-28164 - - - - 849e8ece2845cb0185d721233906d487a7f1e4cf - CVE-2021-29425 - - - - 849e8ece2845cb0185d721233906d487a7f1e4cf - CVE-2021-34429 - - - - 6560f966bcf1aa78d27bcfa75fb6c4463a72c6c5 - CVE-2021-28164 - - - - 6560f966bcf1aa78d27bcfa75fb6c4463a72c6c5 - CVE-2021-28165 - - - - 6560f966bcf1aa78d27bcfa75fb6c4463a72c6c5 - CVE-2021-29425 - - - - 6560f966bcf1aa78d27bcfa75fb6c4463a72c6c5 - CVE-2021-34429 - - - - 9b78a289a3aa34eb47fac8c432f664fc140387df - CVE-2021-28165 - - + - - 1a754a5dd672218a2ac667d7ff2b28df7a5a240e - CVE-2022-25647 + CVE-2023-46120 + .*amqp-client.*\.jar + CVE-2023-46120 - + - 68d4180c51468ae8f45869f8f9c569092262fcca - CVE-2021-26291 - - - - fredsmith utils library is not used at all. CVE-2021-4277 is a false positive. - CVE-2021-4277 - - - - yaml_project is not used at all. Any CVEs reported for yaml_project are false positives. - cpe:/a:yaml_project:yaml - - - - - ^pkg:maven/org\.yaml/snakeyaml@.*$ - CVE-2022-1471 - - - - - 1416a607fae667c14e390b484e8d02b5824c0674 - CVE-2022-4065 - - \ No newline at end of file + 1416a607fae667c14e390b484e8d02b5824c0674 + CVE-2022-4065 + + From aff2fb66349fa96e8b23ec25908f681338cede30 Mon Sep 17 00:00:00 2001 From: zhiheng123 <903292776@qq.com> Date: Tue, 28 May 2024 19:51:43 +0800 Subject: [PATCH 152/233] [branch-4.16] cherry-pick #4157 #4204 #4224 #4265 update netty and vertx (#4398) * Upgrade Netty to 4.1.104.Final and io_uring to 0.0.24.Final (#4157) (cherry-pick from commit 6f5d75655066537ff51f6bb0b56831242ffe7363) * Use netty-bom for aligning netty library versions, add epoll for linux-aarch_64 (#4204) (cherry-pick from commit bb9da9b8e1a215f2e7f575af68e867868d2eec88) * Upgrade Netty to 4.1.107.Final and io_uring to 0.0.25.Final (#4224) Co-authored-by: ZhangJian He (cherry-pick from commit 298093553e2617dbd8c6d1dca241913854180bcf) Conflicts(mockito version): pom.xml * Upgrade vertx-core to 4.5.7 to address CVE-2024-1300 (#4265) - Upgrade vertx-core to 4.5.7 to address CVE-2024-1300 - Depends on merging #4264 before this PR (since Netty 4.1.108.Final is required for vertx-core 4.5.7) (cherry-pick from commit bee9b485e0b86f94fcdf5d96650162a9abbb25df) Conflicts(zookeeper version): pom.xml --------- Co-authored-by: Lari Hotari Co-authored-by: sullis --- .../src/main/resources/LICENSE-all.bin.txt | 119 +++++++++--------- .../src/main/resources/LICENSE-bkctl.bin.txt | 105 ++++++++-------- .../src/main/resources/LICENSE-server.bin.txt | 119 +++++++++--------- .../src/main/resources/NOTICE-all.bin.txt | 49 ++++---- .../src/main/resources/NOTICE-bkctl.bin.txt | 45 +++---- .../src/main/resources/NOTICE-server.bin.txt | 49 ++++---- bookkeeper-server/pom.xml | 7 +- pom.xml | 88 ++----------- 8 files changed, 263 insertions(+), 318 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index ab8ea8bad30..e18cef2e07e 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -217,31 +217,32 @@ 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.94.Final.jar [11] -- lib/io.netty-netty-codec-4.1.94.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.94.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.94.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.94.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.94.Final.jar [11] -- lib/io.netty-netty-common-4.1.94.Final.jar [11] -- lib/io.netty-netty-handler-4.1.94.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.94.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar [11] -- lib/io.netty-netty-transport-4.1.94.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.21.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar [11] +- 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-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] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] +- 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.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.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] @@ -250,11 +251,11 @@ Apache Software License, Version 2. - lib/io.prometheus-simpleclient_tracer_common-0.15.0.jar [12] - lib/io.prometheus-simpleclient_tracer_otel-0.15.0.jar [12] - lib/io.prometheus-simpleclient_tracer_otel_agent-0.15.0.jar [12] -- lib/io.vertx-vertx-auth-common-4.3.8.jar [13] -- lib/io.vertx-vertx-bridge-common-4.3.8.jar [14] -- lib/io.vertx-vertx-core-4.3.8.jar [15] -- lib/io.vertx-vertx-web-4.3.8.jar [16] -- lib/io.vertx-vertx-web-common-4.3.8.jar [16] +- lib/io.vertx-vertx-auth-common-4.5.7.jar [13] +- lib/io.vertx-vertx-bridge-common-4.5.7.jar [14] +- lib/io.vertx-vertx-core-4.5.7.jar [15] +- lib/io.vertx-vertx-web-4.5.7.jar [16] +- lib/io.vertx-vertx-web-common-4.5.7.jar [16] - lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [17] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [17] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17] @@ -331,7 +332,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.94.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.108.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 @@ -371,9 +372,9 @@ Apache Software License, Version 2. [53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.94.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.108.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.94.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.108.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: @@ -382,7 +383,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.94.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -390,7 +391,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.94.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -398,7 +399,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -406,7 +407,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -416,7 +417,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.108.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: @@ -424,7 +425,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.94.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.108.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: @@ -433,7 +434,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.94.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -441,7 +442,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.94.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -449,7 +450,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.108.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: @@ -457,7 +458,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.94.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -465,7 +466,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.94.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -473,7 +474,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.108.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: @@ -481,7 +482,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.94.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -489,7 +490,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.108.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: @@ -498,7 +499,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -506,7 +507,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -514,7 +515,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -522,7 +523,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -530,7 +531,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -538,7 +539,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -546,7 +547,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.108.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: @@ -554,7 +555,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.94.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.108.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: @@ -562,7 +563,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.94.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.108.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: @@ -570,7 +571,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.94.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.108.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: @@ -579,7 +580,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.94.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.108.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: @@ -587,7 +588,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.94.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.108.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 1e6c1b95188..f330c283f4b 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -217,29 +217,30 @@ 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.94.Final.jar [11] -- lib/io.netty-netty-codec-4.1.94.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.94.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.94.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.94.Final.jar [11] -- lib/io.netty-netty-common-4.1.94.Final.jar [11] -- lib/io.netty-netty-handler-4.1.94.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.94.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar [11] -- lib/io.netty-netty-transport-4.1.94.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.21.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar [11] +- 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-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] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] +- 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.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/org.apache.logging.log4j-log4j-api-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16] @@ -302,7 +303,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.94.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.108.Final [16] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.18.0 [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 @@ -333,9 +334,9 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.94.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.108.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.94.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.108.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: @@ -344,7 +345,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.94.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -352,7 +353,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.94.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -360,7 +361,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -368,7 +369,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -378,7 +379,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.108.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: @@ -386,7 +387,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.94.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.108.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: @@ -395,7 +396,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.94.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -403,7 +404,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.94.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -411,7 +412,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.108.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: @@ -419,7 +420,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.94.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -427,7 +428,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.94.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -435,7 +436,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.108.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: @@ -443,7 +444,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.94.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -451,7 +452,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.108.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: @@ -460,7 +461,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -468,7 +469,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -476,7 +477,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -484,7 +485,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -492,7 +493,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -500,7 +501,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -508,7 +509,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.108.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: @@ -516,7 +517,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.94.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.108.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: @@ -524,7 +525,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.94.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.108.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: @@ -532,7 +533,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.94.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.108.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: @@ -541,7 +542,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.94.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.108.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: @@ -549,7 +550,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.94.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.108.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 f6f8d9783d8..73cff40678c 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -217,31 +217,32 @@ 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.94.Final.jar [11] -- lib/io.netty-netty-codec-4.1.94.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.94.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.94.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.94.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.94.Final.jar [11] -- lib/io.netty-netty-common-4.1.94.Final.jar [11] -- lib/io.netty-netty-handler-4.1.94.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.94.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar [11] -- lib/io.netty-netty-transport-4.1.94.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar [11] -- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.21.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar [11] +- 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-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] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] +- 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.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.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] @@ -250,11 +251,11 @@ Apache Software License, Version 2. - lib/io.prometheus-simpleclient_tracer_common-0.15.0.jar [12] - lib/io.prometheus-simpleclient_tracer_otel-0.15.0.jar [12] - lib/io.prometheus-simpleclient_tracer_otel_agent-0.15.0.jar [12] -- lib/io.vertx-vertx-auth-common-4.3.8.jar [13] -- lib/io.vertx-vertx-bridge-common-4.3.8.jar [14] -- lib/io.vertx-vertx-core-4.3.8.jar [15] -- lib/io.vertx-vertx-web-4.3.8.jar [16] -- lib/io.vertx-vertx-web-common-4.3.8.jar [16] +- lib/io.vertx-vertx-auth-common-4.5.7.jar [13] +- lib/io.vertx-vertx-bridge-common-4.5.7.jar [14] +- lib/io.vertx-vertx-core-4.5.7.jar [15] +- lib/io.vertx-vertx-web-4.5.7.jar [16] +- lib/io.vertx-vertx-web-common-4.5.7.jar [16] - lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [17] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [17] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17] @@ -327,7 +328,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.94.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.108.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 @@ -366,9 +367,9 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.94.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.108.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.94.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.108.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: @@ -377,7 +378,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.94.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -385,7 +386,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.94.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -393,7 +394,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -401,7 +402,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -411,7 +412,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.108.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: @@ -419,7 +420,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.94.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.108.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: @@ -428,7 +429,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.94.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -436,7 +437,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.94.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -444,7 +445,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.108.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: @@ -452,7 +453,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.94.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -460,7 +461,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.94.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -468,7 +469,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.108.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: @@ -476,7 +477,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.94.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.108.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -484,7 +485,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.108.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: @@ -493,7 +494,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -501,7 +502,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -509,7 +510,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -517,7 +518,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -525,7 +526,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -533,7 +534,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.94.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.108.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -541,7 +542,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.94.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.108.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: @@ -549,7 +550,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.94.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.108.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: @@ -557,7 +558,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.94.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.108.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: @@ -565,7 +566,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.94.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.108.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: @@ -574,7 +575,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.94.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.108.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: @@ -582,7 +583,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.94.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.108.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 6019c6e90a3..99d54b14c5d 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -23,30 +23,31 @@ LongAdder), which was released with the following comments: http://creativecommons.org/publicdomain/zero/1.0/ ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.94.Final.jar -- lib/io.netty-netty-codec-4.1.94.Final.jar -- lib/io.netty-netty-codec-dns-4.1.94.Final.jar -- lib/io.netty-netty-codec-http-4.1.94.Final.jar -- lib/io.netty-netty-codec-http2-4.1.94.Final.jar -- lib/io.netty-netty-codec-socks-4.1.94.Final.jar -- lib/io.netty-netty-common-4.1.94.Final.jar -- lib/io.netty-netty-handler-4.1.94.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar -- lib/io.netty-netty-resolver-4.1.94.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar -- lib/io.netty-netty-transport-4.1.94.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar +- 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-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] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] +- 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.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 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 99c563a0ae8..e090b812e2e 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -5,28 +5,29 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.94.Final.jar -- lib/io.netty-netty-codec-4.1.94.Final.jar -- lib/io.netty-netty-codec-http-4.1.94.Final.jar -- lib/io.netty-netty-codec-http2-4.1.94.Final.jar -- lib/io.netty-netty-codec-socks-4.1.94.Final.jar -- lib/io.netty-netty-common-4.1.94.Final.jar -- lib/io.netty-netty-handler-4.1.94.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar -- lib/io.netty-netty-resolver-4.1.94.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar -- lib/io.netty-netty-transport-4.1.94.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar +- 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-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] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] +- 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.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 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 848bd55ef29..0ae5fc921f5 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -5,30 +5,31 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.94.Final.jar -- lib/io.netty-netty-codec-4.1.94.Final.jar -- lib/io.netty-netty-codec-dns-4.1.94.Final.jar -- lib/io.netty-netty-codec-http-4.1.94.Final.jar -- lib/io.netty-netty-codec-http2-4.1.94.Final.jar -- lib/io.netty-netty-codec-socks-4.1.94.Final.jar -- lib/io.netty-netty-common-4.1.94.Final.jar -- lib/io.netty-netty-handler-4.1.94.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar -- lib/io.netty-netty-resolver-4.1.94.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar -- lib/io.netty-netty-transport-4.1.94.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar -- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar +- 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-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] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] +- 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.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 The Netty Project diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index e1d5e7f7383..48058ac546f 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -82,7 +82,12 @@ io.netty netty-transport-native-epoll linux-x86_64 - + + + io.netty + netty-transport-native-epoll + linux-aarch_64 + io.netty netty-tcnative-boringssl-static diff --git a/pom.xml b/pom.xml index 680d711b6c5..ded193856f7 100644 --- a/pom.xml +++ b/pom.xml @@ -154,9 +154,8 @@ 2.18.0 1.3.0 3.12.4 - 4.1.94.Final - 2.0.61.Final - 0.0.21.Final + 4.1.108.Final + 0.0.25.Final 9.1.3 2.0.9 0.15.0 @@ -174,7 +173,7 @@ 4.6.0 1.3.2 1.19.4 - 4.3.8 + 4.5.7 3.8.3 1.1.10.5 2.1.2 @@ -375,82 +374,12 @@ - io.netty - netty-common + netty-bom ${netty.version} - - - io.netty - netty-buffer - ${netty.version} - - - io.netty - netty-transport - ${netty.version} - - - io.netty - netty-handler - ${netty.version} - - - io.netty - netty-transport-native-epoll - ${netty.version} - - - io.netty - netty-transport-native-epoll - ${netty.version} - linux-x86_64 - - - io.netty - netty-codec-dns - ${netty.version} - - - io.netty - netty-codec-http - ${netty.version} - - - io.netty - netty-codec-http2 - ${netty.version} - - - io.netty - netty-codec-socks - ${netty.version} - - - io.netty - netty-handler-proxy - ${netty.version} - - - io.netty - netty-resolver - ${netty.version} - - - io.netty - netty-resolver-dns - ${netty.version} - - - io.netty - netty-transport-native-unix-common - ${netty.version} - - - io.netty - netty-tcnative-boringssl-static - ${netty-boringssl.version} + pom + import io.netty.incubator @@ -469,6 +398,11 @@ ${netty-iouring.version} linux-aarch_64 + + io.netty.incubator + netty-incubator-transport-classes-io_uring + ${netty-iouring.version} + From 6f30f00067f92ab259b07bdb63bc61ff7c381e3a Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 29 May 2024 09:49:18 +0300 Subject: [PATCH 153/233] Fix TLS stability issues with V2 protocol that caused data corruption (#4404) * Fix TLS stability issues with V2 protocol that caused data corruption - add the TLS handler after the FlushConsolidationHandler - This makes TLS connections from Pulsar Broker to Bookkeeper stable when bookkeeperUseV2WireProtocol=true is used - Fix test TestTLS for V2 - Fix inconsistency in client configuration in BookKeeperClusterTestCase (cherry picked from commit 5f73147a2803a5147d9d9ba2d28eaa6c79c998a3) --- .../bookkeeper/proto/BookieNettyServer.java | 3 ++- .../bookkeeper/proto/BookieRequestProcessor.java | 9 ++++++++- .../bookkeeper/proto/PerChannelBookieClient.java | 16 ++++++++++++---- .../test/BookKeeperClusterTestCase.java | 2 +- .../java/org/apache/bookkeeper/tls/TestTLS.java | 13 ++++--------- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java index a834208ce06..a7e919c826c 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java @@ -92,6 +92,7 @@ class BookieNettyServer { private static final Logger LOG = LoggerFactory.getLogger(BookieNettyServer.class); + public static final String CONSOLIDATION_HANDLER_NAME = "consolidation"; final int maxFrameSize; final ServerConfiguration conf; @@ -344,7 +345,7 @@ protected void initChannel(SocketChannel ch) throws Exception { new BookieSideConnectionPeerContextHandler(); ChannelPipeline pipeline = ch.pipeline(); - pipeline.addLast("consolidation", new FlushConsolidationHandler(1024, true)); + pipeline.addLast(CONSOLIDATION_HANDLER_NAME, new FlushConsolidationHandler(1024, true)); pipeline.addLast("bytebufList", ByteBufList.ENCODER); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java index a77b3d7bb5b..0d9d61f634f 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java @@ -66,6 +66,7 @@ public class BookieRequestProcessor implements RequestProcessor { private static final Logger LOG = LoggerFactory.getLogger(BookieRequestProcessor.class); + public static final String TLS_HANDLER_NAME = "tls"; /** * The server configuration. We use this for getting the number of add and read @@ -576,9 +577,15 @@ private void processStartTLSRequestV3(final BookkeeperProtocol.Request r, response.setStatus(BookkeeperProtocol.StatusCode.EBADREQ); writeAndFlush(c, response.build()); } else { + LOG.info("Starting TLS handshake with client on channel {}", c); // there is no need to execute in a different thread as this operation is light SslHandler sslHandler = shFactory.newTLSHandler(); - c.pipeline().addFirst("tls", sslHandler); + if (c.pipeline().names().contains(BookieNettyServer.CONSOLIDATION_HANDLER_NAME)) { + c.pipeline().addAfter(BookieNettyServer.CONSOLIDATION_HANDLER_NAME, TLS_HANDLER_NAME, sslHandler); + } else { + // local transport doesn't contain FlushConsolidationHandler + c.pipeline().addFirst(TLS_HANDLER_NAME, sslHandler); + } response.setStatus(BookkeeperProtocol.StatusCode.EOK); BookkeeperProtocol.StartTLSResponse.Builder builder = BookkeeperProtocol.StartTLSResponse.newBuilder(); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java index ca1448c7682..149f97fc28b 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java @@ -174,6 +174,7 @@ public class PerChannelBookieClient extends ChannelInboundHandlerAdapter { BKException.Code.WriteOnReadOnlyBookieException)); private static final int DEFAULT_HIGH_PRIORITY_VALUE = 100; // We may add finer grained priority later. private static final AtomicLong txnIdGenerator = new AtomicLong(0); + static final String CONSOLIDATION_HANDLER_NAME = "consolidation"; final BookieId bookieId; final BookieAddressResolver bookieAddressResolver; @@ -594,7 +595,7 @@ protected ChannelFuture connect() { @Override protected void initChannel(Channel ch) throws Exception { ChannelPipeline pipeline = ch.pipeline(); - pipeline.addLast("consolidation", new FlushConsolidationHandler(1024, true)); + pipeline.addLast(CONSOLIDATION_HANDLER_NAME, new FlushConsolidationHandler(1024, true)); pipeline.addLast("bytebufList", ByteBufList.ENCODER); pipeline.addLast("lengthbasedframedecoder", new LengthFieldBasedFrameDecoder(maxFrameSize, 0, 4, 0, 4)); @@ -1522,9 +1523,16 @@ void initTLSHandshake() { } else { throw new RuntimeException("Unexpected socket address type"); } - SslHandler handler = parentObj.shFactory.newTLSHandler(address.getHostName(), address.getPort()); - channel.pipeline().addFirst(parentObj.shFactory.getHandlerName(), handler); - handler.handshakeFuture().addListener(new GenericFutureListener>() { + LOG.info("Starting TLS handshake with {}:{}", address.getHostString(), address.getPort()); + SslHandler sslHandler = parentObj.shFactory.newTLSHandler(address.getHostName(), address.getPort()); + String sslHandlerName = parentObj.shFactory.getHandlerName(); + if (channel.pipeline().names().contains(CONSOLIDATION_HANDLER_NAME)) { + channel.pipeline().addAfter(CONSOLIDATION_HANDLER_NAME, sslHandlerName, sslHandler); + } else { + // local transport doesn't contain FlushConsolidationHandler + channel.pipeline().addFirst(sslHandlerName, sslHandler); + } + sslHandler.handshakeFuture().addListener(new GenericFutureListener>() { @Override public void operationComplete(Future future) throws Exception { int rc; diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java index 5e705f724ed..f6acefb5874 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java @@ -301,7 +301,7 @@ protected ServerConfiguration newServerConfiguration() throws Exception { } protected ClientConfiguration newClientConfiguration() { - return new ClientConfiguration(baseConf); + return new ClientConfiguration(baseClientConf); } protected ServerConfiguration newServerConfiguration(int port, File journalDir, File[] ledgerDirs) { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java index b5719deea0d..f4d5d941978 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java @@ -349,11 +349,6 @@ public void testConnectToTLSClusterTLSClient() throws Exception { */ @Test public void testConnectToLocalTLSClusterTLSClient() throws Exception { - // skip test - if (useV2Protocol) { - return; - } - restartBookies(c -> { c.setDisableServerSocketBind(true); c.setEnableLocalTransport(true); @@ -621,10 +616,6 @@ public void testBookieAuthPluginRequireClientTLSAuthentication() throws Exceptio */ @Test public void testBookieAuthPluginRequireClientTLSAuthenticationLocal() throws Exception { - if (useV2Protocol) { - return; - } - restartBookies(c -> { c.setBookieAuthProviderFactoryClass( AllowOnlyClientsWithX509Certificates.class.getName()); @@ -755,6 +746,10 @@ public void testBookieAuthPluginDenyAccessToClientWithoutTLS() throws Exception testClient(clientConf, numBookies); fail("Shouldn't be able to connect"); } catch (BKException.BKUnauthorizedAccessException authFailed) { + } catch (BKException.BKNotEnoughBookiesException notEnoughBookiesException) { + if (!useV2Protocol) { + fail("Unexpected exception occurred."); + } } assertFalse(secureBookieSideChannel); From 5cbf981c34611071bb04fa7e84b4183fafec4592 Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Thu, 30 May 2024 14:17:49 +0800 Subject: [PATCH 154/233] Correct Configuration Error in OWASP Dependency Check Plugin Setup Signed-off-by: ZhangJian He --- pom.xml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index ded193856f7..26b10552d99 100644 --- a/pom.xml +++ b/pom.xml @@ -192,7 +192,7 @@ 3.3.1 3.12.1 3.2.5 - 8.0.2 + 9.2.0 3.10.1 1.4.1.Final 0.6.1 @@ -1156,6 +1156,7 @@ org.owasp dependency-check-maven ${dependency-check-maven.version} + false src/owasp-dependency-check-suppressions.xml @@ -1185,22 +1186,6 @@ - - - - org.owasp - dependency-check-maven - ${dependency-check-maven.version} - - - - aggregate - - - - - - delombok From f190b6af60c33e209e2f369cf9c7e9d448e6d4b2 Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Thu, 16 May 2024 09:56:41 +0800 Subject: [PATCH 155/233] Bump jetcd from 0.5.0 to 0.7.7 (#3849) Signed-off-by: ZhangJian He (cherry picked from commit be65a8abc9d7d0c8e64f5d5e16f0a75f1b6b94a3) --- .../main/java/io/etcd/jetcd/{ => impl}/EtcdClientUtils.java | 2 +- .../io/etcd/jetcd/{ => impl}/EtcdConnectionManager.java | 3 ++- .../main/java/io/etcd/jetcd/{ => impl}/package-info.java | 2 +- .../apache/bookkeeper/metadata/etcd/EtcdWatchClient.java | 2 +- pom.xml | 2 +- src/owasp-dependency-check-suppressions.xml | 6 ------ 6 files changed, 6 insertions(+), 11 deletions(-) rename metadata-drivers/etcd/src/main/java/io/etcd/jetcd/{ => impl}/EtcdClientUtils.java (97%) rename metadata-drivers/etcd/src/main/java/io/etcd/jetcd/{ => impl}/EtcdConnectionManager.java (97%) rename metadata-drivers/etcd/src/main/java/io/etcd/jetcd/{ => impl}/package-info.java (96%) diff --git a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdClientUtils.java b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdClientUtils.java similarity index 97% rename from metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdClientUtils.java rename to metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdClientUtils.java index f696e19cc3f..4c74cc9c4f1 100644 --- a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdClientUtils.java +++ b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdClientUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.etcd.jetcd; +package io.etcd.jetcd.impl; import java.lang.reflect.Field; diff --git a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdConnectionManager.java b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdConnectionManager.java similarity index 97% rename from metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdConnectionManager.java rename to metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdConnectionManager.java index 52b5199f430..db090135c90 100644 --- a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdConnectionManager.java +++ b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdConnectionManager.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package io.etcd.jetcd; +package io.etcd.jetcd.impl; +import io.etcd.jetcd.Client; import io.etcd.jetcd.api.WatchGrpc; import lombok.extern.slf4j.Slf4j; diff --git a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/package-info.java b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/package-info.java similarity index 96% rename from metadata-drivers/etcd/src/main/java/io/etcd/jetcd/package-info.java rename to metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/package-info.java index 77ce69ff430..7cc4a43579a 100644 --- a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/package-info.java +++ b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/package-info.java @@ -19,4 +19,4 @@ /** * Etcd client changes for bookkeeper metadata driver. */ -package io.etcd.jetcd; \ No newline at end of file +package io.etcd.jetcd.impl; diff --git a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java index fcb72126e24..6a046ba4e2f 100644 --- a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java +++ b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java @@ -27,7 +27,6 @@ import com.google.protobuf.UnsafeByteOperations; import io.etcd.jetcd.ByteSequence; import io.etcd.jetcd.Client; -import io.etcd.jetcd.EtcdConnectionManager; import io.etcd.jetcd.api.WatchCancelRequest; import io.etcd.jetcd.api.WatchCreateRequest; import io.etcd.jetcd.api.WatchGrpc; @@ -36,6 +35,7 @@ import io.etcd.jetcd.common.exception.ErrorCode; import io.etcd.jetcd.common.exception.EtcdException; import io.etcd.jetcd.common.exception.EtcdExceptionFactory; +import io.etcd.jetcd.impl.EtcdConnectionManager; import io.etcd.jetcd.options.WatchOption; import io.etcd.jetcd.watch.WatchResponseWithError; import io.grpc.Status; diff --git a/pom.xml b/pom.xml index 26b10552d99..0026c305717 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ 1.0.2.4 5.1.0 4.1.12.1 - 0.5.11 + 0.7.7 2.8.0 3.0.2 2.9.0 diff --git a/src/owasp-dependency-check-suppressions.xml b/src/owasp-dependency-check-suppressions.xml index d49a9fae24c..0e1564cfae7 100644 --- a/src/owasp-dependency-check-suppressions.xml +++ b/src/owasp-dependency-check-suppressions.xml @@ -21,13 +21,7 @@ --> - - - CVE-2020-15113 - .*jetcd.*\.jar - CVE-2020-15113 - Date: Wed, 12 Jun 2024 15:06:32 +0800 Subject: [PATCH 156/233] test: update etcd build image version (#4429) Signed-off-by: ZhangJian He --- .test-infra/scripts/pre-docker-tests.sh | 2 +- .../apache/bookkeeper/metadata/etcd/testing/EtcdContainer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.test-infra/scripts/pre-docker-tests.sh b/.test-infra/scripts/pre-docker-tests.sh index d2c812ab7a3..911ab1958bd 100755 --- a/.test-infra/scripts/pre-docker-tests.sh +++ b/.test-infra/scripts/pre-docker-tests.sh @@ -30,4 +30,4 @@ docker system prune -f # clean up any dangling networks from previous runs docker network prune -f --filter "until=12h" docker system events > docker.debug-info & echo $! > docker-log.pid -docker pull quay.io/coreos/etcd:v3.3 +docker pull quay.io/coreos/etcd:v3.5.14 diff --git a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/testing/EtcdContainer.java b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/testing/EtcdContainer.java index 0178e4d2ab5..b0a80942074 100644 --- a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/testing/EtcdContainer.java +++ b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/testing/EtcdContainer.java @@ -54,7 +54,7 @@ public void onNext(Frame frame) { private final String clusterName; public EtcdContainer(String clusterName) { - super("quay.io/coreos/etcd:v3.3"); + super("quay.io/coreos/etcd:v3.5.14"); this.clusterName = clusterName; } From 7efcbd2b4a01f9287a0b0b32948f1ec3a433d9f8 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 13 Jun 2024 10:23:50 +0300 Subject: [PATCH 157/233] Upgrade to Netty 4.1.111.Final and switch to use grpc-netty-shaded (#4426) [Netty 4.1.111.Final](https://netty.io/news/2024/06/11/4-1-111-Final.html) contains important fixes: - https://github.com/netty/netty/pull/14086 - https://github.com/netty/netty/pull/14093 On the Pulsar side these address Broker stability when TLS with Bookkeeper V2 protocol is used between Broker and Bookies. The Bookkeeper client didn't contain a workaround for the Netty SslHandler "feature" like Pulsar did. That's why Bookkeeper client was impacted. Netty 4.1.111.Final will address those stability issues with the Bookkeeper client when using V2 protocol over TLS. - Upgrade Netty to 4.1.111.Final - Switch to use grpc-netty-shaded instead of grpc-netty - grpc-java is not compatible with Netty 4.1.111.Final. [grpc-java supports only specific Netty versions](https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty). The solution is to use grpc-netty-shaded instead of grpc-netty dependency. - Add module to shade jetcd-core partially so that it can work with grpc-netty-shaded. - jetcd-core library and it's transient dependency vertx-grpc has a direct dependency on grpc-netty and it doesn't work with grpc-netty-shaded without this solution. - this solution avoids the need to shade grpc libraries completely which would cause a lot of duplication and increase build times. (cherry picked from commit a95f6982c25bf1114c1a2262067e45b45f6d7102) --- .../src/main/resources/LICENSE-all.bin.txt | 92 ++++---- .../src/main/resources/LICENSE-bkctl.bin.txt | 84 ++++---- .../src/main/resources/LICENSE-server.bin.txt | 92 ++++---- .../src/main/resources/NOTICE-all.bin.txt | 34 +-- .../src/main/resources/NOTICE-bkctl.bin.txt | 26 +-- .../src/main/resources/NOTICE-server.bin.txt | 34 +-- metadata-drivers/etcd/pom.xml | 37 ++-- metadata-drivers/jetcd-core-shaded/pom.xml | 196 ++++++++++++++++++ metadata-drivers/pom.xml | 1 + pom.xml | 58 +++++- .../grpc/resolver/GrpcChannelsTest.java | 2 +- .../clients/utils/GrpcChannelsTest.java | 2 +- stream/common/pom.xml | 27 +-- stream/tests-common/pom.xml | 30 +-- 14 files changed, 457 insertions(+), 258 deletions(-) create mode 100644 metadata-drivers/jetcd-core-shaded/pom.xml diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index e18cef2e07e..52ea9954fe1 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] @@ -288,9 +288,9 @@ Apache Software License, Version 2. - lib/io.grpc-grpc-context-1.54.1.jar [33] - lib/io.grpc-grpc-core-1.54.1.jar [33] - lib/io.grpc-grpc-grpclb-1.54.1.jar [33] -- lib/io.grpc-grpc-netty-1.54.1.jar [33] - lib/io.grpc-grpc-protobuf-1.54.1.jar [33] - lib/io.grpc-grpc-protobuf-lite-1.54.1.jar [33] +- lib/io.grpc-grpc-netty-shaded-1.54.1.jar [33] - lib/io.grpc-grpc-services-1.54.1.jar [33] - lib/io.grpc-grpc-stub-1.54.1.jar [33] - lib/io.grpc-grpc-testing-1.54.1.jar [33] @@ -332,7 +332,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 @@ -372,9 +372,9 @@ Apache Software License, Version 2. [53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -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: @@ -383,7 +383,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: @@ -391,7 +391,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: @@ -399,7 +399,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: @@ -407,7 +407,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: @@ -417,7 +417,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: @@ -425,7 +425,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: @@ -434,7 +434,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: @@ -442,7 +442,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: @@ -450,7 +450,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: @@ -458,7 +458,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: @@ -466,7 +466,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: @@ -474,7 +474,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: @@ -482,7 +482,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: @@ -490,7 +490,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: @@ -499,7 +499,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: @@ -507,7 +507,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: @@ -515,7 +515,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: @@ -523,7 +523,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: @@ -531,7 +531,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: @@ -539,7 +539,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: @@ -547,7 +547,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: @@ -555,7 +555,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: @@ -563,7 +563,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: @@ -571,7 +571,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: @@ -580,7 +580,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: @@ -588,7 +588,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 f330c283f4b..dfd2fea4f0c 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -217,15 +217,11 @@ 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-common-4.1.111.Final.jar [11] +- lib/io.netty-netty-handler-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 +229,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.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16] @@ -263,9 +259,9 @@ Apache Software License, Version 2. - lib/io.grpc-grpc-context-1.54.1.jar [32] - lib/io.grpc-grpc-core-1.54.1.jar [32] - lib/io.grpc-grpc-grpclb-1.54.1.jar [32] -- lib/io.grpc-grpc-netty-1.54.1.jar [32] - lib/io.grpc-grpc-protobuf-1.54.1.jar [32] - lib/io.grpc-grpc-protobuf-lite-1.54.1.jar [32] +- lib/io.grpc-grpc-netty-shaded-1.54.1.jar [32] - lib/io.grpc-grpc-services-1.54.1.jar [32] - lib/io.grpc-grpc-stub-1.54.1.jar [32] - lib/io.grpc-grpc-testing-1.54.1.jar [32] @@ -303,7 +299,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.18.0 [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 @@ -334,9 +330,9 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -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: @@ -345,7 +341,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: @@ -353,7 +349,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: @@ -361,7 +357,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: @@ -369,7 +365,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: @@ -379,7 +375,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: @@ -387,7 +383,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: @@ -396,7 +392,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: @@ -404,7 +400,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: @@ -412,7 +408,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: @@ -420,7 +416,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: @@ -428,7 +424,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: @@ -436,7 +432,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: @@ -444,7 +440,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: @@ -452,7 +448,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: @@ -461,7 +457,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: @@ -469,7 +465,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: @@ -477,7 +473,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: @@ -485,7 +481,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: @@ -493,7 +489,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: @@ -501,7 +497,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: @@ -509,7 +505,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: @@ -517,7 +513,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: @@ -525,7 +521,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: @@ -533,7 +529,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: @@ -542,7 +538,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: @@ -550,7 +546,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 73cff40678c..fea213f758c 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] @@ -288,9 +288,9 @@ Apache Software License, Version 2. - lib/io.grpc-grpc-context-1.54.1.jar [33] - lib/io.grpc-grpc-core-1.54.1.jar [33] - lib/io.grpc-grpc-grpclb-1.54.1.jar [33] -- lib/io.grpc-grpc-netty-1.54.1.jar [33] - lib/io.grpc-grpc-protobuf-1.54.1.jar [33] - lib/io.grpc-grpc-protobuf-lite-1.54.1.jar [33] +- lib/io.grpc-grpc-netty-shaded-1.54.1.jar [33] - lib/io.grpc-grpc-services-1.54.1.jar [33] - lib/io.grpc-grpc-stub-1.54.1.jar [33] - lib/io.grpc-grpc-testing-1.54.1.jar [33] @@ -328,7 +328,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 @@ -367,9 +367,9 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -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: @@ -378,7 +378,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: @@ -386,7 +386,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: @@ -394,7 +394,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: @@ -402,7 +402,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: @@ -412,7 +412,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: @@ -420,7 +420,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: @@ -429,7 +429,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: @@ -437,7 +437,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: @@ -445,7 +445,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: @@ -453,7 +453,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: @@ -461,7 +461,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: @@ -469,7 +469,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: @@ -477,7 +477,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: @@ -485,7 +485,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: @@ -494,7 +494,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: @@ -502,7 +502,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: @@ -510,7 +510,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: @@ -518,7 +518,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: @@ -526,7 +526,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: @@ -534,7 +534,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: @@ -542,7 +542,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: @@ -550,7 +550,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: @@ -558,7 +558,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: @@ -566,7 +566,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: @@ -575,7 +575,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: @@ -583,7 +583,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 99d54b14c5d..af368d1d948 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 @@ -139,7 +139,7 @@ Copyright 2010 Cedric Beust cedric@beust.com - lib/io.grpc-grpc-auth-1.54.1.jar - lib/io.grpc-grpc-context-1.54.1.jar - lib/io.grpc-grpc-core-1.54.1.jar -- lib/io.grpc-grpc-netty-1.54.1.jar +- lib/io.grpc-grpc-netty-shaded-1.54.1.jar - lib/io.grpc-grpc-protobuf-1.54.1.jar - lib/io.grpc-grpc-protobuf-lite-1.54.1.jar - lib/io.grpc-grpc-stub-1.54.1.jar diff --git a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt index e090b812e2e..88eaaf8a5d0 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -5,15 +5,11 @@ 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-common-4.1.111.Final.jar +- lib/io.netty-netty-handler-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 +17,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 @@ -61,7 +57,7 @@ Copyright 2010 Cedric Beust cedric@beust.com - lib/io.grpc-grpc-auth-1.54.1.jar - lib/io.grpc-grpc-context-1.54.1.jar - lib/io.grpc-grpc-core-1.54.1.jar -- lib/io.grpc-grpc-netty-1.54.1.jar +- lib/io.grpc-grpc-netty-shaded-1.54.1.jar - lib/io.grpc-grpc-protobuf-1.54.1.jar - lib/io.grpc-grpc-protobuf-lite-1.54.1.jar - lib/io.grpc-grpc-stub-1.54.1.jar diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt index 0ae5fc921f5..2873f19dedb 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 @@ -121,7 +121,7 @@ Copyright 2010 Cedric Beust cedric@beust.com - lib/io.grpc-grpc-auth-1.54.1.jar - lib/io.grpc-grpc-context-1.54.1.jar - lib/io.grpc-grpc-core-1.54.1.jar -- lib/io.grpc-grpc-netty-1.54.1.jar +- lib/io.grpc-grpc-netty-shaded-1.54.1.jar - lib/io.grpc-grpc-protobuf-1.54.1.jar - lib/io.grpc-grpc-protobuf-lite-1.54.1.jar - lib/io.grpc-grpc-stub-1.54.1.jar diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 08be63c4678..02eb74201e6 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -34,12 +34,17 @@ - io.etcd - jetcd-core - ${etcd.version} + org.apache.bookkeeper.metadata.drivers + jetcd-core-shaded + ${project.version} + shaded - io.grpc + io.etcd + * + + + io.vertx * @@ -48,27 +53,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-shaded + org.arquillian.cube arquillian-cube-docker diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml new file mode 100644 index 00000000000..561927118b9 --- /dev/null +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -0,0 +1,196 @@ + + + + 4.0.0 + + org.apache.bookkeeper.metadata.drivers + metadata-drivers-parent + 4.16.6-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.netty + * + + + + + io.grpc + grpc-netty-shaded + + + + dev.failsafe + failsafe + + + io.grpc + grpc-protobuf + + + io.grpc + grpc-stub + + + io.grpc + grpc-grpclb + + + io.grpc + grpc-util + + + + + + 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 + + + + + *:* + + 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 + 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 + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + unpack-shaded-jar + package + + run + + + + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + + true + + + + + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index d80bfc0e56e..f22a44a905b 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 0026c305717..eceb6b74c53 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,8 @@ 1.0.2.4 5.1.0 4.1.12.1 - 0.7.7 + 0.7.7 + 3.2.2 2.8.0 3.0.2 2.9.0 @@ -154,7 +155,7 @@ 2.18.0 1.3.0 3.12.4 - 4.1.108.Final + 4.1.111.Final 0.0.25.Final 9.1.3 2.0.9 @@ -198,6 +199,7 @@ 0.6.1 9.3 4.7.3.2 + 3.6.0 1 4.0.0 3.0.1 @@ -412,6 +414,56 @@ pom import + + + io.grpc + grpc-all + ${grpc.version} + + + io.grpc + grpc-testing + + + io.grpc + grpc-netty + + + io.grpc + grpc-okhttp + + + com.squareup.okhttp + okhttp + + + com.squareup.okio + okio + + + io.grpc + grpc-servlet + + + io.grpc + grpc-servlet-jakarta + + + + + + io.grpc + grpc-util + + 1.60.0 + + + + + dev.failsafe + failsafe + ${failsafe.version} + @@ -744,7 +796,7 @@ rxjava ${rxjava.version} - + com.carrotsearch hppc 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 bc871bca532..dde140f2b5a 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -39,29 +39,12 @@ io.grpc grpc-all - - - io.grpc - grpc-netty-shaded - - - 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 8aded3c6663..6cae42550e9 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -31,28 +31,14 @@ io.grpc grpc-all - - - io.grpc - grpc-netty-shaded - - - 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 From 2923cac93b97a2d5949c0bfe7f55fd1ee9329afb Mon Sep 17 00:00:00 2001 From: Andrey Yegorov <8622884+dlg99@users.noreply.github.com> Date: Wed, 5 Jun 2024 07:57:32 -0700 Subject: [PATCH 158/233] [fix] fix Auditor ignoring bookies shut down before Auditor start (#4419) (cherry picked from commit 896137d6fbd005d6eaf000af2820f1746d5daf45) --- .../java/org/apache/bookkeeper/replication/Auditor.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java index 13b10cf927c..66328e2597f 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java @@ -36,6 +36,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiConsumer; +import java.util.stream.Collectors; import org.apache.bookkeeper.client.BKException; import org.apache.bookkeeper.client.BookKeeper; import org.apache.bookkeeper.client.BookKeeperAdmin; @@ -386,7 +387,12 @@ public void start() { try { watchBookieChanges(); - knownBookies = getAvailableBookies(); + // Start with all available bookies + // to handle situations where the auditor + // is started after some bookies have already failed + knownBookies = admin.getAllBookies().stream() + .map(BookieId::toString) + .collect(Collectors.toList()); this.ledgerUnderreplicationManager .notifyLostBookieRecoveryDelayChanged(new LostBookieRecoveryDelayChangedCb()); } catch (BKException bke) { From a76dab9fe5ce379b7eb43050d72143c22fa7e4f5 Mon Sep 17 00:00:00 2001 From: houxiaoyu Date: Tue, 11 Jun 2024 07:41:10 +0800 Subject: [PATCH 159/233] Fix TimedRunnable log NPE (#4425) (cherry picked from commit 43b5ccc5adb3ac2a0f96f22740e745c799095281) --- .../apache/bookkeeper/common/util/OrderedExecutor.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java index f856a4ea329..a6f137f4aaa 100644 --- a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java +++ b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java @@ -187,10 +187,12 @@ public T build() { protected class TimedRunnable implements Runnable { final Runnable runnable; final long initNanos; + final Class runnableClass; TimedRunnable(Runnable runnable) { this.runnable = runnable; this.initNanos = MathUtils.nowInNano(); + this.runnableClass = runnable.getClass(); } @Override @@ -203,8 +205,7 @@ public void run() { long elapsedMicroSec = MathUtils.elapsedMicroSec(startNanos); taskExecutionStats.registerSuccessfulEvent(elapsedMicroSec, TimeUnit.MICROSECONDS); if (elapsedMicroSec >= warnTimeMicroSec) { - log.warn("Runnable {}:{} took too long {} micros to execute.", runnable, runnable.getClass(), - elapsedMicroSec); + log.warn("Runnable {} took too long {} micros to execute.", runnableClass, elapsedMicroSec); } } } @@ -216,10 +217,12 @@ public void run() { protected class TimedCallable implements Callable { final Callable callable; final long initNanos; + final Class callableClass; TimedCallable(Callable callable) { this.callable = callable; this.initNanos = MathUtils.nowInNano(); + this.callableClass = callable.getClass(); } @Override @@ -232,8 +235,7 @@ public T call() throws Exception { long elapsedMicroSec = MathUtils.elapsedMicroSec(startNanos); taskExecutionStats.registerSuccessfulEvent(elapsedMicroSec, TimeUnit.MICROSECONDS); if (elapsedMicroSec >= warnTimeMicroSec) { - log.warn("Callable {}:{} took too long {} micros to execute.", callable, callable.getClass(), - elapsedMicroSec); + log.warn("Callable {} took too long {} micros to execute.", callableClass, elapsedMicroSec); } } } From 4c1919aea5e558ecc6e12618b995831772aa2ca4 Mon Sep 17 00:00:00 2001 From: zhiheng123 <903292776@qq.com> Date: Wed, 12 Jun 2024 16:13:40 +0800 Subject: [PATCH 160/233] fix: release build image error when user's home dir is under /home (#4432) Signed-off-by: zhiheng123 <903292776@qq.com> (cherry picked from commit 7c9c42960ad85760fbf0a3d6b30f9faceb16948a) --- dev/release/000-run-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/release/000-run-docker.sh b/dev/release/000-run-docker.sh index 248c2e7fec7..495227a7e9c 100755 --- a/dev/release/000-run-docker.sh +++ b/dev/release/000-run-docker.sh @@ -51,7 +51,7 @@ docker build -t "${IMAGE_NAME}-${USER_NAME}" - < Date: Wed, 12 Jun 2024 23:08:31 +0800 Subject: [PATCH 161/233] Optimize Release Script for Docker Builds in BookKeeper (#4428) ### Changes - Replaced `docker build` with `docker buildx build` to enhance cross-platform compatibility. - Modified Dockerfile commands to conditionally create user and group only if they do not already exist, preventing errors during the build process. (cherry picked from commit 88bcdc981f8daf42a1a011f0e2db72a134b86218) --- dev/release/000-run-docker.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/release/000-run-docker.sh b/dev/release/000-run-docker.sh index 495227a7e9c..845b17ec7e1 100755 --- a/dev/release/000-run-docker.sh +++ b/dev/release/000-run-docker.sh @@ -33,7 +33,7 @@ export IMAGE_NAME="bookkeeper-release-build" pushd ${SCRIPT_DIR} -docker build --rm=true -t ${IMAGE_NAME} . +docker build --platform linux/amd64 --rm=true -t ${IMAGE_NAME} . popd @@ -47,10 +47,10 @@ else # boot2docker uid and gid GROUP_ID=50 fi -docker build -t "${IMAGE_NAME}-${USER_NAME}" - < /dev/null; then groupadd --non-unique -g ${GROUP_ID} ${USER_NAME}; fi && \ + if ! getent passwd ${USER_NAME} > /dev/null; then useradd -l -g ${GROUP_ID} -u ${GROUP_ID} -k /root -m ${USER_NAME}; fi && \ ([ "$(dirname "$HOME")" = "/home" ] || ln -s /home $(dirname "$HOME")) && \ mkdir -p /gpg && chown ${USER_ID}:${GROUP_ID} /gpg && chmod 700 /gpg ENV HOME /home/${USER_NAME} From 06eca7287453d3b76665db4cc2ac546a6ae69e40 Mon Sep 17 00:00:00 2001 From: zhiheng123 <903292776@qq.com> Date: Thu, 13 Jun 2024 13:00:09 +0000 Subject: [PATCH 162/233] [maven-release-plugin] prepare release v4.16.6-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 14 +++++--------- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- .../current-server-old-clients/pom.xml | 2 +- .../hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- .../backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- .../all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- .../bookkeeper-server-tests-shaded-test/pom.xml | 2 +- .../shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 99 insertions(+), 103 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 83cc994918f..a9344567c93 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index be5b64444b6..269a4e30786 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 02d8798767f..d0facb04e64 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 2929d08b7a4..49f3736dcc3 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 69dcc80b8cc..6612906b55c 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 288f39ae295..396c25503c9 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a35318ec5d8..a16a2d564ce 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 62d310cf25d..5c9d0b746f5 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 5003e9e57aa..200dc0fb869 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 530cafe1d3a..df874a0702c 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index f42a226b123..a82fa367cba 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 9e9a457c35a..a538948e8b9 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 48058ac546f..9b6366d15bf 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index d0d43d0180f..b89670f369a 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 1a53566cdaa..fd41bfd4e8b 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index bb50d49c975..abd8ba6901e 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f9f7b7ba09a..f4a90c17a0c 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 buildtools Apache BookKeeper :: Build Tools - 4.16.6-SNAPSHOT + 4.16.6 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 51efa827c8e..5dc037d15a4 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 2651364bb5b..bf5bf5252f2 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 02eb74201e6..95d38a9f847 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.6 .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 561927118b9..99c10949f36 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -19,14 +19,12 @@ under the License. --> - + 4.0.0 org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.metadata.drivers @@ -125,8 +123,8 @@ - - + + META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml ${project.basedir}/dependency-reduced-pom.xml @@ -176,9 +174,7 @@ - + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index f22a44a905b..93ba981bd6b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 36f70f5e606..c2f915fd721 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0d5b099a2cc..0a09fc7d982 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/pom.xml b/pom.xml index eceb6b74c53..9f3c3e7e512 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - branch-4.16 + v4.16.6-rc0 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index b1b79bf558a..f42dc101360 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index ff6cf749521..f610c8bb482 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index de957d44343..96334128c52 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 230d5b20242..1790b56d3a1 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index f4f5bcab3d3..ff91857fb1b 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index f9c7c7d9f01..1438159ad5a 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 5f0c9e65be0..25096fe13fb 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 2f10aadf03c..fac5d259b10 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index e0b0a4ddf36..6ae049fe3e2 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 323493515ed..94807104f76 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 91942436f44..0f569c8fb2f 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 6a334d5c174..aac32b3e7b0 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index a25e6959296..ef4fc37006e 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 7e7c23ec396..5dcffad93c4 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index c4e2c0f3200..4ca1312088e 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 7969286fc56..8b0b8c710ae 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index ee058054a1d..cb2ba4ec50d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index dde140f2b5a..824dc6cb508 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index e7129dd2693..631fe8154c5 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index d273d8f690d..9feab8a987d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 9dbd945c3b3..080546e3855 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.6-SNAPSHOT + 4.16.6 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 235d74dc02a..361f0d35101 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f016ade4cb9..f8392619d71 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 80799527416..629b3dfa54e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 6cc63c3c701..c7342d12e1d 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bd529fa6250..279ed0414b4 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 0e214c5f2f4..afa4c2e9feb 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 2e9d229f972..a4cdc80b51a 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index ab58c05c752..671f81ec744 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 10465d67b16..bc51dbfef63 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 88d9a3c0d73..3faa11c8bb0 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 6cae42550e9..1a00eb0bfd7 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index eea31f3f091..ab764e59ea7 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 7dcdd19822e..f4f6e434392 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index bd81e175f71..be85a241906 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index b0dec42b6ab..291cbde8cb9 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index da40c5473de..3b17a7cade3 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 1077cccbad7..cca158b1246 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.6-SNAPSHOT + 4.16.6 ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 6aabdd64d27..8b6d144b82c 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a25c95dcf06..a00ddee7f5a 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 3f7d4ab9bcd..071527f5430 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index afc9e2dc408..6b15f6705e3 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index ec0b19684fd..afb70b0f056 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 4d5ac4ec7d5..1d3a10c878a 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 1d8a0cc771f..dd925e8936b 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 9c2ddcc9ceb..974a3c63139 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 18abba77317..c2b5a4b4ec4 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.6-SNAPSHOT + 4.16.6 ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 3351d669510..a34535364b3 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 704a8c88719..c26eab4ee7d 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 07ac1759235..a339f0c4308 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index f382f30456c..db13acfe2b4 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index e6f4dcdfed8..14a2aa6b5a0 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 5be3d6048a3..3db9b679b19 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 4dc8f179298..24000f56dc2 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/pom.xml b/tests/pom.xml index 14d77f2bd6f..3cfcc5e3346 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index c7b7ffd73df..7874023639c 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index efd22239e19..30fc54f48c3 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index fff4401f36a..059570db054 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index f3a669e47c2..2b5aec6db79 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index e81e92dedba..d124818930e 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 1818277c202..62763e92e73 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 testtools Apache BookKeeper :: Test Tools - 4.16.6-SNAPSHOT + 4.16.6 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 8ba96038822..c9276afb1ee 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 299b2fd9350..bab62f7f964 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 8698951c356..eb9227e6818 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 8fead65b8e8..361292886f6 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 9f7fc44de54..1d329965c5e 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 689aae999c6..51c013ceffb 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-cli Apache BookKeeper :: Tools :: Stream From 7a1e4971976f514d5a7ea9a08b9469c7345f8511 Mon Sep 17 00:00:00 2001 From: zhiheng123 <903292776@qq.com> Date: Thu, 13 Jun 2024 13:06:32 +0000 Subject: [PATCH 163/233] [maven-release-plugin] rollback changes from release preparation of v4.16.6-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index a9344567c93..83cc994918f 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 269a4e30786..be5b64444b6 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index d0facb04e64..02d8798767f 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 49f3736dcc3..2929d08b7a4 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 6612906b55c..69dcc80b8cc 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 396c25503c9..288f39ae295 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a16a2d564ce..a35318ec5d8 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 5c9d0b746f5..62d310cf25d 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 200dc0fb869..5003e9e57aa 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index df874a0702c..530cafe1d3a 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index a82fa367cba..f42a226b123 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index a538948e8b9..9e9a457c35a 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 9b6366d15bf..48058ac546f 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index b89670f369a..d0d43d0180f 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index fd41bfd4e8b..1a53566cdaa 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index abd8ba6901e..bb50d49c975 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f4a90c17a0c..f9f7b7ba09a 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.6 + 4.16.6-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 5dc037d15a4..51efa827c8e 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index bf5bf5252f2..2651364bb5b 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 95d38a9f847..02eb74201e6 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6 + 4.16.6-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 99c10949f36..7937dcf6c65 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 93ba981bd6b..f22a44a905b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index c2f915fd721..36f70f5e606 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0a09fc7d982..0d5b099a2cc 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 9f3c3e7e512..eb71d1e043f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index f42dc101360..b1b79bf558a 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index f610c8bb482..ff6cf749521 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 96334128c52..de957d44343 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 1790b56d3a1..230d5b20242 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index ff91857fb1b..f4f5bcab3d3 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 1438159ad5a..f9c7c7d9f01 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 25096fe13fb..5f0c9e65be0 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index fac5d259b10..2f10aadf03c 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 6ae049fe3e2..e0b0a4ddf36 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 94807104f76..323493515ed 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 0f569c8fb2f..91942436f44 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index aac32b3e7b0..6a334d5c174 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index ef4fc37006e..a25e6959296 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 5dcffad93c4..7e7c23ec396 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 4ca1312088e..c4e2c0f3200 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 8b0b8c710ae..7969286fc56 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index cb2ba4ec50d..ee058054a1d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 824dc6cb508..dde140f2b5a 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 631fe8154c5..e7129dd2693 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 9feab8a987d..d273d8f690d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 080546e3855..9dbd945c3b3 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.6 + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 361f0d35101..235d74dc02a 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f8392619d71..f016ade4cb9 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 629b3dfa54e..80799527416 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index c7342d12e1d..6cc63c3c701 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 279ed0414b4..bd529fa6250 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index afa4c2e9feb..0e214c5f2f4 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index a4cdc80b51a..2e9d229f972 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 671f81ec744..ab58c05c752 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index bc51dbfef63..10465d67b16 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 3faa11c8bb0..88d9a3c0d73 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 1a00eb0bfd7..6cae42550e9 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index ab764e59ea7..eea31f3f091 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index f4f6e434392..7dcdd19822e 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index be85a241906..bd81e175f71 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 291cbde8cb9..b0dec42b6ab 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 3b17a7cade3..da40c5473de 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index cca158b1246..1077cccbad7 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.6 + 4.16.6-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 8b6d144b82c..6aabdd64d27 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a00ddee7f5a..a25c95dcf06 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 071527f5430..3f7d4ab9bcd 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 6b15f6705e3..afc9e2dc408 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index afb70b0f056..ec0b19684fd 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 1d3a10c878a..4d5ac4ec7d5 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index dd925e8936b..1d8a0cc771f 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 974a3c63139..9c2ddcc9ceb 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index c2b5a4b4ec4..18abba77317 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.6 + 4.16.6-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index a34535364b3..3351d669510 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index c26eab4ee7d..704a8c88719 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index a339f0c4308..07ac1759235 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index db13acfe2b4..f382f30456c 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 14a2aa6b5a0..e6f4dcdfed8 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 3db9b679b19..5be3d6048a3 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 24000f56dc2..4dc8f179298 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 3cfcc5e3346..14d77f2bd6f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 7874023639c..c7b7ffd73df 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 30fc54f48c3..efd22239e19 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 059570db054..fff4401f36a 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 2b5aec6db79..f3a669e47c2 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d124818930e..e81e92dedba 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 62763e92e73..1818277c202 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.6 + 4.16.6-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index c9276afb1ee..8ba96038822 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index bab62f7f964..299b2fd9350 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index eb9227e6818..8698951c356 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 361292886f6..8fead65b8e8 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 1d329965c5e..9f7fc44de54 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 51c013ceffb..689aae999c6 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From cfb7a2ea452f98f246af64c7578453a131006705 Mon Sep 17 00:00:00 2001 From: shoothzj Date: Fri, 14 Jun 2024 03:48:16 +0000 Subject: [PATCH 164/233] [maven-release-plugin] prepare release v4.16.6-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 83cc994918f..a9344567c93 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index be5b64444b6..269a4e30786 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 02d8798767f..d0facb04e64 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 2929d08b7a4..49f3736dcc3 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 69dcc80b8cc..6612906b55c 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 288f39ae295..396c25503c9 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a35318ec5d8..a16a2d564ce 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 62d310cf25d..5c9d0b746f5 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 5003e9e57aa..200dc0fb869 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 530cafe1d3a..df874a0702c 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index f42a226b123..a82fa367cba 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 9e9a457c35a..a538948e8b9 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 48058ac546f..9b6366d15bf 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index d0d43d0180f..b89670f369a 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 1a53566cdaa..fd41bfd4e8b 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index bb50d49c975..abd8ba6901e 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f9f7b7ba09a..f4a90c17a0c 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 buildtools Apache BookKeeper :: Build Tools - 4.16.6-SNAPSHOT + 4.16.6 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 51efa827c8e..5dc037d15a4 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 2651364bb5b..bf5bf5252f2 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 02eb74201e6..95d38a9f847 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.6 .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 7937dcf6c65..99c10949f36 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index f22a44a905b..93ba981bd6b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 36f70f5e606..c2f915fd721 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0d5b099a2cc..0a09fc7d982 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/pom.xml b/pom.xml index eb71d1e043f..9f3c3e7e512 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index b1b79bf558a..f42dc101360 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index ff6cf749521..f610c8bb482 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index de957d44343..96334128c52 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 230d5b20242..1790b56d3a1 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index f4f5bcab3d3..ff91857fb1b 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index f9c7c7d9f01..1438159ad5a 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 5f0c9e65be0..25096fe13fb 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 2f10aadf03c..fac5d259b10 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index e0b0a4ddf36..6ae049fe3e2 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 323493515ed..94807104f76 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 91942436f44..0f569c8fb2f 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 6a334d5c174..aac32b3e7b0 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index a25e6959296..ef4fc37006e 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 7e7c23ec396..5dcffad93c4 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index c4e2c0f3200..4ca1312088e 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 7969286fc56..8b0b8c710ae 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index ee058054a1d..cb2ba4ec50d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index dde140f2b5a..824dc6cb508 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index e7129dd2693..631fe8154c5 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index d273d8f690d..9feab8a987d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 9dbd945c3b3..080546e3855 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.6-SNAPSHOT + 4.16.6 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 235d74dc02a..361f0d35101 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f016ade4cb9..f8392619d71 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 80799527416..629b3dfa54e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 6cc63c3c701..c7342d12e1d 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bd529fa6250..279ed0414b4 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 0e214c5f2f4..afa4c2e9feb 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 2e9d229f972..a4cdc80b51a 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index ab58c05c752..671f81ec744 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 10465d67b16..bc51dbfef63 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 88d9a3c0d73..3faa11c8bb0 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 6cae42550e9..1a00eb0bfd7 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index eea31f3f091..ab764e59ea7 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 7dcdd19822e..f4f6e434392 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index bd81e175f71..be85a241906 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index b0dec42b6ab..291cbde8cb9 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index da40c5473de..3b17a7cade3 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 1077cccbad7..cca158b1246 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.6-SNAPSHOT + 4.16.6 ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 6aabdd64d27..8b6d144b82c 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a25c95dcf06..a00ddee7f5a 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 3f7d4ab9bcd..071527f5430 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index afc9e2dc408..6b15f6705e3 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index ec0b19684fd..afb70b0f056 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 4d5ac4ec7d5..1d3a10c878a 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 1d8a0cc771f..dd925e8936b 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 9c2ddcc9ceb..974a3c63139 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 18abba77317..c2b5a4b4ec4 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.6-SNAPSHOT + 4.16.6 ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 3351d669510..a34535364b3 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 704a8c88719..c26eab4ee7d 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 07ac1759235..a339f0c4308 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index f382f30456c..db13acfe2b4 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index e6f4dcdfed8..14a2aa6b5a0 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 5be3d6048a3..3db9b679b19 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 4dc8f179298..24000f56dc2 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/pom.xml b/tests/pom.xml index 14d77f2bd6f..3cfcc5e3346 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index c7b7ffd73df..7874023639c 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index efd22239e19..30fc54f48c3 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index fff4401f36a..059570db054 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index f3a669e47c2..2b5aec6db79 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index e81e92dedba..d124818930e 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 1818277c202..62763e92e73 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 testtools Apache BookKeeper :: Test Tools - 4.16.6-SNAPSHOT + 4.16.6 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 8ba96038822..c9276afb1ee 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 299b2fd9350..bab62f7f964 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 8698951c356..eb9227e6818 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 8fead65b8e8..361292886f6 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 9f7fc44de54..1d329965c5e 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 689aae999c6..51c013ceffb 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-cli Apache BookKeeper :: Tools :: Stream From 01ee2e3c4c7ad06c69086f29025aace88cb46323 Mon Sep 17 00:00:00 2001 From: shoothzj Date: Fri, 14 Jun 2024 03:48:21 +0000 Subject: [PATCH 165/233] [maven-release-plugin] rollback changes from release preparation of v4.16.6-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index a9344567c93..83cc994918f 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 269a4e30786..be5b64444b6 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index d0facb04e64..02d8798767f 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 49f3736dcc3..2929d08b7a4 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 6612906b55c..69dcc80b8cc 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 396c25503c9..288f39ae295 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a16a2d564ce..a35318ec5d8 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 5c9d0b746f5..62d310cf25d 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 200dc0fb869..5003e9e57aa 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index df874a0702c..530cafe1d3a 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index a82fa367cba..f42a226b123 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index a538948e8b9..9e9a457c35a 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 9b6366d15bf..48058ac546f 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index b89670f369a..d0d43d0180f 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index fd41bfd4e8b..1a53566cdaa 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index abd8ba6901e..bb50d49c975 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f4a90c17a0c..f9f7b7ba09a 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.6 + 4.16.6-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 5dc037d15a4..51efa827c8e 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index bf5bf5252f2..2651364bb5b 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 95d38a9f847..02eb74201e6 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6 + 4.16.6-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 99c10949f36..7937dcf6c65 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 93ba981bd6b..f22a44a905b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index c2f915fd721..36f70f5e606 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0a09fc7d982..0d5b099a2cc 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 9f3c3e7e512..eb71d1e043f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index f42dc101360..b1b79bf558a 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index f610c8bb482..ff6cf749521 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 96334128c52..de957d44343 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 1790b56d3a1..230d5b20242 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index ff91857fb1b..f4f5bcab3d3 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 1438159ad5a..f9c7c7d9f01 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 25096fe13fb..5f0c9e65be0 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index fac5d259b10..2f10aadf03c 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 6ae049fe3e2..e0b0a4ddf36 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 94807104f76..323493515ed 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 0f569c8fb2f..91942436f44 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index aac32b3e7b0..6a334d5c174 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index ef4fc37006e..a25e6959296 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 5dcffad93c4..7e7c23ec396 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 4ca1312088e..c4e2c0f3200 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 8b0b8c710ae..7969286fc56 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index cb2ba4ec50d..ee058054a1d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 824dc6cb508..dde140f2b5a 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 631fe8154c5..e7129dd2693 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 9feab8a987d..d273d8f690d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 080546e3855..9dbd945c3b3 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.6 + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 361f0d35101..235d74dc02a 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f8392619d71..f016ade4cb9 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 629b3dfa54e..80799527416 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index c7342d12e1d..6cc63c3c701 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 279ed0414b4..bd529fa6250 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index afa4c2e9feb..0e214c5f2f4 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index a4cdc80b51a..2e9d229f972 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 671f81ec744..ab58c05c752 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index bc51dbfef63..10465d67b16 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 3faa11c8bb0..88d9a3c0d73 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 1a00eb0bfd7..6cae42550e9 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index ab764e59ea7..eea31f3f091 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index f4f6e434392..7dcdd19822e 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index be85a241906..bd81e175f71 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 291cbde8cb9..b0dec42b6ab 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 3b17a7cade3..da40c5473de 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index cca158b1246..1077cccbad7 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.6 + 4.16.6-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 8b6d144b82c..6aabdd64d27 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a00ddee7f5a..a25c95dcf06 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 071527f5430..3f7d4ab9bcd 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 6b15f6705e3..afc9e2dc408 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index afb70b0f056..ec0b19684fd 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 1d3a10c878a..4d5ac4ec7d5 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index dd925e8936b..1d8a0cc771f 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 974a3c63139..9c2ddcc9ceb 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index c2b5a4b4ec4..18abba77317 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.6 + 4.16.6-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index a34535364b3..3351d669510 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index c26eab4ee7d..704a8c88719 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index a339f0c4308..07ac1759235 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index db13acfe2b4..f382f30456c 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 14a2aa6b5a0..e6f4dcdfed8 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 3db9b679b19..5be3d6048a3 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 24000f56dc2..4dc8f179298 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 3cfcc5e3346..14d77f2bd6f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 7874023639c..c7b7ffd73df 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 30fc54f48c3..efd22239e19 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 059570db054..fff4401f36a 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 2b5aec6db79..f3a669e47c2 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d124818930e..e81e92dedba 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 62763e92e73..1818277c202 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.6 + 4.16.6-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index c9276afb1ee..8ba96038822 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index bab62f7f964..299b2fd9350 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index eb9227e6818..8698951c356 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 361292886f6..8fead65b8e8 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 1d329965c5e..9f7fc44de54 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 51c013ceffb..689aae999c6 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From fb23a790a78cd82153269df14ddfe66317e869c5 Mon Sep 17 00:00:00 2001 From: shoothzj Date: Fri, 14 Jun 2024 04:29:33 +0000 Subject: [PATCH 166/233] [maven-release-plugin] prepare release v4.16.6-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 83cc994918f..a9344567c93 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index be5b64444b6..269a4e30786 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 02d8798767f..d0facb04e64 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 2929d08b7a4..49f3736dcc3 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 69dcc80b8cc..6612906b55c 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 288f39ae295..396c25503c9 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a35318ec5d8..a16a2d564ce 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 62d310cf25d..5c9d0b746f5 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 5003e9e57aa..200dc0fb869 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 530cafe1d3a..df874a0702c 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index f42a226b123..a82fa367cba 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 9e9a457c35a..a538948e8b9 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 48058ac546f..9b6366d15bf 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index d0d43d0180f..b89670f369a 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 1a53566cdaa..fd41bfd4e8b 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index bb50d49c975..abd8ba6901e 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f9f7b7ba09a..f4a90c17a0c 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 buildtools Apache BookKeeper :: Build Tools - 4.16.6-SNAPSHOT + 4.16.6 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 51efa827c8e..5dc037d15a4 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 2651364bb5b..bf5bf5252f2 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 02eb74201e6..95d38a9f847 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.6 .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 7937dcf6c65..99c10949f36 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index f22a44a905b..93ba981bd6b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 36f70f5e606..c2f915fd721 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0d5b099a2cc..0a09fc7d982 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/pom.xml b/pom.xml index eb71d1e043f..9f3c3e7e512 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index b1b79bf558a..f42dc101360 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index ff6cf749521..f610c8bb482 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index de957d44343..96334128c52 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 230d5b20242..1790b56d3a1 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index f4f5bcab3d3..ff91857fb1b 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index f9c7c7d9f01..1438159ad5a 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 5f0c9e65be0..25096fe13fb 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 2f10aadf03c..fac5d259b10 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index e0b0a4ddf36..6ae049fe3e2 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 323493515ed..94807104f76 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 91942436f44..0f569c8fb2f 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 6a334d5c174..aac32b3e7b0 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index a25e6959296..ef4fc37006e 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 7e7c23ec396..5dcffad93c4 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index c4e2c0f3200..4ca1312088e 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 7969286fc56..8b0b8c710ae 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index ee058054a1d..cb2ba4ec50d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index dde140f2b5a..824dc6cb508 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index e7129dd2693..631fe8154c5 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index d273d8f690d..9feab8a987d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 9dbd945c3b3..080546e3855 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.6-SNAPSHOT + 4.16.6 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 235d74dc02a..361f0d35101 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f016ade4cb9..f8392619d71 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 80799527416..629b3dfa54e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 6cc63c3c701..c7342d12e1d 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bd529fa6250..279ed0414b4 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 0e214c5f2f4..afa4c2e9feb 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 2e9d229f972..a4cdc80b51a 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index ab58c05c752..671f81ec744 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 10465d67b16..bc51dbfef63 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 88d9a3c0d73..3faa11c8bb0 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 6cae42550e9..1a00eb0bfd7 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index eea31f3f091..ab764e59ea7 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 7dcdd19822e..f4f6e434392 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index bd81e175f71..be85a241906 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index b0dec42b6ab..291cbde8cb9 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index da40c5473de..3b17a7cade3 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 1077cccbad7..cca158b1246 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.6-SNAPSHOT + 4.16.6 ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 6aabdd64d27..8b6d144b82c 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a25c95dcf06..a00ddee7f5a 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 3f7d4ab9bcd..071527f5430 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index afc9e2dc408..6b15f6705e3 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index ec0b19684fd..afb70b0f056 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 4d5ac4ec7d5..1d3a10c878a 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 1d8a0cc771f..dd925e8936b 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 9c2ddcc9ceb..974a3c63139 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 18abba77317..c2b5a4b4ec4 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.6-SNAPSHOT + 4.16.6 ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 3351d669510..a34535364b3 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 704a8c88719..c26eab4ee7d 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 07ac1759235..a339f0c4308 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index f382f30456c..db13acfe2b4 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index e6f4dcdfed8..14a2aa6b5a0 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 5be3d6048a3..3db9b679b19 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 4dc8f179298..24000f56dc2 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/pom.xml b/tests/pom.xml index 14d77f2bd6f..3cfcc5e3346 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index c7b7ffd73df..7874023639c 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index efd22239e19..30fc54f48c3 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index fff4401f36a..059570db054 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index f3a669e47c2..2b5aec6db79 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index e81e92dedba..d124818930e 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 1818277c202..62763e92e73 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 testtools Apache BookKeeper :: Test Tools - 4.16.6-SNAPSHOT + 4.16.6 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 8ba96038822..c9276afb1ee 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 299b2fd9350..bab62f7f964 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 8698951c356..eb9227e6818 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 8fead65b8e8..361292886f6 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 9f7fc44de54..1d329965c5e 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 689aae999c6..51c013ceffb 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-cli Apache BookKeeper :: Tools :: Stream From 5dd1224349bcbf748b83380def9cec2a0a88b349 Mon Sep 17 00:00:00 2001 From: shoothzj Date: Fri, 14 Jun 2024 04:29:38 +0000 Subject: [PATCH 167/233] [maven-release-plugin] rollback changes from release preparation of v4.16.6-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index a9344567c93..83cc994918f 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 269a4e30786..be5b64444b6 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index d0facb04e64..02d8798767f 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 49f3736dcc3..2929d08b7a4 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 6612906b55c..69dcc80b8cc 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 396c25503c9..288f39ae295 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a16a2d564ce..a35318ec5d8 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 5c9d0b746f5..62d310cf25d 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 200dc0fb869..5003e9e57aa 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index df874a0702c..530cafe1d3a 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index a82fa367cba..f42a226b123 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index a538948e8b9..9e9a457c35a 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 9b6366d15bf..48058ac546f 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index b89670f369a..d0d43d0180f 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index fd41bfd4e8b..1a53566cdaa 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index abd8ba6901e..bb50d49c975 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f4a90c17a0c..f9f7b7ba09a 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.6 + 4.16.6-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 5dc037d15a4..51efa827c8e 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index bf5bf5252f2..2651364bb5b 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 95d38a9f847..02eb74201e6 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6 + 4.16.6-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 99c10949f36..7937dcf6c65 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 93ba981bd6b..f22a44a905b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index c2f915fd721..36f70f5e606 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0a09fc7d982..0d5b099a2cc 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 9f3c3e7e512..eb71d1e043f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index f42dc101360..b1b79bf558a 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index f610c8bb482..ff6cf749521 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 96334128c52..de957d44343 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 1790b56d3a1..230d5b20242 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index ff91857fb1b..f4f5bcab3d3 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 1438159ad5a..f9c7c7d9f01 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 25096fe13fb..5f0c9e65be0 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index fac5d259b10..2f10aadf03c 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 6ae049fe3e2..e0b0a4ddf36 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 94807104f76..323493515ed 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 0f569c8fb2f..91942436f44 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index aac32b3e7b0..6a334d5c174 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index ef4fc37006e..a25e6959296 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 5dcffad93c4..7e7c23ec396 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 4ca1312088e..c4e2c0f3200 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 8b0b8c710ae..7969286fc56 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index cb2ba4ec50d..ee058054a1d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 824dc6cb508..dde140f2b5a 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 631fe8154c5..e7129dd2693 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 9feab8a987d..d273d8f690d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 080546e3855..9dbd945c3b3 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.6 + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 361f0d35101..235d74dc02a 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f8392619d71..f016ade4cb9 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 629b3dfa54e..80799527416 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index c7342d12e1d..6cc63c3c701 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 279ed0414b4..bd529fa6250 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index afa4c2e9feb..0e214c5f2f4 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index a4cdc80b51a..2e9d229f972 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 671f81ec744..ab58c05c752 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index bc51dbfef63..10465d67b16 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 3faa11c8bb0..88d9a3c0d73 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 1a00eb0bfd7..6cae42550e9 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index ab764e59ea7..eea31f3f091 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index f4f6e434392..7dcdd19822e 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index be85a241906..bd81e175f71 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 291cbde8cb9..b0dec42b6ab 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 3b17a7cade3..da40c5473de 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index cca158b1246..1077cccbad7 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.6 + 4.16.6-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 8b6d144b82c..6aabdd64d27 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a00ddee7f5a..a25c95dcf06 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 071527f5430..3f7d4ab9bcd 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 6b15f6705e3..afc9e2dc408 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index afb70b0f056..ec0b19684fd 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 1d3a10c878a..4d5ac4ec7d5 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index dd925e8936b..1d8a0cc771f 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 974a3c63139..9c2ddcc9ceb 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index c2b5a4b4ec4..18abba77317 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.6 + 4.16.6-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index a34535364b3..3351d669510 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index c26eab4ee7d..704a8c88719 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index a339f0c4308..07ac1759235 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index db13acfe2b4..f382f30456c 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 14a2aa6b5a0..e6f4dcdfed8 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 3db9b679b19..5be3d6048a3 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 24000f56dc2..4dc8f179298 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 3cfcc5e3346..14d77f2bd6f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 7874023639c..c7b7ffd73df 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 30fc54f48c3..efd22239e19 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 059570db054..fff4401f36a 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 2b5aec6db79..f3a669e47c2 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d124818930e..e81e92dedba 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 62763e92e73..1818277c202 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.6 + 4.16.6-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index c9276afb1ee..8ba96038822 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index bab62f7f964..299b2fd9350 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index eb9227e6818..8698951c356 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 361292886f6..8fead65b8e8 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 1d329965c5e..9f7fc44de54 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 51c013ceffb..689aae999c6 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From 72aa9aa6a73875389a335c98707cdef8b424cea8 Mon Sep 17 00:00:00 2001 From: shoothzj Date: Fri, 14 Jun 2024 04:49:17 +0000 Subject: [PATCH 168/233] [maven-release-plugin] prepare release v4.16.6-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 83cc994918f..a9344567c93 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index be5b64444b6..269a4e30786 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 02d8798767f..d0facb04e64 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 2929d08b7a4..49f3736dcc3 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 69dcc80b8cc..6612906b55c 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 288f39ae295..396c25503c9 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a35318ec5d8..a16a2d564ce 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 62d310cf25d..5c9d0b746f5 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 5003e9e57aa..200dc0fb869 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 530cafe1d3a..df874a0702c 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index f42a226b123..a82fa367cba 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 9e9a457c35a..a538948e8b9 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 48058ac546f..9b6366d15bf 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index d0d43d0180f..b89670f369a 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 1a53566cdaa..fd41bfd4e8b 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index bb50d49c975..abd8ba6901e 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f9f7b7ba09a..f4a90c17a0c 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 buildtools Apache BookKeeper :: Build Tools - 4.16.6-SNAPSHOT + 4.16.6 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 51efa827c8e..5dc037d15a4 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 2651364bb5b..bf5bf5252f2 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 02eb74201e6..95d38a9f847 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.6 .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 7937dcf6c65..99c10949f36 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index f22a44a905b..93ba981bd6b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 36f70f5e606..c2f915fd721 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0d5b099a2cc..0a09fc7d982 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/pom.xml b/pom.xml index eb71d1e043f..9f3c3e7e512 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index b1b79bf558a..f42dc101360 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index ff6cf749521..f610c8bb482 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index de957d44343..96334128c52 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 230d5b20242..1790b56d3a1 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index f4f5bcab3d3..ff91857fb1b 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index f9c7c7d9f01..1438159ad5a 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 5f0c9e65be0..25096fe13fb 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 2f10aadf03c..fac5d259b10 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index e0b0a4ddf36..6ae049fe3e2 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 323493515ed..94807104f76 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 91942436f44..0f569c8fb2f 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 6a334d5c174..aac32b3e7b0 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index a25e6959296..ef4fc37006e 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 7e7c23ec396..5dcffad93c4 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index c4e2c0f3200..4ca1312088e 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 7969286fc56..8b0b8c710ae 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index ee058054a1d..cb2ba4ec50d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index dde140f2b5a..824dc6cb508 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index e7129dd2693..631fe8154c5 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index d273d8f690d..9feab8a987d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 9dbd945c3b3..080546e3855 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.6-SNAPSHOT + 4.16.6 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 235d74dc02a..361f0d35101 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f016ade4cb9..f8392619d71 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 80799527416..629b3dfa54e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 6cc63c3c701..c7342d12e1d 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bd529fa6250..279ed0414b4 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 0e214c5f2f4..afa4c2e9feb 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 2e9d229f972..a4cdc80b51a 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index ab58c05c752..671f81ec744 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 10465d67b16..bc51dbfef63 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 88d9a3c0d73..3faa11c8bb0 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 6cae42550e9..1a00eb0bfd7 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index eea31f3f091..ab764e59ea7 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 7dcdd19822e..f4f6e434392 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index bd81e175f71..be85a241906 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index b0dec42b6ab..291cbde8cb9 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index da40c5473de..3b17a7cade3 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 1077cccbad7..cca158b1246 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.6-SNAPSHOT + 4.16.6 ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 6aabdd64d27..8b6d144b82c 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a25c95dcf06..a00ddee7f5a 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 3f7d4ab9bcd..071527f5430 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index afc9e2dc408..6b15f6705e3 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index ec0b19684fd..afb70b0f056 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 4d5ac4ec7d5..1d3a10c878a 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 1d8a0cc771f..dd925e8936b 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 9c2ddcc9ceb..974a3c63139 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 18abba77317..c2b5a4b4ec4 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.6-SNAPSHOT + 4.16.6 ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 3351d669510..a34535364b3 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 704a8c88719..c26eab4ee7d 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 07ac1759235..a339f0c4308 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index f382f30456c..db13acfe2b4 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index e6f4dcdfed8..14a2aa6b5a0 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 5be3d6048a3..3db9b679b19 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 4dc8f179298..24000f56dc2 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/pom.xml b/tests/pom.xml index 14d77f2bd6f..3cfcc5e3346 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index c7b7ffd73df..7874023639c 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index efd22239e19..30fc54f48c3 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index fff4401f36a..059570db054 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index f3a669e47c2..2b5aec6db79 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index e81e92dedba..d124818930e 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 1818277c202..62763e92e73 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 testtools Apache BookKeeper :: Test Tools - 4.16.6-SNAPSHOT + 4.16.6 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 8ba96038822..c9276afb1ee 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 299b2fd9350..bab62f7f964 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 8698951c356..eb9227e6818 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 8fead65b8e8..361292886f6 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 9f7fc44de54..1d329965c5e 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 689aae999c6..51c013ceffb 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-cli Apache BookKeeper :: Tools :: Stream From e3c902cc13bf3e447dceeeb3312f3ad74ac19fca Mon Sep 17 00:00:00 2001 From: shoothzj Date: Fri, 14 Jun 2024 04:49:21 +0000 Subject: [PATCH 169/233] [maven-release-plugin] rollback changes from release preparation of v4.16.6-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index a9344567c93..83cc994918f 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 269a4e30786..be5b64444b6 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index d0facb04e64..02d8798767f 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 49f3736dcc3..2929d08b7a4 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 6612906b55c..69dcc80b8cc 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 396c25503c9..288f39ae295 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a16a2d564ce..a35318ec5d8 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 5c9d0b746f5..62d310cf25d 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 200dc0fb869..5003e9e57aa 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index df874a0702c..530cafe1d3a 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index a82fa367cba..f42a226b123 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index a538948e8b9..9e9a457c35a 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 9b6366d15bf..48058ac546f 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index b89670f369a..d0d43d0180f 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index fd41bfd4e8b..1a53566cdaa 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index abd8ba6901e..bb50d49c975 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f4a90c17a0c..f9f7b7ba09a 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.6 + 4.16.6-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 5dc037d15a4..51efa827c8e 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index bf5bf5252f2..2651364bb5b 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 95d38a9f847..02eb74201e6 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6 + 4.16.6-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 99c10949f36..7937dcf6c65 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 93ba981bd6b..f22a44a905b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index c2f915fd721..36f70f5e606 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0a09fc7d982..0d5b099a2cc 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 9f3c3e7e512..eb71d1e043f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index f42dc101360..b1b79bf558a 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index f610c8bb482..ff6cf749521 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 96334128c52..de957d44343 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 1790b56d3a1..230d5b20242 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index ff91857fb1b..f4f5bcab3d3 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 1438159ad5a..f9c7c7d9f01 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 25096fe13fb..5f0c9e65be0 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index fac5d259b10..2f10aadf03c 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 6ae049fe3e2..e0b0a4ddf36 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 94807104f76..323493515ed 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 0f569c8fb2f..91942436f44 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index aac32b3e7b0..6a334d5c174 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index ef4fc37006e..a25e6959296 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 5dcffad93c4..7e7c23ec396 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 4ca1312088e..c4e2c0f3200 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 8b0b8c710ae..7969286fc56 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index cb2ba4ec50d..ee058054a1d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 824dc6cb508..dde140f2b5a 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 631fe8154c5..e7129dd2693 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 9feab8a987d..d273d8f690d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 080546e3855..9dbd945c3b3 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.6 + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 361f0d35101..235d74dc02a 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f8392619d71..f016ade4cb9 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 629b3dfa54e..80799527416 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index c7342d12e1d..6cc63c3c701 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 279ed0414b4..bd529fa6250 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index afa4c2e9feb..0e214c5f2f4 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index a4cdc80b51a..2e9d229f972 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 671f81ec744..ab58c05c752 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index bc51dbfef63..10465d67b16 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 3faa11c8bb0..88d9a3c0d73 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 1a00eb0bfd7..6cae42550e9 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index ab764e59ea7..eea31f3f091 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index f4f6e434392..7dcdd19822e 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index be85a241906..bd81e175f71 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 291cbde8cb9..b0dec42b6ab 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 3b17a7cade3..da40c5473de 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index cca158b1246..1077cccbad7 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.6 + 4.16.6-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 8b6d144b82c..6aabdd64d27 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a00ddee7f5a..a25c95dcf06 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 071527f5430..3f7d4ab9bcd 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 6b15f6705e3..afc9e2dc408 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index afb70b0f056..ec0b19684fd 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 1d3a10c878a..4d5ac4ec7d5 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index dd925e8936b..1d8a0cc771f 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 974a3c63139..9c2ddcc9ceb 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index c2b5a4b4ec4..18abba77317 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.6 + 4.16.6-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index a34535364b3..3351d669510 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index c26eab4ee7d..704a8c88719 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index a339f0c4308..07ac1759235 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index db13acfe2b4..f382f30456c 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 14a2aa6b5a0..e6f4dcdfed8 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 3db9b679b19..5be3d6048a3 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 24000f56dc2..4dc8f179298 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 3cfcc5e3346..14d77f2bd6f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 7874023639c..c7b7ffd73df 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 30fc54f48c3..efd22239e19 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 059570db054..fff4401f36a 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 2b5aec6db79..f3a669e47c2 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d124818930e..e81e92dedba 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 62763e92e73..1818277c202 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.6 + 4.16.6-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index c9276afb1ee..8ba96038822 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index bab62f7f964..299b2fd9350 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index eb9227e6818..8698951c356 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 361292886f6..8fead65b8e8 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 1d329965c5e..9f7fc44de54 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 51c013ceffb..689aae999c6 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From bfd871810f78a963029acd1a462d677de2865cf1 Mon Sep 17 00:00:00 2001 From: shoothzj Date: Fri, 14 Jun 2024 05:54:40 +0000 Subject: [PATCH 170/233] [maven-release-plugin] prepare release v4.16.6-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 83cc994918f..a9344567c93 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index be5b64444b6..269a4e30786 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 02d8798767f..d0facb04e64 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 2929d08b7a4..49f3736dcc3 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 69dcc80b8cc..6612906b55c 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 288f39ae295..396c25503c9 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a35318ec5d8..a16a2d564ce 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 62d310cf25d..5c9d0b746f5 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 5003e9e57aa..200dc0fb869 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 530cafe1d3a..df874a0702c 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index f42a226b123..a82fa367cba 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 9e9a457c35a..a538948e8b9 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 48058ac546f..9b6366d15bf 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index d0d43d0180f..b89670f369a 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 1a53566cdaa..fd41bfd4e8b 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index bb50d49c975..abd8ba6901e 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f9f7b7ba09a..f4a90c17a0c 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 buildtools Apache BookKeeper :: Build Tools - 4.16.6-SNAPSHOT + 4.16.6 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 51efa827c8e..5dc037d15a4 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 2651364bb5b..bf5bf5252f2 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 02eb74201e6..95d38a9f847 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.6 .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 7937dcf6c65..99c10949f36 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index f22a44a905b..93ba981bd6b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 36f70f5e606..c2f915fd721 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0d5b099a2cc..0a09fc7d982 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/pom.xml b/pom.xml index eb71d1e043f..9f3c3e7e512 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index b1b79bf558a..f42dc101360 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index ff6cf749521..f610c8bb482 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index de957d44343..96334128c52 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 230d5b20242..1790b56d3a1 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index f4f5bcab3d3..ff91857fb1b 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index f9c7c7d9f01..1438159ad5a 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 5f0c9e65be0..25096fe13fb 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 2f10aadf03c..fac5d259b10 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index e0b0a4ddf36..6ae049fe3e2 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 323493515ed..94807104f76 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 91942436f44..0f569c8fb2f 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 6a334d5c174..aac32b3e7b0 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index a25e6959296..ef4fc37006e 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 7e7c23ec396..5dcffad93c4 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index c4e2c0f3200..4ca1312088e 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 7969286fc56..8b0b8c710ae 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index ee058054a1d..cb2ba4ec50d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index dde140f2b5a..824dc6cb508 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index e7129dd2693..631fe8154c5 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index d273d8f690d..9feab8a987d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 9dbd945c3b3..080546e3855 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.6-SNAPSHOT + 4.16.6 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 235d74dc02a..361f0d35101 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f016ade4cb9..f8392619d71 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 80799527416..629b3dfa54e 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.6 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 6cc63c3c701..c7342d12e1d 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bd529fa6250..279ed0414b4 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 0e214c5f2f4..afa4c2e9feb 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 2e9d229f972..a4cdc80b51a 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index ab58c05c752..671f81ec744 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 10465d67b16..bc51dbfef63 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 88d9a3c0d73..3faa11c8bb0 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 6cae42550e9..1a00eb0bfd7 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index eea31f3f091..ab764e59ea7 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 7dcdd19822e..f4f6e434392 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index bd81e175f71..be85a241906 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index b0dec42b6ab..291cbde8cb9 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index da40c5473de..3b17a7cade3 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 1077cccbad7..cca158b1246 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.6-SNAPSHOT + 4.16.6 ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 6aabdd64d27..8b6d144b82c 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a25c95dcf06..a00ddee7f5a 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 3f7d4ab9bcd..071527f5430 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index afc9e2dc408..6b15f6705e3 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index ec0b19684fd..afb70b0f056 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 4d5ac4ec7d5..1d3a10c878a 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 1d8a0cc771f..dd925e8936b 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.6 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 9c2ddcc9ceb..974a3c63139 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 18abba77317..c2b5a4b4ec4 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.6-SNAPSHOT + 4.16.6 ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 3351d669510..a34535364b3 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 704a8c88719..c26eab4ee7d 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 07ac1759235..a339f0c4308 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index f382f30456c..db13acfe2b4 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index e6f4dcdfed8..14a2aa6b5a0 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 5be3d6048a3..3db9b679b19 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 4dc8f179298..24000f56dc2 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.6 .. diff --git a/tests/pom.xml b/tests/pom.xml index 14d77f2bd6f..3cfcc5e3346 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index c7b7ffd73df..7874023639c 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index efd22239e19..30fc54f48c3 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index fff4401f36a..059570db054 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index f3a669e47c2..2b5aec6db79 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index e81e92dedba..d124818930e 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.6 .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 1818277c202..62763e92e73 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 testtools Apache BookKeeper :: Test Tools - 4.16.6-SNAPSHOT + 4.16.6 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 8ba96038822..c9276afb1ee 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 299b2fd9350..bab62f7f964 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 8698951c356..eb9227e6818 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 8fead65b8e8..361292886f6 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 9f7fc44de54..1d329965c5e 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.6 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 689aae999c6..51c013ceffb 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.6 stream-storage-cli Apache BookKeeper :: Tools :: Stream From 2b530fa97e5e0b449c0d4da24acc4a276b638fa4 Mon Sep 17 00:00:00 2001 From: shoothzj Date: Fri, 14 Jun 2024 05:54:45 +0000 Subject: [PATCH 171/233] [maven-release-plugin] rollback changes from release preparation of v4.16.6-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index a9344567c93..83cc994918f 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 269a4e30786..be5b64444b6 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index d0facb04e64..02d8798767f 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 49f3736dcc3..2929d08b7a4 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 6612906b55c..69dcc80b8cc 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 396c25503c9..288f39ae295 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a16a2d564ce..a35318ec5d8 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 5c9d0b746f5..62d310cf25d 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 200dc0fb869..5003e9e57aa 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index df874a0702c..530cafe1d3a 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index a82fa367cba..f42a226b123 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index a538948e8b9..9e9a457c35a 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 9b6366d15bf..48058ac546f 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index b89670f369a..d0d43d0180f 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index fd41bfd4e8b..1a53566cdaa 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index abd8ba6901e..bb50d49c975 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f4a90c17a0c..f9f7b7ba09a 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.6 + 4.16.6-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 5dc037d15a4..51efa827c8e 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index bf5bf5252f2..2651364bb5b 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 95d38a9f847..02eb74201e6 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6 + 4.16.6-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 99c10949f36..7937dcf6c65 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 93ba981bd6b..f22a44a905b 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index c2f915fd721..36f70f5e606 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0a09fc7d982..0d5b099a2cc 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 9f3c3e7e512..eb71d1e043f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index f42dc101360..b1b79bf558a 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index f610c8bb482..ff6cf749521 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 96334128c52..de957d44343 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 1790b56d3a1..230d5b20242 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index ff91857fb1b..f4f5bcab3d3 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 1438159ad5a..f9c7c7d9f01 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 25096fe13fb..5f0c9e65be0 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index fac5d259b10..2f10aadf03c 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 6ae049fe3e2..e0b0a4ddf36 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 94807104f76..323493515ed 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 0f569c8fb2f..91942436f44 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index aac32b3e7b0..6a334d5c174 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index ef4fc37006e..a25e6959296 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 5dcffad93c4..7e7c23ec396 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 4ca1312088e..c4e2c0f3200 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 8b0b8c710ae..7969286fc56 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index cb2ba4ec50d..ee058054a1d 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 824dc6cb508..dde140f2b5a 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 631fe8154c5..e7129dd2693 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 9feab8a987d..d273d8f690d 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 080546e3855..9dbd945c3b3 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.6 + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 361f0d35101..235d74dc02a 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f8392619d71..f016ade4cb9 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 629b3dfa54e..80799527416 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6 + 4.16.6-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index c7342d12e1d..6cc63c3c701 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 279ed0414b4..bd529fa6250 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index afa4c2e9feb..0e214c5f2f4 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index a4cdc80b51a..2e9d229f972 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 671f81ec744..ab58c05c752 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index bc51dbfef63..10465d67b16 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 3faa11c8bb0..88d9a3c0d73 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 1a00eb0bfd7..6cae42550e9 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index ab764e59ea7..eea31f3f091 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index f4f6e434392..7dcdd19822e 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index be85a241906..bd81e175f71 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 291cbde8cb9..b0dec42b6ab 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 3b17a7cade3..da40c5473de 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index cca158b1246..1077cccbad7 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.6 + 4.16.6-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 8b6d144b82c..6aabdd64d27 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a00ddee7f5a..a25c95dcf06 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 071527f5430..3f7d4ab9bcd 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 6b15f6705e3..afc9e2dc408 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index afb70b0f056..ec0b19684fd 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 1d3a10c878a..4d5ac4ec7d5 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index dd925e8936b..1d8a0cc771f 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6 + 4.16.6-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 974a3c63139..9c2ddcc9ceb 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index c2b5a4b4ec4..18abba77317 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.6 + 4.16.6-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index a34535364b3..3351d669510 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index c26eab4ee7d..704a8c88719 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index a339f0c4308..07ac1759235 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index db13acfe2b4..f382f30456c 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 14a2aa6b5a0..e6f4dcdfed8 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 3db9b679b19..5be3d6048a3 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 24000f56dc2..4dc8f179298 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6 + 4.16.6-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 3cfcc5e3346..14d77f2bd6f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 7874023639c..c7b7ffd73df 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 30fc54f48c3..efd22239e19 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 059570db054..fff4401f36a 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 2b5aec6db79..f3a669e47c2 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index d124818930e..e81e92dedba 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6 + 4.16.6-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 62763e92e73..1818277c202 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.6 + 4.16.6-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index c9276afb1ee..8ba96038822 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index bab62f7f964..299b2fd9350 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index eb9227e6818..8698951c356 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 361292886f6..8fead65b8e8 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 1d329965c5e..9f7fc44de54 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6 + 4.16.6-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 51c013ceffb..689aae999c6 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6 + 4.16.6-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From c666461ea66efe171935a75a10da7e9807337d58 Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Wed, 26 Jun 2024 15:43:47 +0800 Subject: [PATCH 172/233] Update python version to 4.16.6 Signed-off-by: ZhangJian He --- stream/clients/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream/clients/python/setup.py b/stream/clients/python/setup.py index 4f65845305c..c8c17ce200b 100644 --- a/stream/clients/python/setup.py +++ b/stream/clients/python/setup.py @@ -19,7 +19,7 @@ name = 'apache-bookkeeper-client' description = 'Apache BookKeeper client library' -version = '4.16.5' +version = '4.16.6' # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta' From 31188c0642cd010dcd2492e7001a1e1a87d29d4b Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Wed, 26 Jun 2024 23:37:36 +0800 Subject: [PATCH 173/233] Bump branch-4.16 to 4.16.7-SNAPSHOT (#4454) Signed-off-by: ZhangJian He --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 83cc994918f..7492d652bd6 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index be5b64444b6..235b79b9781 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 02d8798767f..b22a020b473 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 2929d08b7a4..1078aba5dd8 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 69dcc80b8cc..6ce6431ea19 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 288f39ae295..2fe5e1f1436 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index a35318ec5d8..bb249f3dcde 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 62d310cf25d..c1159a8c16a 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 5003e9e57aa..76d4f7c3647 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 530cafe1d3a..bd95c063a76 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index f42a226b123..75ce4d816b0 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 9e9a457c35a..5262f84d1ea 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 48058ac546f..b192afde27e 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index d0d43d0180f..288135f20f2 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 1a53566cdaa..0ac4cae87f2 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index bb50d49c975..451332633d7 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f9f7b7ba09a..7f6c3b3843d 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 51efa827c8e..c9bf3601964 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 2651364bb5b..9d3d0100335 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 02eb74201e6..326f0f6c34e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 7937dcf6c65..f027b52ecd9 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index f22a44a905b..b50896aac54 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 36f70f5e606..06b950e6563 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 0d5b099a2cc..61a4ca7568f 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index eb71d1e043f..bbf4da34805 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index b1b79bf558a..65582a3d6ec 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index ff6cf749521..b4d32c0599c 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index de957d44343..4080e671ff1 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 230d5b20242..3e58b84dc64 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index f4f5bcab3d3..98f96245bc9 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index f9c7c7d9f01..7928409a6da 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 5f0c9e65be0..a66d4eb824c 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 2f10aadf03c..5980fa42777 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index e0b0a4ddf36..2d01f361368 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 323493515ed..e7e95853970 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index 91942436f44..f59d0d709ac 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 6a334d5c174..1a684f68270 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index a25e6959296..8e8f9129e7f 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 7e7c23ec396..7ee5100c759 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index c4e2c0f3200..895ae8ffe5d 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 7969286fc56..f6a2f229129 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index ee058054a1d..17a35ad6f94 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index dde140f2b5a..32e37b39d26 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index e7129dd2693..ace02d2328e 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index d273d8f690d..829f87347ad 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 9dbd945c3b3..50b084a2ff0 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 235d74dc02a..256850ad27d 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index f016ade4cb9..8b58e847ce6 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 80799527416..9db284c0379 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 6cc63c3c701..8fa49ed367c 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index bd529fa6250..60e69e2398e 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 0e214c5f2f4..7b644466461 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 2e9d229f972..0db4a66af4f 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index ab58c05c752..70a413e30e3 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 10465d67b16..b6d79ee6849 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 88d9a3c0d73..00aef435915 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 6cae42550e9..cc490837069 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index eea31f3f091..de91b12a8f7 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index 7dcdd19822e..fef5bc0784d 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index bd81e175f71..b9f437ed2ff 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index b0dec42b6ab..1da66ddc790 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index da40c5473de..293ff3c7f04 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 1077cccbad7..1c11ec0248c 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 6aabdd64d27..8fa26233121 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index a25c95dcf06..ec47b2e864c 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 3f7d4ab9bcd..1833bcbb9c6 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index afc9e2dc408..7bd465457bb 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index ec0b19684fd..13f223d855a 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 4d5ac4ec7d5..86bf338e5e3 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 1d8a0cc771f..61a14d4cd88 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 9c2ddcc9ceb..7931a66edc1 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 18abba77317..9cfe7845a43 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 3351d669510..8b712485770 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 704a8c88719..54a8398ee63 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index 07ac1759235..c95333c49e4 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index f382f30456c..47829bc6497 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index e6f4dcdfed8..2d1bc68fab1 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 5be3d6048a3..86f7195c4a4 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 4dc8f179298..5a3dfa2fe53 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 14d77f2bd6f..099a730f46b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index c7b7ffd73df..dceacea3e88 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index efd22239e19..69ee0c0162f 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index fff4401f36a..a8f23c611b9 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index f3a669e47c2..5c7f5c6678b 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index e81e92dedba..8d6988575fd 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 1818277c202..4d7293cf0c7 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 8ba96038822..28e7135dbed 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 299b2fd9350..5bc795e8637 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 8698951c356..9c3c94a635f 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 8fead65b8e8..9166e9e1388 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 9f7fc44de54..77407dcb950 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 689aae999c6..af2aa576295 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.6-SNAPSHOT + 4.16.7-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From 4e738373627c62d58b6b3846cb745af62de8e8da Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Tue, 2 Jul 2024 07:51:16 +0800 Subject: [PATCH 174/233] Update Release Script Instructions and Python Publishing Scripts (#4458) ### Motivation This PR updates the release scripts to ensure more robust and consistent release processes. The changes include modifying the git tagging instructions to prevent potential mis-tags and updating the Python scripts to use Python 3 explicitly, which aligns with best practices for Python development. ### Changes 1. **Release Guide Modification**: Using ^{} ensures that the tag is created for the commit itself, not rc tag to be deleted. 2. **Python Publishing Script**: Changed all instances of `python` to `python3`, modern operation systems default has `python3`, but not all has `python` Signed-off-by: ZhangJian He (cherry picked from commit 243b085c7cff4fe8701ba818e6176ec9bc5937eb) --- site3/website/src/pages/community/release-guide.md | 2 +- stream/clients/python/scripts/publish.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site3/website/src/pages/community/release-guide.md b/site3/website/src/pages/community/release-guide.md index 2a0c394034d..3faa43e9a64 100644 --- a/site3/website/src/pages/community/release-guide.md +++ b/site3/website/src/pages/community/release-guide.md @@ -476,7 +476,7 @@ Note: you can put the 1. and 2. in the same pull. Create and push a new signed for the released version by copying the tag for the final release tag, as follows ```shell -git tag -s "${TAG}" "${RC_TAG}" +git tag -s "${TAG}" "${RC_TAG}^{}" # Message: "Release ${VERSION}" git push apache "${TAG}" ``` diff --git a/stream/clients/python/scripts/publish.sh b/stream/clients/python/scripts/publish.sh index caa2a3b5b4e..7c55a0f2016 100755 --- a/stream/clients/python/scripts/publish.sh +++ b/stream/clients/python/scripts/publish.sh @@ -23,8 +23,8 @@ BINDIR=`dirname "$0"` BK_HOME=`cd ${BINDIR}/..;pwd` -python -m pip install --user --upgrade setuptools wheel twine +python3 -m pip install --user --upgrade setuptools wheel twine rm ${BK_HOME}/dist/* -python setup.py sdist bdist_wheel +python3 setup.py sdist bdist_wheel twine upload dist/* From e0f23cf021ef9d241acb43a8ac2a06aa487d5538 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 8 Jul 2024 17:14:43 +0800 Subject: [PATCH 175/233] [feature] [server] add dbStorage_readAheadCacheBatchBytesSize properties when read ahead entries (#3895) (#4463) * [feature] [server] add dbStorage_readAheadCacheBatchBytesSize properties when read ahead entries --------- Co-authored-by: lushiji (cherry picked from commit f5455f01584b1b0a592f020eed49d3cb774da0a9) Co-authored-by: StevenLuMT --- .../bookie/storage/ldb/DbLedgerStorage.java | 11 +- .../ldb/SingleDirectoryDbLedgerStorage.java | 25 +- .../bookkeeper/bookie/TestBookieImpl.java | 28 +- .../ldb/DbLedgerStorageReadCacheTest.java | 368 ++++++++++++++++++ .../ldb/DbLedgerStorageWriteCacheTest.java | 10 +- conf/bk_server.conf | 3 + 6 files changed, 429 insertions(+), 16 deletions(-) create mode 100644 bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageReadCacheTest.java diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java index 8824b1cb6fa..60f752e2264 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java @@ -102,7 +102,10 @@ public class DbLedgerStorage implements LedgerStorage { (long) (0.25 * PlatformDependent.estimateMaxDirectMemory()) / MB; static final String READ_AHEAD_CACHE_BATCH_SIZE = "dbStorage_readAheadCacheBatchSize"; + static final String READ_AHEAD_CACHE_BATCH_BYTES_SIZE = "dbStorage_readAheadCacheBatchBytesSize"; private static final int DEFAULT_READ_AHEAD_CACHE_BATCH_SIZE = 100; + // the default value is -1. this feature(limit of read ahead bytes) is disabled + private static final int DEFAULT_READ_AHEAD_CACHE_BATCH_BYTES_SIZE = -1; private static final long DEFAULT_DIRECT_IO_TOTAL_WRITEBUFFER_SIZE_MB = (long) (0.125 * PlatformDependent.estimateMaxDirectMemory()) @@ -171,6 +174,8 @@ public void initialize(ServerConfiguration conf, LedgerManager ledgerManager, Le long perDirectoryWriteCacheSize = writeCacheMaxSize / numberOfDirs; long perDirectoryReadCacheSize = readCacheMaxSize / numberOfDirs; int readAheadCacheBatchSize = conf.getInt(READ_AHEAD_CACHE_BATCH_SIZE, DEFAULT_READ_AHEAD_CACHE_BATCH_SIZE); + long readAheadCacheBatchBytesSize = conf.getInt(READ_AHEAD_CACHE_BATCH_BYTES_SIZE, + DEFAULT_READ_AHEAD_CACHE_BATCH_BYTES_SIZE); ledgerStorageList = Lists.newArrayList(); for (int i = 0; i < ledgerDirsManager.getAllLedgerDirs().size(); i++) { @@ -237,7 +242,7 @@ public void initialize(ServerConfiguration conf, LedgerManager ledgerManager, Le idm, entrylogger, statsLogger, perDirectoryWriteCacheSize, perDirectoryReadCacheSize, - readAheadCacheBatchSize)); + readAheadCacheBatchSize, readAheadCacheBatchBytesSize)); ldm.getListeners().forEach(ledgerDirsManager::addLedgerDirsListener); if (!lDirs[0].getPath().equals(iDirs[0].getPath())) { idm.getListeners().forEach(indexDirsManager::addLedgerDirsListener); @@ -276,11 +281,11 @@ public Long getSample() { protected SingleDirectoryDbLedgerStorage newSingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager ledgerManager, LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, EntryLogger entryLogger, StatsLogger statsLogger, long writeCacheSize, long readCacheSize, - int readAheadCacheBatchSize) + int readAheadCacheBatchSize, long readAheadCacheBatchBytesSize) throws IOException { return new SingleDirectoryDbLedgerStorage(conf, ledgerManager, ledgerDirsManager, indexDirsManager, entryLogger, statsLogger, allocator, writeCacheSize, readCacheSize, - readAheadCacheBatchSize); + readAheadCacheBatchSize, readAheadCacheBatchBytesSize); } @Override diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java index 7f004c20e5a..61aebd8e1a1 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java @@ -137,6 +137,7 @@ protected Thread newThread(Runnable r, String name) { private final long writeCacheMaxSize; private final long readCacheMaxSize; private final int readAheadCacheBatchSize; + private final long readAheadCacheBatchBytesSize; private final long maxThrottleTimeNanos; @@ -152,7 +153,8 @@ protected Thread newThread(Runnable r, String name) { public SingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager ledgerManager, LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, EntryLogger entryLogger, StatsLogger statsLogger, ByteBufAllocator allocator, - long writeCacheSize, long readCacheSize, int readAheadCacheBatchSize) + long writeCacheSize, long readCacheSize, int readAheadCacheBatchSize, + long readAheadCacheBatchBytesSize) throws IOException { checkArgument(ledgerDirsManager.getAllLedgerDirs().size() == 1, "Db implementation only allows for one storage dir"); @@ -182,6 +184,7 @@ public SingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager le readCacheMaxSize = readCacheSize; this.readAheadCacheBatchSize = readAheadCacheBatchSize; + this.readAheadCacheBatchBytesSize = readAheadCacheBatchBytesSize; // Do not attempt to perform read-ahead more than half the total size of the cache maxReadAheadBytesSize = readCacheMaxSize / 2; @@ -663,9 +666,7 @@ private void fillReadAheadCache(long orginalLedgerId, long firstEntryId, long fi long currentEntryLogId = firstEntryLogId; long currentEntryLocation = firstEntryLocation; - while (count < readAheadCacheBatchSize - && size < maxReadAheadBytesSize - && currentEntryLogId == firstEntryLogId) { + while (chargeReadAheadCache(count, size) && currentEntryLogId == firstEntryLogId) { ByteBuf entry = entryLogger.readEntry(orginalLedgerId, firstEntryId, currentEntryLocation); @@ -703,6 +704,17 @@ private void fillReadAheadCache(long orginalLedgerId, long firstEntryId, long fi } } + protected boolean chargeReadAheadCache(int currentReadAheadCount, long currentReadAheadBytes) { + // compatible with old logic + boolean chargeSizeCondition = currentReadAheadCount < readAheadCacheBatchSize + && currentReadAheadBytes < maxReadAheadBytesSize; + if (chargeSizeCondition && readAheadCacheBatchBytesSize > 0) { + // exact limits limit the size and count for each batch + chargeSizeCondition = currentReadAheadBytes < readAheadCacheBatchBytesSize; + } + return chargeSizeCondition; + } + public ByteBuf getLastEntry(long ledgerId) throws IOException, BookieException { throwIfLimbo(ledgerId); @@ -1278,4 +1290,9 @@ public void clearStorageStateFlag(StorageState flag) throws IOException { } } } + + @VisibleForTesting + DbLedgerStorageStats getDbLedgerStorageStats() { + return dbLedgerStorageStats; + } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestBookieImpl.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestBookieImpl.java index a6bb99174e1..cd0e967b61c 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestBookieImpl.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestBookieImpl.java @@ -29,6 +29,7 @@ import org.apache.bookkeeper.meta.NullMetadataBookieDriver; import org.apache.bookkeeper.proto.SimpleBookieServiceInfoProvider; import org.apache.bookkeeper.stats.NullStatsLogger; +import org.apache.bookkeeper.stats.StatsLogger; import org.apache.bookkeeper.util.DiskChecker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,6 +46,19 @@ public TestBookieImpl(ServerConfiguration conf) throws Exception { this(new ResourceBuilder(conf).build()); } + public TestBookieImpl(Resources resources, StatsLogger statsLogger) throws Exception { + super(resources.conf, + resources.registrationManager, + resources.storage, + resources.diskChecker, + resources.ledgerDirsManager, + resources.indexDirsManager, + statsLogger, + UnpooledByteBufAllocator.DEFAULT, + new SimpleBookieServiceInfoProvider(resources.conf)); + this.resources = resources; + } + public TestBookieImpl(Resources resources) throws Exception { super(resources.conf, resources.registrationManager, @@ -157,12 +171,16 @@ public ResourceBuilder withRegistrationManager(RegistrationManager registrationM return this; } - Resources build() throws Exception { + public Resources build() throws Exception { + return build(NullStatsLogger.INSTANCE); + } + + public Resources build(StatsLogger statsLogger) throws Exception { if (metadataBookieDriver == null) { if (conf.getMetadataServiceUri() == null) { metadataBookieDriver = new NullMetadataBookieDriver(); } else { - metadataBookieDriver = BookieResources.createMetadataDriver(conf, NullStatsLogger.INSTANCE); + metadataBookieDriver = BookieResources.createMetadataDriver(conf, statsLogger); } } if (registrationManager == null) { @@ -173,13 +191,13 @@ Resources build() throws Exception { DiskChecker diskChecker = BookieResources.createDiskChecker(conf); LedgerDirsManager ledgerDirsManager = BookieResources.createLedgerDirsManager( - conf, diskChecker, NullStatsLogger.INSTANCE); + conf, diskChecker, statsLogger); LedgerDirsManager indexDirsManager = BookieResources.createIndexDirsManager( - conf, diskChecker, NullStatsLogger.INSTANCE, ledgerDirsManager); + conf, diskChecker, statsLogger, ledgerDirsManager); LedgerStorage storage = BookieResources.createLedgerStorage( conf, ledgerManager, ledgerDirsManager, indexDirsManager, - NullStatsLogger.INSTANCE, UnpooledByteBufAllocator.DEFAULT); + statsLogger, UnpooledByteBufAllocator.DEFAULT); return new Resources(conf, metadataBookieDriver, diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageReadCacheTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageReadCacheTest.java new file mode 100644 index 00000000000..81ef7f9495c --- /dev/null +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageReadCacheTest.java @@ -0,0 +1,368 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.bookkeeper.bookie.storage.ldb; + +import static org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage.READ_AHEAD_CACHE_BATCH_BYTES_SIZE; +import static org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage.READ_AHEAD_CACHE_BATCH_SIZE; +import static org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage.READ_AHEAD_CACHE_MAX_SIZE_MB; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import java.io.File; +import java.util.List; +import org.apache.bookkeeper.bookie.BookieImpl; +import org.apache.bookkeeper.bookie.DefaultEntryLogger; +import org.apache.bookkeeper.bookie.TestBookieImpl; +import org.apache.bookkeeper.conf.ServerConfiguration; +import org.apache.bookkeeper.conf.TestBKConfiguration; +import org.apache.bookkeeper.test.TestStatsProvider; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Unit test for {@link DbLedgerStorage}. + */ +public class DbLedgerStorageReadCacheTest { + private static final Logger LOGGER = LoggerFactory.getLogger(DbLedgerStorageReadCacheTest.class); + + @Test + public void chargeReadAheadCacheRegressionTest() { + TestDB testDB = new TestDB(); + try { + long readAheadCacheMaxSizeMb = 16L; + int readAheadCacheBatchSize = 1024; + long readAheadCacheBatchBytesSize = -1; + setup(testDB, readAheadCacheMaxSizeMb, readAheadCacheBatchSize, readAheadCacheBatchBytesSize); + SingleDirectoryDbLedgerStorage sdb = testDB.getStorage().getLedgerStorageList().get(0); + /** + * case1: currentReadAheadCount < readAheadCacheBatchSize + * currentReadAheadBytes < maxReadAheadBytesSize + * result: true + */ + int currentReadAheadCount = 1; + long currentReadAheadBytes = 1; + assertTrue(sdb.chargeReadAheadCache(currentReadAheadCount, currentReadAheadBytes)); + + /** + * case2: currentReadAheadCount > readAheadCacheBatchSize + * currentReadAheadBytes < maxReadAheadBytesSize + * result: false + */ + currentReadAheadCount = readAheadCacheBatchSize + 1; + currentReadAheadBytes = 1; + assertFalse(sdb.chargeReadAheadCache(currentReadAheadCount, currentReadAheadBytes)); + + /** + * case3: currentReadAheadCount < readAheadCacheBatchSize + * currentReadAheadBytes > maxReadAheadBytesSize + * result: false + */ + currentReadAheadCount = 1; + currentReadAheadBytes = readAheadCacheMaxSizeMb / 2 * 1024 * 1024 + 1; + assertFalse(sdb.chargeReadAheadCache(currentReadAheadCount, currentReadAheadBytes)); + } catch (Throwable e) { + LOGGER.error("readAheadCacheBatchSizeUnitTest run error", e); + } finally { + teardown(testDB.getStorage(), testDB.getTmpDir()); + } + } + + @Test + public void chargeReadAheadCacheUnitTest() { + TestDB testDB = new TestDB(); + try { + long readAheadCacheMaxSizeMb = 16L; + int readAheadCacheBatchSize = 1024; + long readAheadCacheBatchBytesSize = 2 * 1024 * 1024; + setup(testDB, readAheadCacheMaxSizeMb, readAheadCacheBatchSize, readAheadCacheBatchBytesSize); + SingleDirectoryDbLedgerStorage sdb = testDB.getStorage().getLedgerStorageList().get(0); + /** + * case1: currentReadAheadCount < readAheadCacheBatchSize + * currentReadAheadBytes < readAheadCacheBatchBytesSize + * currentReadAheadBytes < readCacheMaxSize + * result: true + */ + int currentReadAheadCount = 1; + long currentReadAheadBytes = 1; + assertTrue(sdb.chargeReadAheadCache(currentReadAheadCount, currentReadAheadBytes)); + + /** + * case2: currentReadAheadCount > readAheadCacheBatchSize + * currentReadAheadBytes < readAheadCacheBatchBytesSize + * currentReadAheadBytes < readCacheMaxSize + * result: false + */ + currentReadAheadCount = readAheadCacheBatchSize + 1; + currentReadAheadBytes = 1; + assertFalse(sdb.chargeReadAheadCache(currentReadAheadCount, currentReadAheadBytes)); + + /** + * case3: currentReadAheadCount < readAheadCacheBatchSize + * currentReadAheadBytes > readAheadCacheBatchBytesSize + * currentReadAheadBytes < readCacheMaxSize + * result: false + */ + currentReadAheadCount = 1; + currentReadAheadBytes = readAheadCacheBatchBytesSize + 1; + assertFalse(sdb.chargeReadAheadCache(currentReadAheadCount, currentReadAheadBytes)); + } catch (Throwable e) { + LOGGER.error("readAheadCacheBatchSizeUnitTest run error", e); + } finally { + teardown(testDB.getStorage(), testDB.getTmpDir()); + } + } + + @Test + public void compareDiffReadAheadPerfTest() { + /** + * case1(read ahead cache by limit bytes size): + * config: readAheadCacheMaxSizeMb = 2 * 8; + * readAheadCacheBatchSize = 1024; + * readAheadCacheBatchBytesSize = 2 * 1024 * 1024; + * case content: + * LedgerId:0, read 1024 pieces of entry,each piece of entry is 10KB + * LedgerId:1, read 1024 pieces of entry,each piece of entry is 10KB + * LedgerId:2, read 1024 pieces of entry,each piece of entry is 10KB + * LedgerId:3, read 1024 pieces of entry,each piece of entry is 10KB + */ + CacheResult cacheBatchBytesSizeResult = readAheadCacheBatchBytesSize(); + + /** + * case2(read ahead cache by limit count): + * config: readAheadCacheMaxSizeMb = 2 * 8; + * readAheadCacheBatchSize = 1024; + * case content: + * LedgerId:0, read 1024 pieces of entry,each piece of entry is 10KB + * LedgerId:1, read 1024 pieces of entry,each piece of entry is 10KB + * LedgerId:2, read 1024 pieces of entry,each piece of entry is 10KB + * LedgerId:3, read 1024 pieces of entry,each piece of entry is 10KB + */ + CacheResult cacheBatchSizeResult = readAheadCacheBatchSize(); + + /** + * result: case1(read ahead cache by limit bytes size) get less cachemiss, + * it is suitable for large messages, reduce the pollution of readAhead large messages to readCache + */ + assertEquals(8, cacheBatchBytesSizeResult.getCacheMissCount()); + assertEquals(132, cacheBatchSizeResult.getCacheMissCount()); + assertTrue(cacheBatchBytesSizeResult.getCacheMissCount() < cacheBatchSizeResult.getCacheMissCount()); + assertEquals( + cacheBatchBytesSizeResult.getCacheMissCount() + cacheBatchBytesSizeResult.getCacheHitCount(), + cacheBatchSizeResult.getCacheMissCount() + cacheBatchSizeResult.getCacheHitCount()); + } + + public void setup(TestDB testDB, long readAheadCacheMaxSizeMb, + int readAheadCacheBatchSize, long readAheadCacheBatchBytesSize) throws Exception { + File tmpDir = File.createTempFile("bkTest", ".dir"); + tmpDir.delete(); + tmpDir.mkdir(); + File curDir = BookieImpl.getCurrentDirectory(tmpDir); + BookieImpl.checkDirectoryStructure(curDir); + + int gcWaitTime = 1000; + ServerConfiguration conf = TestBKConfiguration.newServerConfiguration(); + conf.setGcWaitTime(gcWaitTime); + conf.setLedgerStorageClass(DbLedgerStorage.class.getName()); + conf.setLedgerDirNames(new String[]{tmpDir.toString()}); + if (readAheadCacheMaxSizeMb > 0) { + conf.setProperty(READ_AHEAD_CACHE_MAX_SIZE_MB, readAheadCacheMaxSizeMb); + } + if (readAheadCacheBatchSize > 0) { + conf.setProperty(READ_AHEAD_CACHE_BATCH_SIZE, readAheadCacheBatchSize); + } + if (readAheadCacheBatchBytesSize > 0) { + conf.setProperty(READ_AHEAD_CACHE_BATCH_BYTES_SIZE, readAheadCacheBatchBytesSize); + } + TestStatsProvider.TestStatsLogger statsLogger = new TestStatsProvider().getStatsLogger("test"); + BookieImpl bookie = new TestBookieImpl(new TestBookieImpl.ResourceBuilder(conf).build(statsLogger), + statsLogger); + + DbLedgerStorage storage = (DbLedgerStorage) bookie.getLedgerStorage(); + + storage.getLedgerStorageList().forEach(singleDirectoryDbLedgerStorage -> { + assertTrue(singleDirectoryDbLedgerStorage.getEntryLogger() instanceof DefaultEntryLogger); + }); + testDB.setStorage(storage); + testDB.setTmpDir(tmpDir); + } + + public void teardown(DbLedgerStorage storage, File tmpDir) { + if (storage != null) { + try { + storage.shutdown(); + } catch (InterruptedException e) { + LOGGER.error("storage.shutdown has error", e); + } + } + if (tmpDir != null) { + tmpDir.delete(); + } + } + + private void addEntries(DbLedgerStorage storage, long minLedgerId, long maxLedgerId, + long minEntryId, long maxEntryId) throws Exception { + // Add entries + for (long lid = minLedgerId; lid < maxLedgerId; lid++) { + long lac = 0; + for (long eid = minEntryId; eid < maxEntryId; eid++) { + ByteBuf entry = Unpooled.buffer(1024); + entry.writeLong(lid); // ledger id + entry.writeLong(eid); // entry id + entry.writeLong(lac); // lac + entry.writeBytes((get4KbMsg()).getBytes()); + assertEquals(eid, storage.addEntry(entry)); + lac++; + } + } + } + + private String get4KbMsg() { + StringBuffer buffer = new StringBuffer(); + for (int i = 0; i < 1024; i++) { + buffer.append("1234"); + } + assertEquals(4 * 1024, buffer.toString().length()); + return buffer.toString(); + } + + private CacheResult readAheadCacheBatchBytesSize() { + Long cacheMissCount; + TestDB testDB = new TestDB(); + try { + long readAheadCacheMaxSizeMb = 2 * 8L; + int readAheadCacheBatchSize = 1024; + long readAheadCacheBatchBytesSize = 2 * 1024 * 1024; + long minEntryId = 0; + long maxEntryId = 1024; + + setup(testDB, readAheadCacheMaxSizeMb, readAheadCacheBatchSize, readAheadCacheBatchBytesSize); + addEntries(testDB.getStorage(), 0, 4, minEntryId, maxEntryId); + + testDB.getStorage().flush(); + assertEquals(false, testDB.getStorage().isFlushRequired()); + // Read from db + for (long eid = minEntryId; eid < maxEntryId / 2; eid++) { + testDB.getStorage().getEntry(0, eid); + testDB.getStorage().getEntry(1, eid); + testDB.getStorage().getEntry(2, eid); + testDB.getStorage().getEntry(3, eid); + } + List ledgerStorageList = testDB.getStorage().getLedgerStorageList(); + DbLedgerStorageStats ledgerStats = ledgerStorageList.get(0).getDbLedgerStorageStats(); + cacheMissCount = ledgerStats.getReadCacheMissCounter().get(); + Long cacheHitCount = ledgerStats.getReadCacheHitCounter().get(); + LOGGER.info("simple1.cacheMissCount={},cacheHitCount={}", cacheMissCount, cacheHitCount); + return new CacheResult(cacheMissCount, cacheHitCount); + } catch (Throwable e) { + LOGGER.error("test case run error", e); + return new CacheResult(0, 0); + } finally { + teardown(testDB.getStorage(), testDB.getTmpDir()); + } + } + + public CacheResult readAheadCacheBatchSize() { + Long cacheMissCount; + TestDB testDB = new TestDB(); + try { + long readAheadCacheMaxSizeMb = 2 * 8L; + int readAheadCacheBatchSize = 1024; + long readAheadCacheBatchBytesSize = -1; + long minEntryId = 0; + long maxEntryId = 1024; + + setup(testDB, readAheadCacheMaxSizeMb, readAheadCacheBatchSize, readAheadCacheBatchBytesSize); + addEntries(testDB.getStorage(), 0, 4, minEntryId, maxEntryId); + + testDB.getStorage().flush(); + assertEquals(false, testDB.getStorage().isFlushRequired()); + // Read from db + for (long eid = minEntryId; eid < maxEntryId / 2; eid++) { + testDB.getStorage().getEntry(0, eid); + testDB.getStorage().getEntry(1, eid); + testDB.getStorage().getEntry(2, eid); + testDB.getStorage().getEntry(3, eid); + } + List ledgerStorageList = testDB.getStorage().getLedgerStorageList(); + DbLedgerStorageStats ledgerStats = ledgerStorageList.get(0).getDbLedgerStorageStats(); + cacheMissCount = ledgerStats.getReadCacheMissCounter().get(); + Long cacheHitCount = ledgerStats.getReadCacheHitCounter().get(); + LOGGER.info("simple2.cacheMissCount={},cacheHitCount={}", cacheMissCount, cacheHitCount); + return new CacheResult(cacheMissCount, cacheHitCount); + } catch (Throwable e) { + LOGGER.error("test case run error", e); + return new CacheResult(0, 0); + } finally { + teardown(testDB.getStorage(), testDB.getTmpDir()); + } + } + + private class TestDB { + private DbLedgerStorage storage; + private File tmpDir; + + public DbLedgerStorage getStorage() { + return storage; + } + + public void setStorage(DbLedgerStorage storage) { + this.storage = storage; + } + + public File getTmpDir() { + return tmpDir; + } + + public void setTmpDir(File tmpDir) { + this.tmpDir = tmpDir; + } + } + + private class CacheResult { + private long cacheMissCount; + private long cacheHitCount; + + private CacheResult(long cacheMissCount, long cacheHitCount) { + this.cacheMissCount = cacheMissCount; + this.cacheHitCount = cacheHitCount; + } + + public long getCacheMissCount() { + return cacheMissCount; + } + + public void setCacheMissCount(long cacheMissCount) { + this.cacheMissCount = cacheMissCount; + } + + public long getCacheHitCount() { + return cacheHitCount; + } + + public void setCacheHitCount(long cacheHitCount) { + this.cacheHitCount = cacheHitCount; + } + } +} \ No newline at end of file diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java index a9bee08cb26..102f7f5addc 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java @@ -56,11 +56,11 @@ private static class MockedDbLedgerStorage extends DbLedgerStorage { protected SingleDirectoryDbLedgerStorage newSingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager ledgerManager, LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, EntryLogger entryLogger, StatsLogger statsLogger, - long writeCacheSize, long readCacheSize, int readAheadCacheBatchSize) + long writeCacheSize, long readCacheSize, int readAheadCacheBatchSize, long readAheadCacheBatchBytesSize) throws IOException { return new MockedSingleDirectoryDbLedgerStorage(conf, ledgerManager, ledgerDirsManager, indexDirsManager, entryLogger, statsLogger, allocator, writeCacheSize, - readCacheSize, readAheadCacheBatchSize); + readCacheSize, readAheadCacheBatchSize, readAheadCacheBatchBytesSize); } private static class MockedSingleDirectoryDbLedgerStorage extends SingleDirectoryDbLedgerStorage { @@ -68,9 +68,11 @@ public MockedSingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerMana LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, EntryLogger entryLogger, StatsLogger statsLogger, ByteBufAllocator allocator, long writeCacheSize, - long readCacheSize, int readAheadCacheBatchSize) throws IOException { + long readCacheSize, int readAheadCacheBatchSize, long readAheadCacheBatchBytesSize) + throws IOException { super(conf, ledgerManager, ledgerDirsManager, indexDirsManager, entryLogger, - statsLogger, allocator, writeCacheSize, readCacheSize, readAheadCacheBatchSize); + statsLogger, allocator, writeCacheSize, readCacheSize, readAheadCacheBatchSize, + readAheadCacheBatchBytesSize); } @Override diff --git a/conf/bk_server.conf b/conf/bk_server.conf index f7dbf380329..c0a021418d9 100755 --- a/conf/bk_server.conf +++ b/conf/bk_server.conf @@ -749,6 +749,9 @@ gcEntryLogMetadataCacheEnabled=false # By default it will be allocated to 25% of the available direct memory # dbStorage_readAheadCacheMaxSizeMb= +# How many entries' bytes to pre-fill in cache after a read cache miss. Default is -1. 0 or less disables this feature +# dbStorage_readAheadCacheBatchBytesSize=-1 + # How many entries to pre-fill in cache after a read cache miss # dbStorage_readAheadCacheBatchSize=100 From 64d0b16793871e5c454cb574a8ef4364ae7febb0 Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Wed, 31 Jul 2024 11:17:28 +0800 Subject: [PATCH 176/233] [Branch-4.16] Fix ReadOnlyLedgerHandle leak issue when checkAllLedgers (#4469) * Enhance the SimpleTestCommand test, make it cover more case. * Fix ReadOnlyLedgerHandle leak issue when checkAllLedgers. * code clean. --- .../bookkeeper/replication/AuditorCheckAllLedgersTask.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java index 580fa605383..291561df288 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorCheckAllLedgersTask.java @@ -210,6 +210,7 @@ void checkAllLedgers() throws BKException, IOException, InterruptedException { auditorStats.getNumFragmentsPerLedger().registerSuccessfulValue(lh.getNumFragments()); auditorStats.getNumBookiesPerLedger().registerSuccessfulValue(lh.getNumBookies()); auditorStats.getNumLedgersChecked().inc(); + lh.closeAsync(); }); } else if (BKException.Code.NoSuchLedgerExistsOnMetadataServerException == rc) { if (LOG.isDebugEnabled()) { From 8cc815e84f719e085d13a09f1d31ed56a55350e4 Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Mon, 8 Jul 2024 17:17:08 +0800 Subject: [PATCH 177/233] Correct RackawareEnsemblePlacementPolicyImpl defaultRack when the bookie is not available. (#4439) When the bookie is not available, the RackawareEnsemblePlacementPolicyImpl default rack will be `/default-region/default-rack`, it should be `/default-rack` for RackawareEnsemblePlacementPolicyImpl. There are some logs. ``` 2024-06-17T05:22:46,591+0000 [ReplicationWorker] ERROR org.apache.bookkeeper.client.TopologyAwareEnsemblePlacementPolicy - Cannot resolve bookieId `test-bk-3:3181` to a network address, resolving as /default-region/default-rack org.apache.bookkeeper.proto.BookieAddressResolver$BookieIdNotResolvedException: Cannot resolve bookieId test-bk-3:3181, bookie does not exist or it is not running at org.apache.bookkeeper.client.DefaultBookieAddressResolver.resolve(DefaultBookieAddressResolver.java:66) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.client.TopologyAwareEnsemblePlacementPolicy.resolveNetworkLocation(TopologyAwareEnsemblePlacementPolicy.java:821) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.client.TopologyAwareEnsemblePlacementPolicy.createBookieNode(TopologyAwareEnsemblePlacementPolicy.java:811) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.client.TopologyAwareEnsemblePlacementPolicy.convertBookieToNode(TopologyAwareEnsemblePlacementPolicy.java:845) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.client.TopologyAwareEnsemblePlacementPolicy.convertBookiesToNodes(TopologyAwareEnsemblePlacementPolicy.java:837) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.client.RackawareEnsemblePlacementPolicyImpl.replaceBookie(RackawareEnsemblePlacementPolicyImpl.java:474) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.client.RackawareEnsemblePlacementPolicy.replaceBookie(RackawareEnsemblePlacementPolicy.java:119) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.client.BookKeeperAdmin.getReplacementBookiesByIndexes(BookKeeperAdmin.java:993) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.client.BookKeeperAdmin.replicateLedgerFragment(BookKeeperAdmin.java:1025) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.replication.ReplicationWorker.rereplicate(ReplicationWorker.java:473) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.replication.ReplicationWorker.rereplicate(ReplicationWorker.java:301) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.replication.ReplicationWorker.run(ReplicationWorker.java:249) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) ~[io.netty-netty-common-4.1.108.Final.jar:4.1.108.Final] at java.lang.Thread.run(Thread.java:840) ~[?:?] Caused by: org.apache.bookkeeper.client.BKException$BKBookieHandleNotAvailableException: Bookie handle is not available at org.apache.bookkeeper.discover.ZKRegistrationClient.getBookieServiceInfo(ZKRegistrationClient.java:226) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] at org.apache.bookkeeper.client.DefaultBookieAddressResolver.resolve(DefaultBookieAddressResolver.java:45) ~[io.streamnative-bookkeeper-server-4.16.5.2.jar:4.16.5.2] ... 13 more ``` (cherry picked from commit fb7138329ff2faaa3e10fb4f2028e2aaac28843e) --- .../RackawareEnsemblePlacementPolicyImpl.java | 1 + .../TopologyAwareEnsemblePlacementPolicy.java | 12 ++-- .../TestRackawareEnsemblePlacementPolicy.java | 64 +++++++++++++++++++ 3 files changed, 73 insertions(+), 4 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java index 4f9ed29f15e..64e7951df33 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java @@ -241,6 +241,7 @@ public RackawareEnsemblePlacementPolicyImpl withDefaultRack(String rack) { return this; } + @Override public String getDefaultRack() { return defaultRack; } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/TopologyAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/TopologyAwareEnsemblePlacementPolicy.java index 463d9599de2..9eae79438fd 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/TopologyAwareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/TopologyAwareEnsemblePlacementPolicy.java @@ -824,13 +824,17 @@ protected String resolveNetworkLocation(BookieId addr) { if (null != historyBookie) { return historyBookie.getNetworkLocation(); } - - LOG.error("Cannot resolve bookieId {} to a network address, resolving as {}", addr, - NetworkTopology.DEFAULT_REGION_AND_RACK, err); - return NetworkTopology.DEFAULT_REGION_AND_RACK; + String defaultRack = getDefaultRack(); + LOG.error("Cannot resolve bookieId {} to a network address, resolving as {}. {}", addr, + defaultRack, err.getMessage()); + return defaultRack; } } + protected String getDefaultRack() { + return NetworkTopology.DEFAULT_REGION_AND_RACK; + } + protected Set convertBookiesToNodes(Collection bookies) { Set nodes = new HashSet(); for (BookieId addr : bookies) { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java index 4d0606f9021..857458296e8 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java @@ -29,6 +29,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.netty.util.HashedWheelTimer; import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -40,6 +41,7 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import junit.framework.TestCase; import org.apache.bookkeeper.client.BKException.BKNotEnoughBookiesException; @@ -2270,6 +2272,68 @@ public void testNodeWithFailures() throws Exception { assertEquals(ensemble.get(reoderSet.get(3)), addr2.toBookieId()); assertEquals(ensemble.get(reoderSet.get(0)), addr3.toBookieId()); assertEquals(ensemble.get(reoderSet.get(1)), addr4.toBookieId()); + StaticDNSResolver.reset(); + } + + @Test + public void testReplaceNotAvailableBookieWithDefaultRack() throws Exception { + repp.uninitalize(); + repp.withDefaultRack(NetworkTopology.DEFAULT_RACK); + AtomicInteger counter = new AtomicInteger(); + BookieAddressResolver mockResolver = new BookieAddressResolver() { + @Override + public BookieSocketAddress resolve(BookieId bookieId) throws BookieIdNotResolvedException { + if (bookieId.equals(addr1.toBookieId()) && counter.getAndIncrement() >= 1) { + throw new BookieIdNotResolvedException(bookieId, + new RuntimeException(addr1.toBookieId() + " shutdown")); + } + try { + return new BookieSocketAddress(bookieId.toString()); + } catch (UnknownHostException err) { + throw new BookieIdNotResolvedException(bookieId, err); + } + } + }; + + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, NullStatsLogger.INSTANCE, + mockResolver); + BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181); + BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.3", 3181); + BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.4", 3181); + BookieSocketAddress addr4 = new BookieSocketAddress("127.0.0.5", 3181); + // update dns mapping + StaticDNSResolver.addNodeToRack(addr1.getHostName(), NetworkTopology.DEFAULT_RACK); + StaticDNSResolver.addNodeToRack(addr2.getHostName(), "/r1"); + StaticDNSResolver.addNodeToRack(addr3.getHostName(), "/r1"); + StaticDNSResolver.addNodeToRack(addr4.getHostName(), NetworkTopology.DEFAULT_RACK); + + // Update cluster + Set addrs = new HashSet(); + addrs.add(addr1.toBookieId()); + addrs.add(addr2.toBookieId()); + addrs.add(addr3.toBookieId()); + addrs.add(addr4.toBookieId()); + repp.onClusterChanged(addrs, new HashSet()); + + // replace node under r1 + EnsemblePlacementPolicy.PlacementResult replaceBookieResponse = + repp.replaceBookie(1, 1, 1, null, new ArrayList<>(), addr1.toBookieId(), new HashSet<>()); + BookieId replacedBookie = replaceBookieResponse.getResult(); + assertEquals(addr4.toBookieId(), replacedBookie); + + //clear history bookies and make addr1 shutdown. + repp = new RackawareEnsemblePlacementPolicy(); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, NullStatsLogger.INSTANCE, + mockResolver); + + addrs.remove(addr1.toBookieId()); + repp.onClusterChanged(addrs, new HashSet()); + + // replace node under r1 again + replaceBookieResponse = + repp.replaceBookie(1, 1, 1, null, new ArrayList<>(), addr1.toBookieId(), new HashSet<>()); + replacedBookie = replaceBookieResponse.getResult(); + assertEquals(addr4.toBookieId(), replacedBookie); } @Test From f51f5842ce9b5219d2aaca77fd6576ec34cc90ff Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Tue, 9 Jul 2024 09:44:45 +0800 Subject: [PATCH 178/233] Fix the completionObjects leak problem. (#4285) (cherry picked from commit 772b162e4a610918403e45fbb3ad358dd6a01ad3) --- .../java/org/apache/bookkeeper/proto/PerChannelBookieClient.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java index 149f97fc28b..a3475533f1a 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java @@ -1162,6 +1162,7 @@ private void writeAndFlush(final Channel channel, } } else { nettyOpLogger.registerFailedEvent(MathUtils.elapsedNanos(startTime), TimeUnit.NANOSECONDS); + errorOut(key); } } finally { if (cleanupActionAfterWrite != null) { From 66e84adefa932d60dec7a41763e132fa0e2c41cd Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Mon, 29 Jul 2024 14:33:02 +0800 Subject: [PATCH 179/233] fix: install netcat-openbsd instead of netcat in test image build (#4476) Signed-off-by: ZhangJian He (cherry picked from commit 56625245d53ce37525fc3f8eb4f3274beecf52eb) --- tests/docker-images/all-released-versions-image/Dockerfile | 4 ++-- tests/docker-images/current-version-image/Dockerfile | 2 +- tests/docker-images/statestore-image/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/docker-images/all-released-versions-image/Dockerfile b/tests/docker-images/all-released-versions-image/Dockerfile index a8c761c7e88..b7fd4e2fd10 100644 --- a/tests/docker-images/all-released-versions-image/Dockerfile +++ b/tests/docker-images/all-released-versions-image/Dockerfile @@ -17,7 +17,7 @@ # under the License. # -FROM eclipse-temurin:8-jdk +FROM eclipse-temurin:8-jdk-jammy MAINTAINER Apache BookKeeper ENV BK_JOURNALDIR=/opt/bookkeeper/data/journal @@ -31,7 +31,7 @@ RUN sed -i -e "s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-http://arc -e "s|http://security\.ubuntu\.com/ubuntu/|${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}|g" /etc/apt/sources.list \ && echo 'Acquire::http::Timeout "30";\nAcquire::http::ConnectionAttemptDelayMsec "2000";\nAcquire::https::Timeout "30";\nAcquire::https::ConnectionAttemptDelayMsec "2000";\nAcquire::ftp::Timeout "30";\nAcquire::ftp::ConnectionAttemptDelayMsec "2000";\nAcquire::Retries "15";' > /etc/apt/apt.conf.d/99timeout_and_retries \ && apt-get update && apt-get install -qy wget curl supervisor bash ca-certificates apt-transport-https \ - && apt-get -y install netcat dnsutils less procps iputils-ping \ + && apt-get -y install netcat-openbsd dnsutils less procps iputils-ping \ && apt-get install -y --no-install-recommends gpg gpg-agent sudo \ && echo "dash dash/sh boolean false" | debconf-set-selections \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash \ diff --git a/tests/docker-images/current-version-image/Dockerfile b/tests/docker-images/current-version-image/Dockerfile index 0e489eb5ea6..ae171625f4f 100644 --- a/tests/docker-images/current-version-image/Dockerfile +++ b/tests/docker-images/current-version-image/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && apt-get install -y --no-install-recommends python3 pip \ && ln -s /usr/bin/python3 /usr/bin/python \ && apt-get install -y --no-install-recommends gpg gpg-agent wget sudo \ - && apt-get -y install netcat dnsutils less procps iputils-ping \ + && apt-get -y install netcat-openbsd dnsutils less procps iputils-ping \ && apt-get -y --purge autoremove \ && apt-get autoclean \ && apt-get clean \ diff --git a/tests/docker-images/statestore-image/Dockerfile b/tests/docker-images/statestore-image/Dockerfile index 5a7a1688855..974d11b50c8 100644 --- a/tests/docker-images/statestore-image/Dockerfile +++ b/tests/docker-images/statestore-image/Dockerfile @@ -40,7 +40,7 @@ RUN set -x \ && apt-get install -y --no-install-recommends openjdk-17-jdk \ && apt-get install -y --no-install-recommends python3 pip \ && ln -s /usr/bin/python3 /usr/bin/python \ - && apt-get -y install netcat dnsutils less procps iputils-ping \ + && apt-get -y install netcat-openbsd dnsutils less procps iputils-ping \ && apt-get install -y --no-install-recommends gpg gpg-agent wget sudo \ && apt-get -y --purge autoremove \ && apt-get autoclean \ From 0ce47aa9aeb127b2d68a11f7f48dadc15a211f44 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Wed, 19 Mar 2025 10:26:02 +0800 Subject: [PATCH 180/233] Change the new ensemble log to info level (#4566) --- ### Motivation Change the new ensemble log to the info level. Sometimes, the ensemble may not satisfied with the placement policy. The log should be info level but not a warn level. Because it will fix by the auto recovery later, so this just a information from the ensemble choose. (cherry picked from commit a12943df277e698a1621d33c245913365d031257) --- .../java/org/apache/bookkeeper/client/BookieWatcherImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcherImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcherImpl.java index 978842b114a..f7af1549286 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcherImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcherImpl.java @@ -273,7 +273,7 @@ public List newEnsemble(int ensembleSize, int writeQuorumSize, if (isEnsembleAdheringToPlacementPolicy == PlacementPolicyAdherence.FAIL) { ensembleNotAdheringToPlacementPolicy.inc(); if (ensembleSize > 1) { - log.warn("New ensemble: {} is not adhering to Placement Policy. quarantinedBookies: {}", + log.info("New ensemble: {} is not adhering to Placement Policy. quarantinedBookies: {}", socketAddresses, quarantinedBookiesSet); } } @@ -289,7 +289,7 @@ public List newEnsemble(int ensembleSize, int writeQuorumSize, isEnsembleAdheringToPlacementPolicy = newEnsembleResponse.getAdheringToPolicy(); if (isEnsembleAdheringToPlacementPolicy == PlacementPolicyAdherence.FAIL) { ensembleNotAdheringToPlacementPolicy.inc(); - log.warn("New ensemble: {} is not adhering to Placement Policy", socketAddresses); + log.info("New ensemble: {} is not adhering to Placement Policy", socketAddresses); } newEnsembleTimer.registerFailedEvent(MathUtils.nowInNano() - startTime, TimeUnit.NANOSECONDS); } From fbd33b56210bc17965c2d4bf0d835c44c5d4836f Mon Sep 17 00:00:00 2001 From: danpi Date: Tue, 1 Apr 2025 11:53:36 +0800 Subject: [PATCH 181/233] Fix SST files not being cleaned up in the locations folder (#4555) * fix entry location compaction * replace entryLocationCompactionEnable with entryLocationCompactionInterval * Add randomCompactionDelay to avoid all the bookies triggering compaction simultaneously * Fix the style issue * Fix the style issue * Fix test --------- Co-authored-by: houbonan Co-authored-by: zymap (cherry picked from commit ede1ba972cf0458ca1dc00338b5feb5b0f617aa2) --- .../bookie/BookKeeperServerStats.java | 1 + .../bookie/GarbageCollectionStatus.java | 2 + .../bookie/GarbageCollectorThread.java | 38 ++++++++++++++++++- .../bookie/stats/GarbageCollectorStats.java | 7 ++++ .../ldb/SingleDirectoryDbLedgerStorage.java | 2 + .../bookkeeper/conf/ServerConfiguration.java | 30 +++++++++++++++ .../conf/TestServerConfiguration.java | 20 ++++++++++ conf/bk_server.conf | 5 +++ 8 files changed, 104 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookKeeperServerStats.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookKeeperServerStats.java index d4657d20362..361861cda14 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookKeeperServerStats.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookKeeperServerStats.java @@ -150,6 +150,7 @@ public interface BookKeeperServerStats { String THREAD_RUNTIME = "THREAD_RUNTIME"; String MAJOR_COMPACTION_COUNT = "MAJOR_COMPACTION_TOTAL"; String MINOR_COMPACTION_COUNT = "MINOR_COMPACTION_TOTAL"; + String ENTRY_LOCATION_COMPACTION_COUNT = "ENTRY_LOCATION_COMPACTION_TOTAL"; String ACTIVE_LEDGER_COUNT = "ACTIVE_LEDGER_TOTAL"; String DELETED_LEDGER_COUNT = "DELETED_LEDGER_TOTAL"; diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectionStatus.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectionStatus.java index 3f872092f01..4ad450a64f1 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectionStatus.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectionStatus.java @@ -42,6 +42,8 @@ public class GarbageCollectionStatus { private long lastMajorCompactionTime; private long lastMinorCompactionTime; + private long lastEntryLocationCompactionTime; private long majorCompactionCounter; private long minorCompactionCounter; + private long entryLocationCompactionCounter; } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java index 4a1c0289879..5abf79b2e64 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java @@ -33,6 +33,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -85,6 +86,10 @@ public class GarbageCollectorThread implements Runnable { long majorCompactionMaxTimeMillis; long lastMajorCompactionTime; + final long entryLocationCompactionInterval; + long randomCompactionDelay; + long lastEntryLocationCompactionTime; + @Getter final boolean isForceGCAllowWhenNoSpace; @@ -196,6 +201,10 @@ public GarbageCollectorThread(ServerConfiguration conf, isForceGCAllowWhenNoSpace = conf.getIsForceGCAllowWhenNoSpace(); majorCompactionMaxTimeMillis = conf.getMajorCompactionMaxTimeMillis(); minorCompactionMaxTimeMillis = conf.getMinorCompactionMaxTimeMillis(); + entryLocationCompactionInterval = conf.getEntryLocationCompactionInterval() * SECOND; + if (entryLocationCompactionInterval > 0) { + randomCompactionDelay = ThreadLocalRandom.current().nextLong(entryLocationCompactionInterval); + } boolean isForceAllowCompaction = conf.isForceAllowCompaction(); @@ -262,12 +271,22 @@ public void removeEntryLog(long logToRemove) { } } + if (entryLocationCompactionInterval > 0) { + if (entryLocationCompactionInterval < gcWaitTime) { + throw new IOException( + "Too short entry location compaction interval : " + entryLocationCompactionInterval); + } + } + LOG.info("Minor Compaction : enabled=" + enableMinorCompaction + ", threshold=" + minorCompactionThreshold + ", interval=" + minorCompactionInterval); LOG.info("Major Compaction : enabled=" + enableMajorCompaction + ", threshold=" + majorCompactionThreshold + ", interval=" + majorCompactionInterval); + LOG.info("Entry Location Compaction : interval=" + entryLocationCompactionInterval + ", randomCompactionDelay=" + + randomCompactionDelay); - lastMinorCompactionTime = lastMajorCompactionTime = System.currentTimeMillis(); + lastMinorCompactionTime = lastMajorCompactionTime = + lastEntryLocationCompactionTime = System.currentTimeMillis(); } private EntryLogMetadataMap createEntryLogMetadataMap() throws IOException { @@ -445,6 +464,7 @@ public void runWithFlags(boolean force, boolean suspendMajor, boolean suspendMin gcStats.getMajorCompactionCounter().inc(); majorCompacting.set(false); } + } else if (((isForceMinorCompactionAllow && force) || (enableMinorCompaction && (force || curTime - lastMinorCompactionTime > minorCompactionInterval))) && (!suspendMinor)) { @@ -459,6 +479,20 @@ public void runWithFlags(boolean force, boolean suspendMajor, boolean suspendMin minorCompacting.set(false); } } + if (entryLocationCompactionInterval > 0 && (curTime - lastEntryLocationCompactionTime > ( + entryLocationCompactionInterval + randomCompactionDelay))) { + // enter entry location compaction + LOG.info( + "Enter entry location compaction, entryLocationCompactionInterval {}, randomCompactionDelay " + + "{}, lastEntryLocationCompactionTime {}", + entryLocationCompactionInterval, randomCompactionDelay, lastEntryLocationCompactionTime); + ledgerStorage.entryLocationCompact(); + lastEntryLocationCompactionTime = System.currentTimeMillis(); + randomCompactionDelay = ThreadLocalRandom.current().nextLong(entryLocationCompactionInterval); + LOG.info("Next entry location compaction interval {}", + entryLocationCompactionInterval + randomCompactionDelay); + gcStats.getEntryLocationCompactionCounter().inc(); + } gcStats.getGcThreadRuntime().registerSuccessfulEvent( MathUtils.nowInNano() - threadStart, TimeUnit.NANOSECONDS); } catch (EntryLogMetadataMapException e) { @@ -796,8 +830,10 @@ public GarbageCollectionStatus getGarbageCollectionStatus() { .minorCompacting(minorCompacting.get()) .lastMajorCompactionTime(lastMajorCompactionTime) .lastMinorCompactionTime(lastMinorCompactionTime) + .lastEntryLocationCompactionTime(lastEntryLocationCompactionTime) .majorCompactionCounter(gcStats.getMajorCompactionCounter().get()) .minorCompactionCounter(gcStats.getMinorCompactionCounter().get()) + .entryLocationCompactionCounter(gcStats.getEntryLocationCompactionCounter().get()) .build(); } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/stats/GarbageCollectorStats.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/stats/GarbageCollectorStats.java index 1c9475608f4..3029e7d55b7 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/stats/GarbageCollectorStats.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/stats/GarbageCollectorStats.java @@ -25,6 +25,7 @@ import static org.apache.bookkeeper.bookie.BookKeeperServerStats.BOOKIE_SCOPE; import static org.apache.bookkeeper.bookie.BookKeeperServerStats.CATEGORY_SERVER; import static org.apache.bookkeeper.bookie.BookKeeperServerStats.DELETED_LEDGER_COUNT; +import static org.apache.bookkeeper.bookie.BookKeeperServerStats.ENTRY_LOCATION_COMPACTION_COUNT; import static org.apache.bookkeeper.bookie.BookKeeperServerStats.MAJOR_COMPACTION_COUNT; import static org.apache.bookkeeper.bookie.BookKeeperServerStats.MINOR_COMPACTION_COUNT; import static org.apache.bookkeeper.bookie.BookKeeperServerStats.RECLAIMED_COMPACTION_SPACE_BYTES; @@ -61,6 +62,11 @@ public class GarbageCollectorStats { help = "Number of major compactions" ) private final Counter majorCompactionCounter; + @StatsDoc( + name = ENTRY_LOCATION_COMPACTION_COUNT, + help = "Number of entry location compactions" + ) + private final Counter entryLocationCompactionCounter; @StatsDoc( name = RECLAIMED_DELETION_SPACE_BYTES, help = "Number of disk space bytes reclaimed via deleting entry log files" @@ -105,6 +111,7 @@ public GarbageCollectorStats(StatsLogger statsLogger, this.minorCompactionCounter = statsLogger.getCounter(MINOR_COMPACTION_COUNT); this.majorCompactionCounter = statsLogger.getCounter(MAJOR_COMPACTION_COUNT); + this.entryLocationCompactionCounter = statsLogger.getCounter(ENTRY_LOCATION_COMPACTION_COUNT); this.reclaimedSpaceViaCompaction = statsLogger.getCounter(RECLAIMED_COMPACTION_SPACE_BYTES); this.reclaimedSpaceViaDeletes = statsLogger.getCounter(RECLAIMED_DELETION_SPACE_BYTES); this.gcThreadRuntime = statsLogger.getOpStatsLogger(THREAD_RUNTIME); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java index 61aebd8e1a1..867ba905ffe 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java @@ -313,6 +313,8 @@ public boolean isMinorGcSuspended() { public void entryLocationCompact() { if (entryLocationIndex.isCompacting()) { // RocksDB already running compact. + log.info("Compacting directory {}, skipping this entryLocationCompaction this time.", + entryLocationIndex.getEntryLocationDBPath()); return; } cleanupExecutor.execute(() -> { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java index 019144e9942..1f04e53f575 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java @@ -105,6 +105,7 @@ public class ServerConfiguration extends AbstractConfigurationIf it is set to less than zero, the entry location compaction is disabled. + * + * @return high water mark. + */ + public long getEntryLocationCompactionInterval() { + return getLong(ENTRY_LOCATION_COMPACTION_INTERVAL, -1); + } + + /** + * Set interval to run entry location compaction. + * + * @see #getMajorCompactionInterval() + * + * @param interval + * Interval to run entry location compaction + * @return server configuration + */ + public ServerConfiguration setEntryLocationCompactionInterval(long interval) { + setProperty(ENTRY_LOCATION_COMPACTION_INTERVAL, interval); + return this; + } + /** * Should we remove pages from page cache after force write. * @@ -3187,6 +3213,10 @@ public void validate() throws ConfigurationException { if (getMajorCompactionInterval() > 0 && getMajorCompactionInterval() * SECOND < getGcWaitTime()) { throw new ConfigurationException("majorCompactionInterval should be >= gcWaitTime."); } + if (getEntryLocationCompactionInterval() > 0 + && getEntryLocationCompactionInterval() * SECOND < getGcWaitTime()) { + throw new ConfigurationException("entryLocationCompactionInterval should be >= gcWaitTime."); + } } /** diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/TestServerConfiguration.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/TestServerConfiguration.java index 04ac87818f7..d8aa62d0d23 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/TestServerConfiguration.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/TestServerConfiguration.java @@ -158,6 +158,7 @@ public void testEntryLogSizeLimit() throws ConfigurationException { public void testCompactionSettings() throws ConfigurationException { ServerConfiguration conf = new ServerConfiguration(); long major, minor; + long entryLocationCompactionInterval; // Default Values major = conf.getMajorCompactionMaxTimeMillis(); @@ -239,5 +240,24 @@ public void testCompactionSettings() throws ConfigurationException { minorThreshold = conf.getMinorCompactionThreshold(); Assert.assertEquals(0.6, majorThreshold, 0.00001); Assert.assertEquals(0.3, minorThreshold, 0.00001); + + // Default Values + entryLocationCompactionInterval = conf.getEntryLocationCompactionInterval(); + Assert.assertEquals(-1, entryLocationCompactionInterval); + + // Set entry location compaction + conf.setEntryLocationCompactionInterval(3600); + entryLocationCompactionInterval = conf.getEntryLocationCompactionInterval(); + Assert.assertEquals(3600, entryLocationCompactionInterval); + + conf.setEntryLocationCompactionInterval(550); + try { + conf.validate(); + fail(); + } catch (ConfigurationException ignore) { + } + + conf.setEntryLocationCompactionInterval(650); + conf.validate(); } } diff --git a/conf/bk_server.conf b/conf/bk_server.conf index c0a021418d9..be3d845fadc 100755 --- a/conf/bk_server.conf +++ b/conf/bk_server.conf @@ -581,6 +581,11 @@ ledgerDirectories=/tmp/bk-data # Set the rate at which compaction will readd entries. The unit is bytes added per second. # compactionRateByBytes=1000000 +# Interval to run entry location compaction, in seconds +# If it is set to less than zero, the entry location compaction is disabled. +# Note: should be greater than gcWaitTime. +# entryLocationCompactionInterval=-1 + # Flag to enable/disable transactional compaction. If it is set to true, it will use transactional compaction, # which it will use new entry log files to store compacted entries during compaction; if it is set to false, # it will use normal compaction, which it shares same entry log file with normal add operations. From 47c3fc37a075b0bb991f8ecabb91415a04dcb1ec Mon Sep 17 00:00:00 2001 From: Dmitry Kryukov Date: Sat, 6 Jul 2024 04:12:13 +0300 Subject: [PATCH 182/233] fix: fix resource leaks in 3 classes (#4449) (cherry picked from commit a164bcae6462f0f7078372cae3549d91989f7383) --- .../http/service/DeleteLedgerService.java | 21 ++++++++++--------- .../BKDistributedLogNamespace.java | 7 ++++--- .../impl/BKNamespaceDriver.java | 3 +-- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DeleteLedgerService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DeleteLedgerService.java index b4d465650c3..57cc127908d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DeleteLedgerService.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DeleteLedgerService.java @@ -56,19 +56,20 @@ public HttpServiceResponse handle(HttpServiceRequest request) throws Exception { if (params != null && params.containsKey("ledger_id")) { ClientConfiguration clientConf = new ClientConfiguration(); clientConf.addConfiguration(conf); - BookKeeper bk = new BookKeeper(clientConf); - Long ledgerId = Long.parseLong(params.get("ledger_id")); + try (BookKeeper bk = new BookKeeper(clientConf)) { + Long ledgerId = Long.parseLong(params.get("ledger_id")); - bk.deleteLedger(ledgerId); + bk.deleteLedger(ledgerId); - String output = "Deleted ledger: " + ledgerId; - String jsonResponse = JsonUtil.toJson(output); - if (LOG.isDebugEnabled()) { - LOG.debug("output body:" + jsonResponse); + String output = "Deleted ledger: " + ledgerId; + String jsonResponse = JsonUtil.toJson(output); + if (LOG.isDebugEnabled()) { + LOG.debug("output body:" + jsonResponse); + } + response.setBody(jsonResponse); + response.setCode(HttpServer.StatusCode.OK); + return response; } - response.setBody(jsonResponse); - response.setCode(HttpServer.StatusCode.OK); - return response; } else { response.setCode(HttpServer.StatusCode.NOT_FOUND); response.setBody("Not ledger found. Should provide ledger_id="); diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/BKDistributedLogNamespace.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/BKDistributedLogNamespace.java index 0a3677d9560..8ed2cfeb362 100644 --- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/BKDistributedLogNamespace.java +++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/BKDistributedLogNamespace.java @@ -158,12 +158,13 @@ public void deleteLog(String logName) if (!uri.isPresent()) { throw new LogNotFoundException("Log " + logName + " isn't found."); } - DistributedLogManager dlm = openLogInternal( + try (DistributedLogManager dlm = openLogInternal( uri.get(), logName, Optional.empty(), - Optional.empty()); - dlm.delete(); + Optional.empty())) { + dlm.delete(); + } } @Override diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/BKNamespaceDriver.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/BKNamespaceDriver.java index ea17ed76931..957995b3fd6 100644 --- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/BKNamespaceDriver.java +++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/BKNamespaceDriver.java @@ -533,8 +533,7 @@ public Map enumerateLogsWithMetadataInNamespace() String namespaceRootPath = namespace.getPath(); HashMap result = new HashMap(); ZooKeeperClient zkc = writerZKC; - try { - ZooKeeper zk = Utils.sync(zkc, namespaceRootPath); + try (ZooKeeper zk = Utils.sync(zkc, namespaceRootPath)) { Stat currentStat = zk.exists(namespaceRootPath, false); if (currentStat == null) { return result; From 6fbc3c06445784d3186d0ecd52a28a2ff2e78904 Mon Sep 17 00:00:00 2001 From: Masahiro Sakamoto Date: Wed, 10 Jul 2024 15:07:29 +0900 Subject: [PATCH 183/233] Enable ZooKeeper client to establish connection in read-only mode (#4244) ### Motivation If the system property `readonlymode.enabled` is set to true on a ZooKeeper server, read-only mode is enabled. Data can be read from the server in read-only mode even if that server is split from the quorum. https://zookeeper.apache.org/doc/current/zookeeperAdmin.html#Experimental+Options%2FFeatures To connect to the server in read-only mode, the client must also allow read-only mode. The `ZooKeeperClient` class in the bookkeeper repository also has an option called `allowReadOnlyMode`. https://github.com/apache/bookkeeper/blob/15171e1904f7196d8e9f4116ab2aecdf582e0032/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperClient.java#L219-L222 However, even if this option is set to true, the connection to the server in read-only mode will actually fail. The cause is in the `ZooKeeperWatcherBase` class. When the `ZooKeeperWatcherBase` class receives the `SyncConnected` event, it releases `clientConnectLatch` and assumes that the connection is complete. https://github.com/apache/bookkeeper/blob/15171e1904f7196d8e9f4116ab2aecdf582e0032/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperWatcherBase.java#L128-L144 However, if the server is in read-only mode, it will receive `ConnectedReadOnly` instead of `SyncConnected`. This causes the connection to time out without being completed. ### Changes Modified the switch statement in the `ZooKeeperWatcherBase` class to release `clientConnectLatch` when `ConnectedReadOnly` is received if the `allowReadOnlyMode` option is true. By the way, `allowReadOnlyMode` is never set to true in BookKeeper. So this change would be useless for BookKeeper. However, it is useful for Pulsar. Because Pulsar also uses `ZooKeeperWatcherBase` and needs to be able to connect to ZooKeeper in read-only mode. https://github.com/apache/pulsar/blob/cba1600d0f6a82f1ea194f3214a80f283fe8dc27/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java#L242-L244 (cherry picked from commit 4d50a445553a3a5d4af3aed973ac64bcd4132789) --- .../bookkeeper/zookeeper/ZooKeeperClient.java | 6 ++-- .../zookeeper/ZooKeeperWatcherBase.java | 19 +++++++++--- .../BookKeeperClientZKSessionExpiry.java | 2 +- .../bookkeeper/client/BookKeeperTest.java | 2 +- .../replication/TestReplicationWorker.java | 2 +- .../bookkeeper/test/ZooKeeperCluster.java | 2 +- .../bookkeeper/test/ZooKeeperClusterUtil.java | 8 +++++ .../zookeeper/TestZooKeeperClient.java | 30 ++++++++++++++++++- 8 files changed, 59 insertions(+), 12 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperClient.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperClient.java index c742f829e0f..3bddcb2f2ba 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperClient.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperClient.java @@ -241,9 +241,9 @@ public ZooKeeperClient build() throws IOException, KeeperException, InterruptedE // Create a watcher manager StatsLogger watcherStatsLogger = statsLogger.scope("watcher"); - ZooKeeperWatcherBase watcherManager = - null == watchers ? new ZooKeeperWatcherBase(sessionTimeoutMs, watcherStatsLogger) : - new ZooKeeperWatcherBase(sessionTimeoutMs, watchers, watcherStatsLogger); + ZooKeeperWatcherBase watcherManager = (null == watchers) + ? new ZooKeeperWatcherBase(sessionTimeoutMs, allowReadOnlyMode, watcherStatsLogger) + : new ZooKeeperWatcherBase(sessionTimeoutMs, allowReadOnlyMode, watchers, watcherStatsLogger); ZooKeeperClient client = new ZooKeeperClient( connectString, sessionTimeoutMs, diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperWatcherBase.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperWatcherBase.java index 758f079d0da..e44a5f364cd 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperWatcherBase.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperWatcherBase.java @@ -44,6 +44,7 @@ public class ZooKeeperWatcherBase implements Watcher { .getLogger(ZooKeeperWatcherBase.class); private final int zkSessionTimeOut; + private final boolean allowReadOnlyMode; private volatile CountDownLatch clientConnectLatch = new CountDownLatch(1); private final CopyOnWriteArraySet childWatchers = new CopyOnWriteArraySet(); @@ -53,18 +54,20 @@ public class ZooKeeperWatcherBase implements Watcher { private final ConcurrentHashMap eventCounters = new ConcurrentHashMap(); - public ZooKeeperWatcherBase(int zkSessionTimeOut) { - this(zkSessionTimeOut, NullStatsLogger.INSTANCE); + public ZooKeeperWatcherBase(int zkSessionTimeOut, boolean allowReadOnlyMode) { + this(zkSessionTimeOut, allowReadOnlyMode, NullStatsLogger.INSTANCE); } - public ZooKeeperWatcherBase(int zkSessionTimeOut, StatsLogger statsLogger) { - this(zkSessionTimeOut, new HashSet(), statsLogger); + public ZooKeeperWatcherBase(int zkSessionTimeOut, boolean allowReadOnlyMode, StatsLogger statsLogger) { + this(zkSessionTimeOut, allowReadOnlyMode, new HashSet(), statsLogger); } public ZooKeeperWatcherBase(int zkSessionTimeOut, + boolean allowReadOnlyMode, Set childWatchers, StatsLogger statsLogger) { this.zkSessionTimeOut = zkSessionTimeOut; + this.allowReadOnlyMode = allowReadOnlyMode; this.childWatchers.addAll(childWatchers); this.statsLogger = statsLogger; } @@ -130,6 +133,14 @@ public void process(WatchedEvent event) { LOG.info("ZooKeeper client is connected now."); clientConnectLatch.countDown(); break; + case ConnectedReadOnly: + if (allowReadOnlyMode) { + LOG.info("ZooKeeper client is connected in read-only mode now."); + clientConnectLatch.countDown(); + } else { + LOG.warn("ZooKeeper client is connected in read-only mode, which is not allowed."); + } + break; case Disconnected: LOG.info("ZooKeeper client is disconnected from zookeeper now," + " but it is OK unless we received EXPIRED event."); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperClientZKSessionExpiry.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperClientZKSessionExpiry.java index b1a8bb66dd7..c72834397e0 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperClientZKSessionExpiry.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperClientZKSessionExpiry.java @@ -51,7 +51,7 @@ public void run() { byte[] sessionPasswd = bkc.getZkHandle().getSessionPasswd(); try { - ZooKeeperWatcherBase watcher = new ZooKeeperWatcherBase(10000); + ZooKeeperWatcherBase watcher = new ZooKeeperWatcherBase(10000, false); ZooKeeper zk = new ZooKeeper(zkUtil.getZooKeeperConnectString(), 10000, watcher, sessionId, sessionPasswd); zk.close(); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java index 8f64c256a43..386a83709e3 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java @@ -901,7 +901,7 @@ protected ZooKeeper createZooKeeper() throws IOException { public void testZKConnectionLossForLedgerCreation() throws Exception { int zkSessionTimeOut = 10000; AtomicLong ledgerIdToInjectFailure = new AtomicLong(INVALID_LEDGERID); - ZooKeeperWatcherBase zooKeeperWatcherBase = new ZooKeeperWatcherBase(zkSessionTimeOut, + ZooKeeperWatcherBase zooKeeperWatcherBase = new ZooKeeperWatcherBase(zkSessionTimeOut, false, NullStatsLogger.INSTANCE); MockZooKeeperClient zkFaultInjectionWrapper = new MockZooKeeperClient(zkUtil.getZooKeeperConnectString(), zkSessionTimeOut, zooKeeperWatcherBase, ledgerIdToInjectFailure); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java index a9914233899..28f9915cb2c 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java @@ -1040,7 +1040,7 @@ public void testRWShutDownInTheCaseOfZKOperationFailures() throws Exception { * create MockZooKeeperClient instance and wait for it to be connected. */ int zkSessionTimeOut = 10000; - ZooKeeperWatcherBase zooKeeperWatcherBase = new ZooKeeperWatcherBase(zkSessionTimeOut, + ZooKeeperWatcherBase zooKeeperWatcherBase = new ZooKeeperWatcherBase(zkSessionTimeOut, false, NullStatsLogger.INSTANCE); MockZooKeeperClient zkFaultInjectionWrapper = new MockZooKeeperClient(zkUtil.getZooKeeperConnectString(), zkSessionTimeOut, zooKeeperWatcherBase); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperCluster.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperCluster.java index 08ecbd7cc12..b0e828bd5ca 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperCluster.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperCluster.java @@ -64,7 +64,7 @@ void sleepCluster(int time, TimeUnit timeUnit, CountDownLatch l) default void expireSession(ZooKeeper zk) throws Exception { long id = zk.getSessionId(); byte[] password = zk.getSessionPasswd(); - ZooKeeperWatcherBase w = new ZooKeeperWatcherBase(10000); + ZooKeeperWatcherBase w = new ZooKeeperWatcherBase(10000, false); ZooKeeper zk2 = new ZooKeeper(getZooKeeperConnectString(), zk.getSessionTimeout(), w, id, password); w.waitForConnection(); zk2.close(); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperClusterUtil.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperClusterUtil.java index 3eace4a62c5..6dbf182110f 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperClusterUtil.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperClusterUtil.java @@ -139,4 +139,12 @@ public void killCluster() throws Exception { public void sleepCluster(int time, TimeUnit timeUnit, CountDownLatch l) throws InterruptedException, IOException { throw new UnsupportedOperationException("sleepServer operation is not supported for ZooKeeperClusterUtil"); } + + public void stopPeer(int id) throws Exception { + quorumUtil.shutdown(id); + } + + public void enableLocalSession(boolean localSessionEnabled) { + quorumUtil.enableLocalSession(localSessionEnabled); + } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/zookeeper/TestZooKeeperClient.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/zookeeper/TestZooKeeperClient.java index 3c1bd65a64b..9e2ccf16e87 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/zookeeper/TestZooKeeperClient.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/zookeeper/TestZooKeeperClient.java @@ -171,7 +171,7 @@ public void process(WatchedEvent event) { }; final int timeout = 2000; ZooKeeperWatcherBase watcherManager = - new ZooKeeperWatcherBase(timeout).addChildWatcher(testWatcher); + new ZooKeeperWatcherBase(timeout, false).addChildWatcher(testWatcher); List watchers = new ArrayList(1); watchers.add(testWatcher); ZooKeeperClient client = new ShutdownZkServerClient( @@ -895,4 +895,32 @@ public void processResult(int rc, String path, Object ctx) { logger.info("Delete children from znode " + path); } + @Test + public void testAllowReadOnlyMode() throws Exception { + if (zkUtil instanceof ZooKeeperClusterUtil) { + System.setProperty("readonlymode.enabled", "true"); + ((ZooKeeperClusterUtil) zkUtil).enableLocalSession(true); + zkUtil.restartCluster(); + Thread.sleep(2000); + ((ZooKeeperClusterUtil) zkUtil).stopPeer(2); + ((ZooKeeperClusterUtil) zkUtil).stopPeer(3); + } + + try (ZooKeeperClient client = ZooKeeperClient.newBuilder() + .connectString(zkUtil.getZooKeeperConnectString()) + .sessionTimeoutMs(30000) + .watchers(new HashSet()) + .operationRetryPolicy(retryPolicy) + .allowReadOnlyMode(true) + .build()) { + Assert.assertTrue("Client failed to connect a ZooKeeper in read-only mode.", + client.getState().isConnected()); + } finally { + if (zkUtil instanceof ZooKeeperClusterUtil) { + System.setProperty("readonlymode.enabled", "false"); + ((ZooKeeperClusterUtil) zkUtil).enableLocalSession(false); + } + } + } + } From a05bc53c59863361897a9706b29b981b3c55699e Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Mon, 15 Jul 2024 14:25:46 +0800 Subject: [PATCH 184/233] Allocator support exitOnOutOfMemory config. (#3984) * Allocator support exitOnOutOfMemory config. (cherry picked from commit 15b106c7610f11dfc091c8f73c28d1666113c25f) --- bookkeeper-common-allocator/pom.xml | 10 +++ .../allocator/ByteBufAllocatorBuilder.java | 2 + .../impl/ByteBufAllocatorBuilderImpl.java | 9 +- .../allocator/impl/ByteBufAllocatorImpl.java | 34 ++++++-- .../bookkeeper/common/util/ShutdownUtil.java | 86 +++++++++++++++++++ .../bookkeeper/common/util/package-info.java | 21 +++++ .../impl/ByteBufAllocatorBuilderTest.java | 28 ++++++ .../bookkeeper/bookie/BookieResources.java | 1 + .../apache/bookkeeper/client/BookKeeper.java | 1 + .../conf/AbstractConfiguration.java | 10 +++ .../conf/AbstractConfigurationTest.java | 10 +++ .../tools/perf/journal/JournalWriter.java | 1 + 12 files changed, 206 insertions(+), 7 deletions(-) create mode 100644 bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/util/ShutdownUtil.java create mode 100644 bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/util/package-info.java diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 235b79b9781..1876af1688e 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -29,6 +29,16 @@ io.netty netty-buffer + + org.mockito + mockito-core + test + + + org.mockito + mockito-inline + test + diff --git a/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/ByteBufAllocatorBuilder.java b/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/ByteBufAllocatorBuilder.java index 3e36a23d170..cb244140b35 100644 --- a/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/ByteBufAllocatorBuilder.java +++ b/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/ByteBufAllocatorBuilder.java @@ -92,4 +92,6 @@ static ByteBufAllocatorBuilder create() { *

Default is {@link LeakDetectionPolicy#Disabled} */ ByteBufAllocatorBuilder leakDetectionPolicy(LeakDetectionPolicy leakDetectionPolicy); + + ByteBufAllocatorBuilder exitOnOutOfMemory(boolean exitOnOutOfMemory); } diff --git a/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorBuilderImpl.java b/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorBuilderImpl.java index 69c57232aff..4b5469a3f7e 100644 --- a/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorBuilderImpl.java +++ b/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorBuilderImpl.java @@ -37,11 +37,12 @@ public class ByteBufAllocatorBuilderImpl implements ByteBufAllocatorBuilder { OutOfMemoryPolicy outOfMemoryPolicy = OutOfMemoryPolicy.FallbackToHeap; Consumer outOfMemoryListener = null; LeakDetectionPolicy leakDetectionPolicy = LeakDetectionPolicy.Disabled; + boolean exitOnOutOfMemory = false; @Override public ByteBufAllocatorWithOomHandler build() { return new ByteBufAllocatorImpl(pooledAllocator, unpooledAllocator, poolingPolicy, poolingConcurrency, - outOfMemoryPolicy, outOfMemoryListener, leakDetectionPolicy); + outOfMemoryPolicy, outOfMemoryListener, leakDetectionPolicy, exitOnOutOfMemory); } @Override @@ -86,4 +87,10 @@ public ByteBufAllocatorBuilder leakDetectionPolicy(LeakDetectionPolicy leakDetec return this; } + @Override + public ByteBufAllocatorBuilder exitOnOutOfMemory(boolean exitOnOutOfMemory) { + this.exitOnOutOfMemory = exitOnOutOfMemory; + return this; + } + } diff --git a/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorImpl.java b/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorImpl.java index 87582cca92c..3bc06f8e7ea 100644 --- a/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorImpl.java +++ b/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorImpl.java @@ -29,6 +29,7 @@ import org.apache.bookkeeper.common.allocator.LeakDetectionPolicy; import org.apache.bookkeeper.common.allocator.OutOfMemoryPolicy; import org.apache.bookkeeper.common.allocator.PoolingPolicy; +import org.apache.bookkeeper.common.util.ShutdownUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,15 +49,24 @@ public class ByteBufAllocatorImpl extends AbstractByteBufAllocator implements By private final PoolingPolicy poolingPolicy; private final OutOfMemoryPolicy outOfMemoryPolicy; private Consumer outOfMemoryListener; + private final boolean exitOnOutOfMemory; ByteBufAllocatorImpl(ByteBufAllocator pooledAllocator, ByteBufAllocator unpooledAllocator, PoolingPolicy poolingPolicy, int poolingConcurrency, OutOfMemoryPolicy outOfMemoryPolicy, Consumer outOfMemoryListener, LeakDetectionPolicy leakDetectionPolicy) { - super(poolingPolicy == PoolingPolicy.PooledDirect /* preferDirect */); + this(pooledAllocator, unpooledAllocator, poolingPolicy, poolingConcurrency, outOfMemoryPolicy, + outOfMemoryListener, leakDetectionPolicy, false); + } + ByteBufAllocatorImpl(ByteBufAllocator pooledAllocator, ByteBufAllocator unpooledAllocator, + PoolingPolicy poolingPolicy, int poolingConcurrency, OutOfMemoryPolicy outOfMemoryPolicy, + Consumer outOfMemoryListener, + LeakDetectionPolicy leakDetectionPolicy, boolean exitOnOutOfMemory) { + super(poolingPolicy == PoolingPolicy.PooledDirect /* preferDirect */); this.poolingPolicy = poolingPolicy; this.outOfMemoryPolicy = outOfMemoryPolicy; + this.exitOnOutOfMemory = exitOnOutOfMemory; if (outOfMemoryListener == null) { this.outOfMemoryListener = (v) -> { log.error("Unable to allocate memory", v); @@ -146,7 +156,7 @@ protected ByteBuf newHeapBuffer(int initialCapacity, int maxCapacity) { : unpooledAllocator; return alloc.heapBuffer(initialCapacity, maxCapacity); } catch (OutOfMemoryError e) { - outOfMemoryListener.accept(e); + consumeOOMError(e); throw e; } } @@ -166,12 +176,12 @@ private ByteBuf newDirectBuffer(int initialCapacity, int maxCapacity, boolean ca try { return unpooledAllocator.heapBuffer(initialCapacity, maxCapacity); } catch (OutOfMemoryError e2) { - outOfMemoryListener.accept(e2); + consumeOOMError(e2); throw e2; } } else { // ThrowException - outOfMemoryListener.accept(e); + consumeOOMError(e); throw e; } } @@ -181,12 +191,24 @@ private ByteBuf newDirectBuffer(int initialCapacity, int maxCapacity, boolean ca try { return unpooledAllocator.directBuffer(initialCapacity, maxCapacity); } catch (OutOfMemoryError e) { - outOfMemoryListener.accept(e); - throw e; + consumeOOMError(e); + throw e; } } } + private void consumeOOMError(OutOfMemoryError outOfMemoryError) { + try { + outOfMemoryListener.accept(outOfMemoryError); + } catch (Throwable e) { + log.warn("Consume outOfMemory error failed.", e); + } + if (exitOnOutOfMemory) { + log.info("Exiting JVM process for OOM error: {}", outOfMemoryError.getMessage(), outOfMemoryError); + ShutdownUtil.triggerImmediateForcefulShutdown(); + } + } + @Override public boolean isDirectBufferPooled() { return pooledAllocator != null && pooledAllocator.isDirectBufferPooled(); diff --git a/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/util/ShutdownUtil.java b/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/util/ShutdownUtil.java new file mode 100644 index 00000000000..a398b57fe74 --- /dev/null +++ b/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/util/ShutdownUtil.java @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.bookkeeper.common.util; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import lombok.extern.slf4j.Slf4j; + +/** + * Forked from Pulsar. + */ +@Slf4j +public class ShutdownUtil { + private static final Method log4j2ShutdownMethod; + + static { + // use reflection to find org.apache.logging.log4j.LogManager.shutdown method + Method shutdownMethod = null; + try { + shutdownMethod = Class.forName("org.apache.logging.log4j.LogManager") + .getMethod("shutdown"); + } catch (ClassNotFoundException | NoSuchMethodException e) { + // ignore when Log4j2 isn't found, log at debug level + log.debug("Cannot find org.apache.logging.log4j.LogManager.shutdown method", e); + } + log4j2ShutdownMethod = shutdownMethod; + } + + /** + * Triggers an immediate forceful shutdown of the current process. + * + * @param status Termination status. By convention, a nonzero status code indicates abnormal termination. + * @see Runtime#halt(int) + */ + public static void triggerImmediateForcefulShutdown(int status) { + triggerImmediateForcefulShutdown(status, true); + } + public static void triggerImmediateForcefulShutdown(int status, boolean logging) { + try { + if (status != 0 && logging) { + log.warn("Triggering immediate shutdown of current process with status {}", status, + new Exception("Stacktrace for immediate shutdown")); + } + shutdownLogging(); + } finally { + Runtime.getRuntime().halt(status); + } + } + + private static void shutdownLogging() { + // flush log buffers and shutdown log4j2 logging to prevent log truncation + if (log4j2ShutdownMethod != null) { + try { + // use reflection to call org.apache.logging.log4j.LogManager.shutdown() + log4j2ShutdownMethod.invoke(null); + } catch (IllegalAccessException | InvocationTargetException e) { + log.error("Unable to call org.apache.logging.log4j.LogManager.shutdown using reflection.", e); + } + } + } + + /** + * Triggers an immediate forceful shutdown of the current process using 1 as the status code. + * + * @see Runtime#halt(int) + */ + public static void triggerImmediateForcefulShutdown() { + triggerImmediateForcefulShutdown(1); + } +} \ No newline at end of file diff --git a/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/util/package-info.java b/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/util/package-info.java new file mode 100644 index 00000000000..55031dd8f8d --- /dev/null +++ b/bookkeeper-common-allocator/src/main/java/org/apache/bookkeeper/common/util/package-info.java @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * defines the utilities for allocator used across the project. + */ +package org.apache.bookkeeper.common.util; \ No newline at end of file diff --git a/bookkeeper-common-allocator/src/test/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorBuilderTest.java b/bookkeeper-common-allocator/src/test/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorBuilderTest.java index 6f2538d6c81..40c41fa65bc 100644 --- a/bookkeeper-common-allocator/src/test/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorBuilderTest.java +++ b/bookkeeper-common-allocator/src/test/java/org/apache/bookkeeper/common/allocator/impl/ByteBufAllocatorBuilderTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; import static org.mockito.Mockito.when; import io.netty.buffer.ByteBuf; @@ -35,7 +36,10 @@ import org.apache.bookkeeper.common.allocator.ByteBufAllocatorBuilder; import org.apache.bookkeeper.common.allocator.OutOfMemoryPolicy; import org.apache.bookkeeper.common.allocator.PoolingPolicy; +import org.apache.bookkeeper.common.util.ShutdownUtil; import org.junit.Test; +import org.mockito.MockedStatic; +import org.mockito.Mockito; /** * Tests for {@link ByteBufAllocatorBuilderImpl}. @@ -87,6 +91,30 @@ public void testOomWithException() { assertEquals(outOfDirectMemException, receivedException.get()); } + @Test() + public void testOomExit() { + ByteBufAllocator baseAlloc = mock(ByteBufAllocator.class); + when(baseAlloc.directBuffer(anyInt(), anyInt())).thenThrow(outOfDirectMemException); + + ByteBufAllocator alloc = ByteBufAllocatorBuilder.create() + .pooledAllocator(baseAlloc) + .outOfMemoryPolicy(OutOfMemoryPolicy.ThrowException) + .exitOnOutOfMemory(true) + .build(); + + MockedStatic mockedStatic = mockStatic(ShutdownUtil.class); + + try { + alloc.buffer(); + fail("Should have thrown exception"); + } catch (OutOfMemoryError e) { + // Expected + assertEquals(outOfDirectMemException, e); + } + + mockedStatic.verify(() -> ShutdownUtil.triggerImmediateForcefulShutdown(), Mockito.times(1)); + } + @Test public void testOomWithFallback() { ByteBufAllocator baseAlloc = mock(ByteBufAllocator.class); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieResources.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieResources.java index c9b71b9968d..755efd5be02 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieResources.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieResources.java @@ -70,6 +70,7 @@ public static ByteBufAllocatorWithOomHandler createAllocator(ServerConfiguration .poolingConcurrency(conf.getAllocatorPoolingConcurrency()) .outOfMemoryPolicy(conf.getAllocatorOutOfMemoryPolicy()) .leakDetectionPolicy(conf.getAllocatorLeakDetectionPolicy()) + .exitOnOutOfMemory(conf.exitOnOutOfMemory()) .build(); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java index d7043dc8c9a..0362aadcbaa 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java @@ -478,6 +478,7 @@ public BookKeeper(ClientConfiguration conf, ZooKeeper zk, EventLoopGroup eventLo .poolingConcurrency(conf.getAllocatorPoolingConcurrency()) .outOfMemoryPolicy(conf.getAllocatorOutOfMemoryPolicy()) .leakDetectionPolicy(conf.getAllocatorLeakDetectionPolicy()) + .exitOnOutOfMemory(conf.exitOnOutOfMemory()) .build(); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java index 438dc40983e..6d2a82bb551 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java @@ -183,6 +183,7 @@ public abstract class AbstractConfiguration protected static final String ALLOCATOR_POOLING_CONCURRENCY = "allocatorPoolingConcurrency"; protected static final String ALLOCATOR_OOM_POLICY = "allocatorOutOfMemoryPolicy"; protected static final String ALLOCATOR_LEAK_DETECTION_POLICY = "allocatorLeakDetectionPolicy"; + protected static final String ALLOCATOR_EXIT_ON_OUT_OF_MEMORY = "allocatorExitOnOutOfMemory"; // option to limit stats logging public static final String LIMIT_STATS_LOGGING = "limitStatsLogging"; @@ -1156,6 +1157,15 @@ public T setAllocatorLeakDetectionPolicy(LeakDetectionPolicy leakDetectionPolicy return getThis(); } + public T setExitOnOutOfMemory(boolean exitOnOutOfMemory) { + this.setProperty(ALLOCATOR_EXIT_ON_OUT_OF_MEMORY, exitOnOutOfMemory); + return getThis(); + } + + public boolean exitOnOutOfMemory() { + return getBoolean(ALLOCATOR_EXIT_ON_OUT_OF_MEMORY, false); + } + /** * Return whether the busy-wait is enabled for BookKeeper and Netty IO threads. * diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/AbstractConfigurationTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/AbstractConfigurationTest.java index a6333a47d32..194ab2c68d0 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/AbstractConfigurationTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/AbstractConfigurationTest.java @@ -19,6 +19,8 @@ package org.apache.bookkeeper.conf; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.mock; @@ -179,4 +181,12 @@ public void testAllocatorLeakDetectionPolicy() { System.getProperties().put(nettyLevelKey, nettyLevelStr); } } + + @Test + public void testExitOnOutOfMemory() { + assertFalse(conf.exitOnOutOfMemory()); + conf.setExitOnOutOfMemory(true); + assertTrue(conf.exitOnOutOfMemory()); + } + } diff --git a/tools/perf/src/main/java/org/apache/bookkeeper/tools/perf/journal/JournalWriter.java b/tools/perf/src/main/java/org/apache/bookkeeper/tools/perf/journal/JournalWriter.java index 383ccfb9825..e287fbd94af 100644 --- a/tools/perf/src/main/java/org/apache/bookkeeper/tools/perf/journal/JournalWriter.java +++ b/tools/perf/src/main/java/org/apache/bookkeeper/tools/perf/journal/JournalWriter.java @@ -495,6 +495,7 @@ private static ByteBufAllocator getAllocator(ServerConfiguration conf) { log.error("Unable to allocate memory, exiting bookie", ex); }) .leakDetectionPolicy(conf.getAllocatorLeakDetectionPolicy()) + .exitOnOutOfMemory(conf.exitOnOutOfMemory()) .build(); } From 8996ccdb67e5b8c6b32d653a872acc64fad6d89d Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Mon, 29 Jul 2024 17:10:19 +0800 Subject: [PATCH 185/233] [fix][ci] Fix OWASP Dependency Check download by using NVD API key (#4473) Signed-off-by: ZhangJian He (cherry picked from commit 7ab29e6a7a12921d87604744bc26ae85c8fde351) --- .github/workflows/bk-ci.yml | 1 + pom.xml | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bk-ci.yml b/.github/workflows/bk-ci.yml index e04462f0f54..19bdbfa9b18 100644 --- a/.github/workflows/bk-ci.yml +++ b/.github/workflows/bk-ci.yml @@ -32,6 +32,7 @@ on: env: MAVEN_OPTS: -Xss1500k -Xmx1500m -Daether.connector.http.reuseConnections=false -Daether.connector.requestTimeout=60000 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.serviceUnavailableRetryStrategy.class=standard -Dmaven.wagon.rto=60000 + NIST_NVD_API_KEY: ${{ secrets.NIST_NVD_API_KEY }} concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/pom.xml b/pom.xml index bbf4da34805..2c7f5b4412b 100644 --- a/pom.xml +++ b/pom.xml @@ -193,7 +193,7 @@ 3.3.1 3.12.1 3.2.5 - 9.2.0 + 10.0.2 3.10.1 1.4.1.Final 0.6.1 @@ -1210,6 +1210,10 @@ ${dependency-check-maven.version} false + + NIST_NVD_API_KEY + + src/owasp-dependency-check-suppressions.xml From 3b06ecf938718e7089e9097631bcd02e62abaadb Mon Sep 17 00:00:00 2001 From: Aurora Twinkle Date: Sun, 21 Jul 2024 05:48:11 +0800 Subject: [PATCH 186/233] fix[rocksdb]: fix error rocksdb default config for CFOptions (#4466) * fix[rocksdb]: fix error rocksdb default config for CFOptions --------- Co-authored-by: duanlinlin (cherry picked from commit 4ca020a5f0805a748a1e8d983015e5221a534fd7) --- .../test/resources/conf/default_rocksdb.conf | 11 +++++++--- .../conf/entry_location_rocksdb.conf | 4 ++-- .../conf/ledger_metadata_rocksdb.conf | 11 +++++++--- .../test_entry_location_rocksdb.conf | 22 ++++++++++++++++++- conf/default_rocksdb.conf.default | 9 ++++++-- conf/entry_location_rocksdb.conf.default | 8 +++++-- conf/ledger_metadata_rocksdb.conf.default | 9 ++++++-- 7 files changed, 59 insertions(+), 15 deletions(-) diff --git a/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf b/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf index 0f3a08779ed..df433a33e96 100644 --- a/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf @@ -23,7 +23,12 @@ info_log_level=INFO_LEVEL # set by jni: options.setKeepLogFileNum keep_log_file_num=30 - -[CFOptions "default"] # set by jni: options.setLogFileTimeToRoll - log_file_time_to_roll=86400 \ No newline at end of file + log_file_time_to_roll=86400 + + [CFOptions "default"] + #no default setting in CFOptions + +[TableOptions/BlockBasedTable "default"] + # set by jni: tableOptions.setChecksumType + checksum=kxxHash \ No newline at end of file diff --git a/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf b/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf index 6f6c1b4d052..260111fa140 100644 --- a/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf @@ -26,7 +26,7 @@ # set by jni: options.setLogFileTimeToRoll log_file_time_to_roll=86400 # set by jni: options.setMaxBackgroundJobs or options.setIncreaseParallelism - max_background_jobs=2 + max_background_jobs=32 # set by jni: options.setMaxSubcompactions max_subcompactions=1 # set by jni: options.setMaxTotalWalSize @@ -57,7 +57,7 @@ [TableOptions/BlockBasedTable "default"] # set by jni: tableOptions.setBlockSize block_size=65536 - # set by jni: tableOptions.setBlockCache +# set by jni: tableOptions.setBlockCache, default value is: maxDirectMemory() / ledgerDirsSize / 10; block_cache=206150041 # set by jni: tableOptions.setFormatVersion format_version=2 diff --git a/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf b/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf index 0f3a08779ed..f84c0167ed7 100644 --- a/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf @@ -23,7 +23,12 @@ info_log_level=INFO_LEVEL # set by jni: options.setKeepLogFileNum keep_log_file_num=30 - -[CFOptions "default"] # set by jni: options.setLogFileTimeToRoll - log_file_time_to_roll=86400 \ No newline at end of file + log_file_time_to_roll=86400 + + [CFOptions "default"] + #no default setting in CFOptions + +[TableOptions/BlockBasedTable "default"] + # set by jni: tableOptions.setChecksumType + checksum=kxxHash \ No newline at end of file diff --git a/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf b/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf index 9d1c3e08c47..f0971b8d310 100644 --- a/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf @@ -19,10 +19,22 @@ [DBOptions] # set by jni: options.setCreateIfMissing create_if_missing=true + # set by jni: options.setInfoLogLevel + info_log_level=INFO_LEVEL # set by jni: options.setKeepLogFileNum keep_log_file_num=1 + # set by jni: options.setLogFileTimeToRoll + log_file_time_to_roll=86400 + # set by jni: options.setMaxBackgroundJobs or options.setIncreaseParallelism + max_background_jobs=32 + # set by jni: options.setMaxSubcompactions + max_subcompactions=1 # set by jni: options.setMaxTotalWalSize max_total_wal_size=1000 + # set by jni: options.setMaxOpenFiles + max_open_files=-1 + # set by jni: options.setDeleteObsoleteFilesPeriodMicros + delete_obsolete_files_period_micros=3600000000 [CFOptions "default"] # set by jni: options.setCompressionType @@ -31,13 +43,21 @@ write_buffer_size=1024 # set by jni: options.setMaxWriteBufferNumber max_write_buffer_number=1 + # set by jni: options.setNumLevels + num_levels=7 + # set by jni: options.setLevelZeroFileNumCompactionTrigger + level0_file_num_compaction_trigger=4 + # set by jni: options.setMaxBytesForLevelBase + max_bytes_for_level_base=268435456 + # set by jni: options.setTargetFileSizeBase + target_file_size_base=67108864 # set by jni: options.setLevelCompactionDynamicLevelBytes level_compaction_dynamic_level_bytes=true [TableOptions/BlockBasedTable "default"] # set by jni: tableOptions.setBlockSize block_size=65536 - # set by jni: tableOptions.setBlockCache +# set by jni: tableOptions.setBlockCache, default value is: maxDirectMemory() / ledgerDirsSize / 10; block_cache=206150041 # set by jni: tableOptions.setFormatVersion format_version=2 diff --git a/conf/default_rocksdb.conf.default b/conf/default_rocksdb.conf.default index e9b8e7c3ecd..d8a77dd9d3f 100644 --- a/conf/default_rocksdb.conf.default +++ b/conf/default_rocksdb.conf.default @@ -16,6 +16,10 @@ # * limitations under the License. # */ +# When modifying this file, please also modify the configuration files(at +# bookkeeper-server/src/test/resources/conf) in the +# test case to ensure unit test coverage. + [DBOptions] # set by jni: options.setCreateIfMissing create_if_missing=true @@ -23,11 +27,12 @@ info_log_level=INFO_LEVEL # set by jni: options.setKeepLogFileNum keep_log_file_num=30 - -[CFOptions "default"] # set by jni: options.setLogFileTimeToRoll log_file_time_to_roll=86400 + [CFOptions "default"] + #no default setting in CFOptions + [TableOptions/BlockBasedTable "default"] # set by jni: tableOptions.setChecksumType checksum=kxxHash \ No newline at end of file diff --git a/conf/entry_location_rocksdb.conf.default b/conf/entry_location_rocksdb.conf.default index 6f6c1b4d052..4d5ce58a859 100644 --- a/conf/entry_location_rocksdb.conf.default +++ b/conf/entry_location_rocksdb.conf.default @@ -16,6 +16,10 @@ # * limitations under the License. # */ +# When modifying this file, please also modify the configuration files(at +# bookkeeper-server/src/test/resources/conf) in the +# test case to ensure unit test coverage. + [DBOptions] # set by jni: options.setCreateIfMissing create_if_missing=true @@ -26,7 +30,7 @@ # set by jni: options.setLogFileTimeToRoll log_file_time_to_roll=86400 # set by jni: options.setMaxBackgroundJobs or options.setIncreaseParallelism - max_background_jobs=2 + max_background_jobs=32 # set by jni: options.setMaxSubcompactions max_subcompactions=1 # set by jni: options.setMaxTotalWalSize @@ -57,7 +61,7 @@ [TableOptions/BlockBasedTable "default"] # set by jni: tableOptions.setBlockSize block_size=65536 - # set by jni: tableOptions.setBlockCache + # set by jni: tableOptions.setBlockCache, default value is: maxDirectMemory() / ledgerDirsSize / 10; block_cache=206150041 # set by jni: tableOptions.setFormatVersion format_version=2 diff --git a/conf/ledger_metadata_rocksdb.conf.default b/conf/ledger_metadata_rocksdb.conf.default index e9b8e7c3ecd..0bf79349220 100644 --- a/conf/ledger_metadata_rocksdb.conf.default +++ b/conf/ledger_metadata_rocksdb.conf.default @@ -16,6 +16,10 @@ # * limitations under the License. # */ +# When modifying this file, please also modify the configuration files(at +# bookkeeper-server/src/test/resources/conf) in the +# test case to ensure unit test coverage. + [DBOptions] # set by jni: options.setCreateIfMissing create_if_missing=true @@ -23,10 +27,11 @@ info_log_level=INFO_LEVEL # set by jni: options.setKeepLogFileNum keep_log_file_num=30 - -[CFOptions "default"] # set by jni: options.setLogFileTimeToRoll log_file_time_to_roll=86400 + + [CFOptions "default"] + #no default setting in CFOptions [TableOptions/BlockBasedTable "default"] # set by jni: tableOptions.setChecksumType From 697ff5702340dddfcd63a7b76f84a02a2eea0946 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 16 Aug 2024 13:43:31 +0300 Subject: [PATCH 187/233] Set default format_version to 5 for RocksDB databases (#4480) (cherry picked from commit 8c7dea6503a635707e36f4392ddfc44d2ccb9b54) --- .../bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java | 2 +- .../src/test/resources/conf/default_rocksdb.conf | 2 ++ .../src/test/resources/conf/entry_location_rocksdb.conf | 2 +- .../src/test/resources/conf/ledger_metadata_rocksdb.conf | 4 +++- .../src/test/resources/test_entry_location_rocksdb.conf | 2 +- conf/bk_server.conf | 2 +- conf/default_rocksdb.conf.default | 2 ++ conf/entry_location_rocksdb.conf.default | 2 +- conf/ledger_metadata_rocksdb.conf.default | 4 +++- 9 files changed, 15 insertions(+), 7 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java index a77a0a18f7c..0c13c1c8bff 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java @@ -198,7 +198,7 @@ private RocksDB initializeRocksDBWithBookieConf(String basePath, String subPath, int blockSize = conf.getInt(ROCKSDB_BLOCK_SIZE, 64 * 1024); int bloomFilterBitsPerKey = conf.getInt(ROCKSDB_BLOOM_FILTERS_BITS_PER_KEY, 10); boolean lz4CompressionEnabled = conf.getBoolean(ROCKSDB_LZ4_COMPRESSION_ENABLED, true); - int formatVersion = conf.getInt(ROCKSDB_FORMAT_VERSION, 2); + int formatVersion = conf.getInt(ROCKSDB_FORMAT_VERSION, 5); if (lz4CompressionEnabled) { options.setCompressionType(CompressionType.LZ4_COMPRESSION); diff --git a/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf b/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf index df433a33e96..b7b0ae677dd 100644 --- a/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf @@ -30,5 +30,7 @@ #no default setting in CFOptions [TableOptions/BlockBasedTable "default"] + # set by jni: tableOptions.setFormatVersion + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash \ No newline at end of file diff --git a/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf b/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf index 260111fa140..976e53b47b7 100644 --- a/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf @@ -60,7 +60,7 @@ # set by jni: tableOptions.setBlockCache, default value is: maxDirectMemory() / ledgerDirsSize / 10; block_cache=206150041 # set by jni: tableOptions.setFormatVersion - format_version=2 + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash # set by jni: tableOptions.setFilterPolicy, bloomfilter:[bits_per_key]:[use_block_based_builder] diff --git a/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf b/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf index f84c0167ed7..b7b0ae677dd 100644 --- a/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf @@ -25,10 +25,12 @@ keep_log_file_num=30 # set by jni: options.setLogFileTimeToRoll log_file_time_to_roll=86400 - + [CFOptions "default"] #no default setting in CFOptions [TableOptions/BlockBasedTable "default"] + # set by jni: tableOptions.setFormatVersion + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash \ No newline at end of file diff --git a/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf b/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf index f0971b8d310..7640fd2c9e8 100644 --- a/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf @@ -60,7 +60,7 @@ # set by jni: tableOptions.setBlockCache, default value is: maxDirectMemory() / ledgerDirsSize / 10; block_cache=206150041 # set by jni: tableOptions.setFormatVersion - format_version=2 + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash # set by jni: tableOptions.setFilterPolicy, bloomfilter:[bits_per_key]:[use_block_based_builder] diff --git a/conf/bk_server.conf b/conf/bk_server.conf index be3d845fadc..db7cd9cfe08 100755 --- a/conf/bk_server.conf +++ b/conf/bk_server.conf @@ -779,7 +779,7 @@ gcEntryLogMetadataCacheEnabled=false # dbStorage_rocksDB_numFilesInLevel0=4 # dbStorage_rocksDB_maxSizeInLevel1MB=256 # dbStorage_rocksDB_logPath= -# dbStorage_rocksDB_format_version=2 +# dbStorage_rocksDB_format_version=5 ############################################################################# ## DirectIO entry logger configuration diff --git a/conf/default_rocksdb.conf.default b/conf/default_rocksdb.conf.default index d8a77dd9d3f..ccedbb79ebb 100644 --- a/conf/default_rocksdb.conf.default +++ b/conf/default_rocksdb.conf.default @@ -34,5 +34,7 @@ #no default setting in CFOptions [TableOptions/BlockBasedTable "default"] + # set by jni: tableOptions.setFormatVersion + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash \ No newline at end of file diff --git a/conf/entry_location_rocksdb.conf.default b/conf/entry_location_rocksdb.conf.default index 4d5ce58a859..e4dc394243f 100644 --- a/conf/entry_location_rocksdb.conf.default +++ b/conf/entry_location_rocksdb.conf.default @@ -64,7 +64,7 @@ # set by jni: tableOptions.setBlockCache, default value is: maxDirectMemory() / ledgerDirsSize / 10; block_cache=206150041 # set by jni: tableOptions.setFormatVersion - format_version=2 + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash # set by jni: tableOptions.setFilterPolicy, bloomfilter:[bits_per_key]:[use_block_based_builder] diff --git a/conf/ledger_metadata_rocksdb.conf.default b/conf/ledger_metadata_rocksdb.conf.default index 0bf79349220..ccedbb79ebb 100644 --- a/conf/ledger_metadata_rocksdb.conf.default +++ b/conf/ledger_metadata_rocksdb.conf.default @@ -29,10 +29,12 @@ keep_log_file_num=30 # set by jni: options.setLogFileTimeToRoll log_file_time_to_roll=86400 - + [CFOptions "default"] #no default setting in CFOptions [TableOptions/BlockBasedTable "default"] + # set by jni: tableOptions.setFormatVersion + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash \ No newline at end of file From 9bc90b421dbc8b32965b93e40abdb1d00ecf109b Mon Sep 17 00:00:00 2001 From: Dezhiliu <33149602+liudezhi2098@users.noreply.github.com> Date: Wed, 21 Aug 2024 06:57:15 +0800 Subject: [PATCH 188/233] when failed to choose a bookie, print out the list of ensemble. (#4482) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Motivation In file RackawareEnsemblePlacementPolicyImpl.java In the log.warn below, we should print out the list of ensemble, instead of the object. The “ensemble” in line-619 should be changed into “ensemble.toList()”. https://github.com/apache/bookkeeper/blob/999cd0f2ab14404be4d6c24e388456dbe56bb1a8/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java#L600C3-L619C47 ### Changes The “ensemble” in line-619 changed into “ensemble.toList()”. (cherry picked from commit 7c41204506122ed6904289f4814d4130274874aa) --- .../client/RackawareEnsemblePlacementPolicyImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java index 64e7951df33..3ddc54cd901 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java @@ -536,7 +536,7 @@ public BookieNode selectFromNetworkLocation( LOG.warn("Failed to choose a bookie from network location {}, " + "the bookies in the network location are {}, excluded bookies {}, " + "current ensemble {}, fallback to choose bookie randomly from the cluster.", - networkLoc, topology.getLeaves(networkLoc), excludeBookies, ensemble); + networkLoc, topology.getLeaves(networkLoc), excludeBookies, ensemble.toList()); // randomly choose one from whole cluster, ignore the provided predicate. return selectRandom(1, excludeBookies, predicate, ensemble).get(0); } @@ -562,7 +562,7 @@ public BookieNode selectFromNetworkLocation(String networkLoc, LOG.warn("Failed to choose a bookie node from network location {}, " + "the bookies in the network location are {}, excluded bookies {}, " + "current ensemble {}, fallback to choose bookie randomly from the cluster.", - networkLoc, topology.getLeaves(networkLoc), excludeBookies, ensemble); + networkLoc, topology.getLeaves(networkLoc), excludeBookies, ensemble.toList()); return selectFromNetworkLocation(excludeRacks, excludeBookies, predicate, ensemble, fallbackToRandom); } } From 818a37a8c67b4678d0ee892f1e1b13e1e0617579 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 13 Sep 2024 01:39:52 +0300 Subject: [PATCH 189/233] Upgrade to Netty 4.1.113.Final and netty-tcnative 2.0.66.Final (#4502) Netty release 4.1.113.Final contains some bug fixes that are relevant for Bookkeeper. It's also worth keeping Netty updated since besides bug fixes, we will also catch possible regressions closer to releases when a change in Netty causes a regression. * [Netty 4.1.113 release notes](https://netty.io/news/2024/09/04/4-1-113-Final.html) * [Netty 4.1.112 release notes](https://netty.io/news/2024/07/19/4-1-112-Final.html) - upgrade Netty to 4.1.113.Final - upgrades netty-tcnative to 2.0.66.Final (cherry picked from commit 57f9e025d91fda3116df7d0e909cec0292d0bbf9) --- .../src/main/resources/LICENSE-all.bin.txt | 104 +++++++++--------- .../src/main/resources/LICENSE-bkctl.bin.txt | 92 ++++++++-------- .../src/main/resources/LICENSE-server.bin.txt | 104 +++++++++--------- .../src/main/resources/NOTICE-all.bin.txt | 46 ++++---- .../src/main/resources/NOTICE-bkctl.bin.txt | 34 +++--- .../src/main/resources/NOTICE-server.bin.txt | 46 ++++---- pom.xml | 2 +- 7 files changed, 214 insertions(+), 214 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 52ea9954fe1..1cd38248221 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -217,32 +217,32 @@ 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.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] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] -- 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.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-netty-buffer-4.1.113.Final.jar [11] +- lib/io.netty-netty-codec-4.1.113.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.113.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.113.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.113.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.113.Final.jar [11] +- lib/io.netty-netty-common-4.1.113.Final.jar [11] +- lib/io.netty-netty-handler-4.1.113.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.113.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.113.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.113.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar [11] +- lib/io.netty-netty-transport-4.1.113.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.113.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.111.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.113.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] @@ -332,7 +332,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.111.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.113.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 @@ -372,9 +372,9 @@ Apache Software License, Version 2. [53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.111.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.113.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.111.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.113.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: @@ -383,7 +383,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.111.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -391,7 +391,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.111.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -399,7 +399,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -407,7 +407,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -417,7 +417,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.113.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: @@ -425,7 +425,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.111.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.113.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: @@ -434,7 +434,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.111.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -442,7 +442,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.111.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -450,7 +450,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.113.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: @@ -458,7 +458,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.111.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -466,7 +466,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.111.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -474,7 +474,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.113.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: @@ -482,7 +482,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.111.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -490,7 +490,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.113.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: @@ -499,7 +499,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -507,7 +507,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -515,7 +515,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -523,7 +523,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -531,7 +531,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -539,7 +539,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -547,7 +547,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.113.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: @@ -555,7 +555,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.111.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.113.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: @@ -563,7 +563,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.111.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.113.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: @@ -571,7 +571,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.111.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.113.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: @@ -580,7 +580,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.111.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.113.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: @@ -588,7 +588,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.111.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.113.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 dfd2fea4f0c..a22f92976fa 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -217,26 +217,26 @@ 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.111.Final.jar [11] -- lib/io.netty-netty-codec-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-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] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] -- 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.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-netty-buffer-4.1.113.Final.jar [11] +- lib/io.netty-netty-codec-4.1.113.Final.jar [11] +- lib/io.netty-netty-common-4.1.113.Final.jar [11] +- lib/io.netty-netty-handler-4.1.113.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.113.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar [11] +- lib/io.netty-netty-transport-4.1.113.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.113.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.111.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.113.Final.jar [11] - lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16] @@ -299,7 +299,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.111.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.113.Final [16] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.18.0 [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 @@ -330,9 +330,9 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.111.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.113.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.111.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.113.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: @@ -341,7 +341,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.111.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -349,7 +349,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.111.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -357,7 +357,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -365,7 +365,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -375,7 +375,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.113.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: @@ -383,7 +383,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.111.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.113.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: @@ -392,7 +392,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.111.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -400,7 +400,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.111.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -408,7 +408,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.113.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: @@ -416,7 +416,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.111.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -424,7 +424,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.111.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -432,7 +432,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.113.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: @@ -440,7 +440,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.111.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -448,7 +448,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.113.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: @@ -457,7 +457,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -465,7 +465,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -473,7 +473,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -481,7 +481,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -489,7 +489,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -497,7 +497,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -505,7 +505,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.113.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: @@ -513,7 +513,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.111.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.113.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: @@ -521,7 +521,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.111.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.113.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: @@ -529,7 +529,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.111.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.113.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: @@ -538,7 +538,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.111.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.113.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: @@ -546,7 +546,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.111.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.113.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 fea213f758c..6136624d948 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -217,32 +217,32 @@ 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.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] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] -- 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.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-netty-buffer-4.1.113.Final.jar [11] +- lib/io.netty-netty-codec-4.1.113.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.113.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.113.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.113.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.113.Final.jar [11] +- lib/io.netty-netty-common-4.1.113.Final.jar [11] +- lib/io.netty-netty-handler-4.1.113.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.113.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.113.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.113.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar [11] +- lib/io.netty-netty-transport-4.1.113.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.113.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.111.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.113.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] @@ -328,7 +328,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.111.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.113.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 @@ -367,9 +367,9 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.111.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.113.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.111.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.113.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: @@ -378,7 +378,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.111.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -386,7 +386,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.111.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -394,7 +394,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -402,7 +402,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -412,7 +412,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.113.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: @@ -420,7 +420,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.111.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.113.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: @@ -429,7 +429,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.111.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -437,7 +437,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.111.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -445,7 +445,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.113.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: @@ -453,7 +453,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.111.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -461,7 +461,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.111.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -469,7 +469,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.113.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: @@ -477,7 +477,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.111.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -485,7 +485,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.113.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: @@ -494,7 +494,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -502,7 +502,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -510,7 +510,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -518,7 +518,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -526,7 +526,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -534,7 +534,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.111.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -542,7 +542,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.111.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.113.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: @@ -550,7 +550,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.111.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.113.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: @@ -558,7 +558,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.111.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.113.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: @@ -566,7 +566,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.111.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.113.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: @@ -575,7 +575,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.111.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.113.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: @@ -583,7 +583,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.111.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.113.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 af368d1d948..15a546ab8f9 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -23,31 +23,31 @@ LongAdder), which was released with the following comments: http://creativecommons.org/publicdomain/zero/1.0/ ------------------------------------------------------------------------------------ -- 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] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] -- 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.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-netty-buffer-4.1.113.Final.jar +- lib/io.netty-netty-codec-4.1.113.Final.jar +- lib/io.netty-netty-codec-dns-4.1.113.Final.jar +- lib/io.netty-netty-codec-http-4.1.113.Final.jar +- lib/io.netty-netty-codec-http2-4.1.113.Final.jar +- lib/io.netty-netty-codec-socks-4.1.113.Final.jar +- lib/io.netty-netty-common-4.1.113.Final.jar +- lib/io.netty-netty-handler-4.1.113.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.113.Final.jar +- lib/io.netty-netty-resolver-4.1.113.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.113.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar +- lib/io.netty-netty-transport-4.1.113.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.113.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.111.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.113.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 88eaaf8a5d0..c5e9b51ab44 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -5,25 +5,25 @@ This product includes software developed at 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-common-4.1.111.Final.jar -- lib/io.netty-netty-handler-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] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] -- 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.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-netty-buffer-4.1.113.Final.jar +- lib/io.netty-netty-codec-4.1.113.Final.jar +- lib/io.netty-netty-common-4.1.113.Final.jar +- lib/io.netty-netty-handler-4.1.113.Final.jar +- lib/io.netty-netty-resolver-4.1.113.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar +- lib/io.netty-netty-transport-4.1.113.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.113.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.111.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.113.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 2873f19dedb..208afe4c377 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -5,31 +5,31 @@ This product includes software developed at 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-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] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11] -- 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.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-netty-buffer-4.1.113.Final.jar +- lib/io.netty-netty-codec-4.1.113.Final.jar +- lib/io.netty-netty-codec-dns-4.1.113.Final.jar +- lib/io.netty-netty-codec-http-4.1.113.Final.jar +- lib/io.netty-netty-codec-http2-4.1.113.Final.jar +- lib/io.netty-netty-codec-socks-4.1.113.Final.jar +- lib/io.netty-netty-common-4.1.113.Final.jar +- lib/io.netty-netty-handler-4.1.113.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.113.Final.jar +- lib/io.netty-netty-resolver-4.1.113.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.113.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar +- lib/io.netty-netty-transport-4.1.113.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.113.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.111.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.113.Final.jar The Netty Project diff --git a/pom.xml b/pom.xml index 2c7f5b4412b..8bf6926fe7f 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 2.18.0 1.3.0 3.12.4 - 4.1.111.Final + 4.1.113.Final 0.0.25.Final 9.1.3 2.0.9 From 93118aa55bc07d9c11298dda25330f8554d9b3ea Mon Sep 17 00:00:00 2001 From: fengyubiao Date: Fri, 13 Sep 2024 09:01:55 +0800 Subject: [PATCH 190/233] [fix] Fix data lost after when writing ledger and deleting legder execute concurrency (#4462) ### Motivation | step | `BK client 1` | `BK client 2` | | --- | --- | --- | | 1 | create ledger `1` | | 2 | | open ledger `1` | | 3 | | delete ledger `1` | | 4 | write data to ledger `1` | At the step `4`, the write should fail, but it succeeds. It leads users to assume the data has been written, but it can not be read. You can reproduce the issue by `testWriteAfterDeleted` There is a scenario that will lead to Pulsar loss messages - `broker-2` created a ledger - `broker-2`'s ZK session is expired, which will lead the topic it owned to be assigned to other brokers - `broker-0` owned the topic again - it will delete the last empty ledger - consumers connected to `broker-0` - producers connected to `broker-2` - send messages to the topic - on `broker-2`, the ledger can not be closed due to the ledger metadata has been deleted ### Changes Once the ledger is fenced, it can not be wrote anymore. (cherry picked from commit 47ef48e074df42705bc0bf14bac5b3cc05c5f0c3) --- .../apache/bookkeeper/bookie/BookieImpl.java | 14 ++-- .../bookkeeper/bookie/HandleFactory.java | 2 +- .../bookkeeper/bookie/HandleFactoryImpl.java | 31 ++++++++- .../bookkeeper/bookie/BookieJournalTest.java | 4 +- .../apache/bookkeeper/client/TestFencing.java | 65 +++++++++++++++++++ 5 files changed, 105 insertions(+), 11 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java index d0874ffa165..968977ecdc3 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java @@ -527,7 +527,7 @@ public void process(int journalVersion, long offset, ByteBuffer recBuff) throws masterKeyCache.put(ledgerId, masterKey); // Force to re-insert the master key in ledger storage - handles.getHandle(ledgerId, masterKey); + handles.getHandle(ledgerId, masterKey, true); } else { throw new IOException("Invalid journal. Contains journalKey " + " but layout version (" + journalVersion @@ -539,7 +539,7 @@ public void process(int journalVersion, long offset, ByteBuffer recBuff) throws if (key == null) { key = ledgerStorage.readMasterKey(ledgerId); } - LedgerDescriptor handle = handles.getHandle(ledgerId, key); + LedgerDescriptor handle = handles.getHandle(ledgerId, key, true); handle.setFenced(); } else { throw new IOException("Invalid journal. Contains fenceKey " @@ -557,7 +557,7 @@ public void process(int journalVersion, long offset, ByteBuffer recBuff) throws if (key == null) { key = ledgerStorage.readMasterKey(ledgerId); } - LedgerDescriptor handle = handles.getHandle(ledgerId, key); + LedgerDescriptor handle = handles.getHandle(ledgerId, key, true); handle.setExplicitLac(explicitLacBuf); } else { throw new IOException("Invalid journal. Contains explicitLAC " + " but layout version (" @@ -580,7 +580,7 @@ public void process(int journalVersion, long offset, ByteBuffer recBuff) throws if (key == null) { key = ledgerStorage.readMasterKey(ledgerId); } - LedgerDescriptor handle = handles.getHandle(ledgerId, key); + LedgerDescriptor handle = handles.getHandle(ledgerId, key, true); recBuff.rewind(); handle.addEntry(Unpooled.wrappedBuffer(recBuff)); @@ -902,7 +902,7 @@ LedgerDescriptor getLedgerForEntry(ByteBuf entry, final byte[] masterKey) throws IOException, BookieException { final long ledgerId = entry.getLong(entry.readerIndex()); - return handles.getHandle(ledgerId, masterKey); + return handles.getHandle(ledgerId, masterKey, false); } private Journal getJournal(long ledgerId) { @@ -1011,7 +1011,7 @@ public void setExplicitLac(ByteBuf entry, WriteCallback writeCallback, Object ct ByteBuf explicitLACEntry = null; try { long ledgerId = entry.getLong(entry.readerIndex()); - LedgerDescriptor handle = handles.getHandle(ledgerId, masterKey); + LedgerDescriptor handle = handles.getHandle(ledgerId, masterKey, false); synchronized (handle) { entry.markReaderIndex(); handle.setExplicitLac(entry); @@ -1100,7 +1100,7 @@ public void addEntry(ByteBuf entry, boolean ackBeforeSync, WriteCallback cb, Obj */ public CompletableFuture fenceLedger(long ledgerId, byte[] masterKey) throws IOException, BookieException { - LedgerDescriptor handle = handles.getHandle(ledgerId, masterKey); + LedgerDescriptor handle = handles.getHandle(ledgerId, masterKey, false); return handle.fenceAndLogInJournal(getJournal(ledgerId)); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactory.java index 22500b74cb6..c81294d4dbe 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactory.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactory.java @@ -24,7 +24,7 @@ import java.io.IOException; interface HandleFactory { - LedgerDescriptor getHandle(long ledgerId, byte[] masterKey) + LedgerDescriptor getHandle(long ledgerId, byte[] masterKey, boolean journalReplay) throws IOException, BookieException; LedgerDescriptor getReadOnlyHandle(long ledgerId) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactoryImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactoryImpl.java index 3f643019c9a..b331f125061 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactoryImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactoryImpl.java @@ -21,7 +21,10 @@ package org.apache.bookkeeper.bookie; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import java.io.IOException; +import java.time.Duration; import org.apache.bookkeeper.bookie.LedgerStorage.LedgerDeletionListener; import org.apache.bookkeeper.util.collections.ConcurrentLongHashMap; @@ -29,6 +32,14 @@ class HandleFactoryImpl implements HandleFactory, LedgerDeletionListener { private final ConcurrentLongHashMap ledgers; private final ConcurrentLongHashMap readOnlyLedgers; + /** + * Once the ledger was marked "fenced" before, the ledger was accessed by multi clients. One client is calling + * "delete" now, and other clients may call "write" continuously later. We mark these ledgers can not be written + * anymore. And maintains the state for 7 days is safety. + */ + private final Cache recentlyFencedAndDeletedLedgers = CacheBuilder.newBuilder() + .expireAfterAccess(Duration.ofDays(7)).build(); + final LedgerStorage ledgerStorage; HandleFactoryImpl(LedgerStorage ledgerStorage) { @@ -40,10 +51,14 @@ class HandleFactoryImpl implements HandleFactory, LedgerDeletionListener { } @Override - public LedgerDescriptor getHandle(final long ledgerId, final byte[] masterKey) throws IOException, BookieException { + public LedgerDescriptor getHandle(final long ledgerId, final byte[] masterKey, boolean journalReplay) + throws IOException, BookieException { LedgerDescriptor handle = ledgers.get(ledgerId); if (handle == null) { + if (!journalReplay && recentlyFencedAndDeletedLedgers.getIfPresent(ledgerId) != null) { + throw BookieException.create(BookieException.Code.LedgerFencedException); + } handle = LedgerDescriptor.create(masterKey, ledgerId, ledgerStorage); ledgers.putIfAbsent(ledgerId, handle); } @@ -64,8 +79,22 @@ public LedgerDescriptor getReadOnlyHandle(final long ledgerId) throws IOExceptio return handle; } + private void markIfConflictWritingOccurs(long ledgerId) { + LedgerDescriptor ledgerDescriptor = ledgers.get(ledgerId); + try { + if (ledgerDescriptor != null && ledgerDescriptor.isFenced()) { + recentlyFencedAndDeletedLedgers.put(ledgerId, true); + } + } catch (IOException | BookieException ex) { + // The ledger is in limbo state. + recentlyFencedAndDeletedLedgers.put(ledgerId, true); + } + } + @Override public void ledgerDeleted(long ledgerId) { + markIfConflictWritingOccurs(ledgerId); + // Do delete. ledgers.remove(ledgerId); readOnlyLedgers.remove(ledgerId); } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java index a048bffc8a0..f489f3ffb93 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java @@ -453,7 +453,7 @@ public void testV4Journal() throws Exception { } catch (Bookie.NoEntryException e) { // correct behaviour } - assertTrue(b.handles.getHandle(1, "testPasswd".getBytes()).isFenced()); + assertTrue(b.handles.getHandle(1, "testPasswd".getBytes(), false).isFenced()); b.shutdown(); } @@ -485,7 +485,7 @@ public void testV5Journal() throws Exception { } catch (Bookie.NoEntryException e) { // correct behavior } - assertTrue(b.handles.getHandle(1, "testV5Journal".getBytes()).isFenced()); + assertTrue(b.handles.getHandle(1, "testV5Journal".getBytes(), false).isFenced()); b.shutdown(); } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java index 34751525aa6..77382b4ebde 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java @@ -26,10 +26,18 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; +import lombok.extern.slf4j.Slf4j; +import org.apache.bookkeeper.bookie.Bookie; +import org.apache.bookkeeper.bookie.InterleavedLedgerStorage; +import org.apache.bookkeeper.bookie.LedgerStorage; +import org.apache.bookkeeper.bookie.SortedLedgerStorage; +import org.apache.bookkeeper.bookie.storage.ldb.SingleDirectoryDbLedgerStorage; import org.apache.bookkeeper.client.BookKeeper.DigestType; import org.apache.bookkeeper.conf.ClientConfiguration; import org.apache.bookkeeper.net.BookieId; import org.apache.bookkeeper.test.BookKeeperClusterTestCase; +import org.apache.bookkeeper.test.TestStatsProvider; +import org.awaitility.reflect.WhiteboxImpl; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,6 +46,7 @@ * This unit test tests ledger fencing. * */ +@Slf4j public class TestFencing extends BookKeeperClusterTestCase { private static final Logger LOG = LoggerFactory.getLogger(TestFencing.class); @@ -77,6 +86,7 @@ public void testBasicFencing() throws Exception { fail("Should have thrown an exception when trying to write"); } catch (BKException.BKLedgerFencedException e) { // correct behaviour + log.info("expected a fenced error", e); } /* @@ -87,6 +97,61 @@ public void testBasicFencing() throws Exception { readlh.getLastAddConfirmed() == writelh.getLastAddConfirmed()); } + @Test + public void testWriteAfterDeleted() throws Exception { + LedgerHandle writeLedger; + writeLedger = bkc.createLedger(digestType, "password".getBytes()); + + String tmp = "BookKeeper is cool!"; + for (int i = 0; i < 10; i++) { + long entryId = writeLedger.addEntry(tmp.getBytes()); + LOG.info("entryId: {}", entryId); + } + + // Fence and delete. + BookKeeperTestClient bkc2 = new BookKeeperTestClient(baseClientConf, new TestStatsProvider()); + LedgerHandle readLedger = bkc2.openLedger(writeLedger.getId(), digestType, "password".getBytes()); + bkc2.deleteLedger(readLedger.ledgerId); + + // Waiting for GC. + for (ServerTester server : servers) { + triggerGC(server.getServer().getBookie()); + } + + try { + long entryId = writeLedger.addEntry(tmp.getBytes()); + LOG.info("Not expected: entryId: {}", entryId); + LOG.error("Should have thrown an exception"); + fail("Should have thrown an exception when trying to write"); + } catch (BKException.BKLedgerFencedException e) { + log.info("expected a fenced error", e); + // correct behaviour + } + + /* + * Check it has been recovered properly. + */ + assertTrue("Has not recovered correctly: " + readLedger.getLastAddConfirmed() + + " original " + writeLedger.getLastAddConfirmed(), + readLedger.getLastAddConfirmed() == writeLedger.getLastAddConfirmed()); + + // cleanup. + bkc2.close(); + } + + private void triggerGC(Bookie bookie) { + LedgerStorage ledgerStorage = bookie.getLedgerStorage(); + if (ledgerStorage instanceof InterleavedLedgerStorage + || ledgerStorage instanceof SingleDirectoryDbLedgerStorage) { + Runnable gcThread = WhiteboxImpl.getInternalState(ledgerStorage, "gcThread"); + gcThread.run(); + } else if (ledgerStorage instanceof SortedLedgerStorage) { + Object actLedgerStorage = WhiteboxImpl.getInternalState(ledgerStorage, "interleavedLedgerStorage"); + Runnable gcThread = WhiteboxImpl.getInternalState(actLedgerStorage, "gcThread"); + gcThread.run(); + } + } + private static int threadCount = 0; class LedgerOpenThread extends Thread { From b9c567cbe4d005e19d23ad1db308c8902a8db69b Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 25 Sep 2024 04:32:45 +0300 Subject: [PATCH 191/233] Upgrade protobuf to 3.25.5 to address CVE-2024-7254 (#4508) CVE-2024-7254 Upgrade protobuf to 3.25.5 (cherry picked from commit 0229b5d7cfd93850f05a16f20172f0d39492672f) --- bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 8 ++++---- bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 8 ++++---- bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 8 ++++---- pom.xml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 1cd38248221..b52d8cde66f 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -640,13 +640,13 @@ This product bundles Google Protocol Buffers, which is available under a "3-clau license. Bundled as - - lib/com.google.protobuf-protobuf-java-3.21.9.jar -Source available at https://github.com/google/protobuf/tree/v3.21.9 + - lib/com.google.protobuf-protobuf-java-3.25.5.jar +Source available at https://github.com/google/protobuf/tree/v3.25.5 For details, see deps/protobuf-3.14.0/LICENSE. Bundled as - - lib/com.google.protobuf-protobuf-java-util-3.21.9.jar -Source available at https://github.com/protocolbuffers/protobuf/tree/v3.21.9 + - lib/com.google.protobuf-protobuf-java-util-3.25.5.jar +Source available at https://github.com/protocolbuffers/protobuf/tree/v3.25.5 For details, see deps/protobuf-3.12.0/LICENSE. ------------------------------------------------------------------------------------ This product bundles the JCP Standard Java Servlet API, which is available under a diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index a22f92976fa..b0db094e5b3 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -561,13 +561,13 @@ This product bundles Google Protocol Buffers, which is available under a "3-clau license. Bundled as - - lib/com.google.protobuf-protobuf-java-3.21.9.jar -Source available at https://github.com/google/protobuf/tree/v3.21.9 + - lib/com.google.protobuf-protobuf-java-3.25.5.jar +Source available at https://github.com/google/protobuf/tree/v3.25.5 For details, see deps/protobuf-3.14.0/LICENSE. Bundled as - - lib/com.google.protobuf-protobuf-java-util-3.21.9.jar -Source available at https://github.com/protocolbuffers/protobuf/tree/v3.21.9 + - lib/com.google.protobuf-protobuf-java-util-3.25.5.jar +Source available at https://github.com/protocolbuffers/protobuf/tree/v3.25.5 For details, see deps/protobuf-3.12.0/LICENSE. ------------------------------------------------------------------------------------ This product bundles Simple Logging Facade for Java, which is available under a diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index 6136624d948..06391016441 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -629,13 +629,13 @@ This product bundles Google Protocol Buffers, which is available under a "3-clau license. Bundled as - - lib/com.google.protobuf-protobuf-java-3.21.9.jar -Source available at https://github.com/google/protobuf/tree/v3.21.9 + - lib/com.google.protobuf-protobuf-java-3.25.5.jar +Source available at https://github.com/google/protobuf/tree/v3.25.5 For details, see deps/protobuf-3.14.0/LICENSE. Bundled as - - lib/com.google.protobuf-protobuf-java-util-3.21.9.jar -Source available at https://github.com/protocolbuffers/protobuf/tree/v3.21.9 + - lib/com.google.protobuf-protobuf-java-util-3.25.5.jar +Source available at https://github.com/protocolbuffers/protobuf/tree/v3.25.5 For details, see deps/protobuf-3.12.0/LICENSE. ------------------------------------------------------------------------------------ This product bundles the JCP Standard Java Servlet API, which is available under a diff --git a/pom.xml b/pom.xml index 8bf6926fe7f..6ec4c4c7cb0 100644 --- a/pom.xml +++ b/pom.xml @@ -163,8 +163,8 @@ 0.8.3 4.5.13 4.4.15 - 3.21.9 - 3.21.9 + 3.25.5 + ${protobuf.version} ${grpc.version} 0.9.11 7.9.2 From 33a1985c95d79802103f5ef1d84e3c9b81f56dfd Mon Sep 17 00:00:00 2001 From: Shogo Takayama <37703914+ange-k@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:12:29 +0900 Subject: [PATCH 192/233] Optimize reorderReadSequence to check WriteSet instead of entire Ensemble (#4478) (cherry picked from commit 0376bdce03257def64b95b787e466dac6a9de588) --- .../RackawareEnsemblePlacementPolicyImpl.java | 5 ++- .../TestRackawareEnsemblePlacementPolicy.java | 39 +++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java index 3ddc54cd901..86a9d507fe5 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java @@ -866,8 +866,9 @@ DistributionSchedule.WriteSet reorderReadSequenceWithRegion( if (useRegionAware || reorderReadsRandom) { isAnyBookieUnavailable = true; } else { - for (int i = 0; i < ensemble.size(); i++) { - BookieId bookieAddr = ensemble.get(i); + for (int i = 0; i < writeSet.size(); i++) { + int idx = writeSet.get(i); + BookieId bookieAddr = ensemble.get(idx); if ((!knownBookies.containsKey(bookieAddr) && !readOnlyBookies.contains(bookieAddr)) || slowBookies.getIfPresent(bookieAddr) != null) { // Found at least one bookie not available in the ensemble, or in slowBookies diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java index 857458296e8..0bda0f33306 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java @@ -64,6 +64,7 @@ import org.apache.bookkeeper.stats.Gauge; import org.apache.bookkeeper.stats.NullStatsLogger; import org.apache.bookkeeper.test.TestStatsProvider; +import org.apache.bookkeeper.test.TestStatsProvider.TestOpStatsLogger; import org.apache.bookkeeper.test.TestStatsProvider.TestStatsLogger; import org.apache.bookkeeper.util.StaticDNSResolver; import org.apache.commons.collections4.CollectionUtils; @@ -2275,6 +2276,44 @@ public void testNodeWithFailures() throws Exception { StaticDNSResolver.reset(); } + @Test + public void testSlowBookieInEnsembleOnly() throws Exception { + repp.uninitalize(); + updateMyRack("/r1/rack1"); + + TestStatsProvider statsProvider = new TestStatsProvider(); + TestStatsLogger statsLogger = statsProvider.getStatsLogger(""); + + repp = new RackawareEnsemblePlacementPolicy(); + repp.initialize(conf, Optional.empty(), timer, + DISABLE_ALL, statsLogger, BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER); + repp.withDefaultRack(NetworkTopology.DEFAULT_REGION_AND_RACK); + + TestOpStatsLogger readRequestsReorderedCounter = (TestOpStatsLogger) statsLogger + .getOpStatsLogger(BookKeeperClientStats.READ_REQUESTS_REORDERED); + + // Update cluster + Set addrs = new HashSet(); + addrs.add(addr1.toBookieId()); + addrs.add(addr2.toBookieId()); + addrs.add(addr3.toBookieId()); + addrs.add(addr4.toBookieId()); + repp.onClusterChanged(addrs, new HashSet()); + repp.registerSlowBookie(addr1.toBookieId(), 0L); + Map bookiePendingMap = new HashMap<>(); + bookiePendingMap.put(addr1.toBookieId(), 1L); + repp.onClusterChanged(addrs, new HashSet<>()); + + DistributionSchedule.WriteSet writeSet = writeSetFromValues(1, 2, 3); + + DistributionSchedule.WriteSet reorderSet = repp.reorderReadSequence( + ensemble, getBookiesHealthInfo(new HashMap<>(), bookiePendingMap), writeSet); + + // If the slow bookie is only present in the ensemble, no reordering occurs. + assertEquals(writeSet, reorderSet); + assertEquals(0, readRequestsReorderedCounter.getSuccessCount()); + } + @Test public void testReplaceNotAvailableBookieWithDefaultRack() throws Exception { repp.uninitalize(); From 7cba2a665abc6b7568b4628aafb2d3f928620dfc Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 13 Nov 2024 15:29:25 +0000 Subject: [PATCH 193/233] Upgrade Zookeeper to 3.9.3 to address CVE-2024-51504 (#4523) * Upgrade Zookeeper to 3.9.3 to address CVE-2024-51504 * Upgrade curator to 5.7.1 (cherry picked from commit af8baa18ad9f5d079400f65d8f686a78bf93c393) --- .../src/main/resources/LICENSE-all.bin.txt | 14 +++++++------- .../src/main/resources/LICENSE-bkctl.bin.txt | 14 +++++++------- .../src/main/resources/LICENSE-server.bin.txt | 14 +++++++------- pom.xml | 4 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index b52d8cde66f..5f0a35d2bbf 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -261,9 +261,9 @@ Apache Software License, Version 2. - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17] - 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.8.3.jar [21] -- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [21] -- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.9.3.jar [21] +- lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [21] - lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar [22] - lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar [22] - lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar [22] @@ -296,9 +296,9 @@ Apache Software License, Version 2. - lib/io.grpc-grpc-testing-1.54.1.jar [33] - lib/io.grpc-grpc-xds-1.54.1.jar [33] - lib/io.grpc-grpc-rls-1.54.1.jar[33] -- lib/org.apache.curator-curator-client-5.1.0.jar [34] -- lib/org.apache.curator-curator-framework-5.1.0.jar [34] -- lib/org.apache.curator-curator-recipes-5.1.0.jar [34] +- lib/org.apache.curator-curator-client-5.7.1.jar [34] +- lib/org.apache.curator-curator-framework-5.7.1.jar [34] +- lib/org.apache.curator-curator-recipes-5.7.1.jar [34] - lib/com.google.errorprone-error_prone_annotations-2.9.0.jar [36] - lib/org.apache.yetus-audience-annotations-0.12.0.jar [37] - lib/org.jctools-jctools-core-2.1.2.jar [38] @@ -351,7 +351,7 @@ Apache Software License, Version 2. [29] Source available at https://github.com/google/gson/tree/gson-parent-2.10.1 [30] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.28.0 [33] Source available at https://github.com/grpc/grpc-java/tree/v1.56.0 -[34] Source available at https://github.com/apache/curator/releases/tag/apache.curator-5.1.0 +[34] Source available at https://github.com/apache/curator/releases/tag/apache.curator-5.7.1 [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.12.0 [38] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index b0db094e5b3..cab6b3fc9a2 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -242,9 +242,9 @@ Apache Software License, Version 2. - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16] - 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.8.3.jar [20] -- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [20] -- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [20] +- lib/org.apache.zookeeper-zookeeper-3.9.3.jar [20] +- lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [20] +- lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [20] - lib/com.beust-jcommander-1.82.jar [23] - lib/net.jpountz.lz4-lz4-1.3.0.jar [25] - lib/com.google.api.grpc-proto-google-common-protos-2.9.0.jar [27] @@ -267,9 +267,9 @@ Apache Software License, Version 2. - lib/io.grpc-grpc-testing-1.54.1.jar [32] - lib/io.grpc-grpc-xds-1.54.1.jar [32] - lib/io.grpc-grpc-rls-1.54.1.jar[32] -- lib/org.apache.curator-curator-client-5.1.0.jar [33] -- lib/org.apache.curator-curator-framework-5.1.0.jar [33] -- lib/org.apache.curator-curator-recipes-5.1.0.jar [33] +- lib/org.apache.curator-curator-client-5.7.1.jar [33] +- lib/org.apache.curator-curator-framework-5.7.1.jar [33] +- lib/org.apache.curator-curator-recipes-5.7.1.jar [33] - lib/com.google.errorprone-error_prone_annotations-2.9.0.jar [35] - lib/org.apache.yetus-audience-annotations-0.12.0.jar [36] - lib/org.jctools-jctools-core-2.1.2.jar [37] @@ -310,7 +310,7 @@ Apache Software License, Version 2. [28] Source available at https://github.com/google/gson/tree/gson-parent-2.10.1 [29] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.28.0 [32] Source available at https://github.com/grpc/grpc-java/tree/v1.56.0 -[33] Source available at https://github.com/apache/curator/tree/apache-curator-5.1.0 +[33] Source available at https://github.com/apache/curator/tree/apache-curator-5.7.1 [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.12.0 [37] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index 06391016441..498ba5014de 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -261,9 +261,9 @@ Apache Software License, Version 2. - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17] - 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.8.3.jar [21] -- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [21] -- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.9.3.jar [21] +- lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [21] +- lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [21] - lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar [22] - lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar [22] - lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar [22] @@ -296,9 +296,9 @@ Apache Software License, Version 2. - lib/io.grpc-grpc-testing-1.54.1.jar [33] - lib/io.grpc-grpc-xds-1.54.1.jar [33] - lib/io.grpc-grpc-rls-1.54.1.jar[33] -- lib/org.apache.curator-curator-client-5.1.0.jar [34] -- lib/org.apache.curator-curator-framework-5.1.0.jar [34] -- lib/org.apache.curator-curator-recipes-5.1.0.jar [34] +- lib/org.apache.curator-curator-client-5.7.1.jar [34] +- lib/org.apache.curator-curator-framework-5.7.1.jar [34] +- lib/org.apache.curator-curator-recipes-5.7.1.jar [34] - lib/com.google.errorprone-error_prone_annotations-2.9.0.jar [36] - lib/org.apache.yetus-audience-annotations-0.12.0.jar [37] - lib/org.jctools-jctools-core-2.1.2.jar [38] @@ -347,7 +347,7 @@ Apache Software License, Version 2. [29] Source available at https://github.com/google/gson/tree/gson-parent-2.10.1 [30] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.28.0 [33] Source available at https://github.com/grpc/grpc-java/tree/v1.56.0 -[34] Source available at https://github.com/apache/curator/releases/tag/apache.curator-5.1.0 +[34] Source available at https://github.com/apache/curator/releases/tag/apache.curator-5.7.1 [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.12.0 [38] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2 diff --git a/pom.xml b/pom.xml index 6ec4c4c7cb0..fc45653f953 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 3.6 2.7 1.0.2.4 - 5.1.0 + 5.7.1 4.1.12.1 0.7.7 3.2.2 @@ -175,7 +175,7 @@ 1.3.2 1.19.4 4.5.7 - 3.8.3 + 3.9.3 1.1.10.5 2.1.2 0.9.1 From 48bcef70d17a9688048fd08d344931465af96e25 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 19 Nov 2024 02:12:08 +0200 Subject: [PATCH 194/233] Upgrade to Netty 4.1.115.Final to address CVE-2024-47535 (#4524) (cherry picked from commit d873ca4e0c775b0e61c3c63fd98bdfcb09d33d6d) --- .../src/main/resources/LICENSE-all.bin.txt | 104 +++++++++--------- .../src/main/resources/LICENSE-bkctl.bin.txt | 92 ++++++++-------- .../src/main/resources/LICENSE-server.bin.txt | 104 +++++++++--------- .../src/main/resources/NOTICE-all.bin.txt | 46 ++++---- .../src/main/resources/NOTICE-bkctl.bin.txt | 34 +++--- .../src/main/resources/NOTICE-server.bin.txt | 46 ++++---- pom.xml | 2 +- 7 files changed, 214 insertions(+), 214 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 5f0a35d2bbf..9faf244e122 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -217,32 +217,32 @@ 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.113.Final.jar [11] -- lib/io.netty-netty-codec-4.1.113.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.113.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.113.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.113.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.113.Final.jar [11] -- lib/io.netty-netty-common-4.1.113.Final.jar [11] -- lib/io.netty-netty-handler-4.1.113.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.113.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.113.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.113.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar [11] -- lib/io.netty-netty-transport-4.1.113.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-buffer-4.1.115.Final.jar [11] +- lib/io.netty-netty-codec-4.1.115.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.115.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.115.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.115.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.115.Final.jar [11] +- lib/io.netty-netty-common-4.1.115.Final.jar [11] +- lib/io.netty-netty-handler-4.1.115.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.115.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.115.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.115.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar [11] +- lib/io.netty-netty-transport-4.1.115.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.115.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.113.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.115.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] @@ -332,7 +332,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.113.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.115.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 @@ -372,9 +372,9 @@ Apache Software License, Version 2. [53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.113.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.115.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.113.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.115.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: @@ -383,7 +383,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.113.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -391,7 +391,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.113.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -399,7 +399,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -407,7 +407,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -417,7 +417,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.115.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: @@ -425,7 +425,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.113.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.115.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: @@ -434,7 +434,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.113.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -442,7 +442,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.113.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -450,7 +450,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.115.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: @@ -458,7 +458,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.113.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -466,7 +466,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.113.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -474,7 +474,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.115.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: @@ -482,7 +482,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.113.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -490,7 +490,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.115.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: @@ -499,7 +499,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -507,7 +507,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -515,7 +515,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -523,7 +523,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -531,7 +531,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -539,7 +539,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -547,7 +547,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.115.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: @@ -555,7 +555,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.113.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.115.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: @@ -563,7 +563,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.113.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.115.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: @@ -571,7 +571,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.113.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.115.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: @@ -580,7 +580,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.113.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.115.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: @@ -588,7 +588,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.113.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.115.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 cab6b3fc9a2..dd20fe2fe22 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -217,26 +217,26 @@ 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.113.Final.jar [11] -- lib/io.netty-netty-codec-4.1.113.Final.jar [11] -- lib/io.netty-netty-common-4.1.113.Final.jar [11] -- lib/io.netty-netty-handler-4.1.113.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.113.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar [11] -- lib/io.netty-netty-transport-4.1.113.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-buffer-4.1.115.Final.jar [11] +- lib/io.netty-netty-codec-4.1.115.Final.jar [11] +- lib/io.netty-netty-common-4.1.115.Final.jar [11] +- lib/io.netty-netty-handler-4.1.115.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.115.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar [11] +- lib/io.netty-netty-transport-4.1.115.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.115.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.113.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.115.Final.jar [11] - lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16] @@ -299,7 +299,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.113.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.115.Final [16] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.18.0 [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 @@ -330,9 +330,9 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.113.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.115.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.113.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.115.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: @@ -341,7 +341,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.113.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -349,7 +349,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.113.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -357,7 +357,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -365,7 +365,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -375,7 +375,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.115.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: @@ -383,7 +383,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.113.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.115.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: @@ -392,7 +392,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.113.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -400,7 +400,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.113.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -408,7 +408,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.115.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: @@ -416,7 +416,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.113.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -424,7 +424,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.113.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -432,7 +432,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.115.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: @@ -440,7 +440,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.113.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -448,7 +448,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.115.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: @@ -457,7 +457,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -465,7 +465,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -473,7 +473,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -481,7 +481,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -489,7 +489,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -497,7 +497,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -505,7 +505,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.115.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: @@ -513,7 +513,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.113.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.115.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: @@ -521,7 +521,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.113.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.115.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: @@ -529,7 +529,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.113.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.115.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: @@ -538,7 +538,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.113.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.115.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: @@ -546,7 +546,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.113.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.115.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 498ba5014de..e6430f129a9 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -217,32 +217,32 @@ 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.113.Final.jar [11] -- lib/io.netty-netty-codec-4.1.113.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.113.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.113.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.113.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.113.Final.jar [11] -- lib/io.netty-netty-common-4.1.113.Final.jar [11] -- lib/io.netty-netty-handler-4.1.113.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.113.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.113.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.113.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar [11] -- lib/io.netty-netty-transport-4.1.113.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-buffer-4.1.115.Final.jar [11] +- lib/io.netty-netty-codec-4.1.115.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.115.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.115.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.115.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.115.Final.jar [11] +- lib/io.netty-netty-common-4.1.115.Final.jar [11] +- lib/io.netty-netty-handler-4.1.115.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.115.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.115.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.115.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar [11] +- lib/io.netty-netty-transport-4.1.115.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.115.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.113.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.115.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] @@ -328,7 +328,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.113.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.115.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 @@ -367,9 +367,9 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.113.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.115.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.113.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.115.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: @@ -378,7 +378,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.113.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -386,7 +386,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.113.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -394,7 +394,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -402,7 +402,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -412,7 +412,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.115.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: @@ -420,7 +420,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.113.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.115.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: @@ -429,7 +429,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.113.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -437,7 +437,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.113.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -445,7 +445,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.115.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: @@ -453,7 +453,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.113.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -461,7 +461,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.113.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -469,7 +469,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.115.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: @@ -477,7 +477,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.113.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -485,7 +485,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.115.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: @@ -494,7 +494,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -502,7 +502,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -510,7 +510,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -518,7 +518,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -526,7 +526,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -534,7 +534,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.113.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -542,7 +542,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.113.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.115.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: @@ -550,7 +550,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.113.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.115.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: @@ -558,7 +558,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.113.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.115.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: @@ -566,7 +566,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.113.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.115.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: @@ -575,7 +575,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.113.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.115.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: @@ -583,7 +583,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.113.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.115.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 15a546ab8f9..bacdd97dff5 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -23,31 +23,31 @@ LongAdder), which was released with the following comments: http://creativecommons.org/publicdomain/zero/1.0/ ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.113.Final.jar -- lib/io.netty-netty-codec-4.1.113.Final.jar -- lib/io.netty-netty-codec-dns-4.1.113.Final.jar -- lib/io.netty-netty-codec-http-4.1.113.Final.jar -- lib/io.netty-netty-codec-http2-4.1.113.Final.jar -- lib/io.netty-netty-codec-socks-4.1.113.Final.jar -- lib/io.netty-netty-common-4.1.113.Final.jar -- lib/io.netty-netty-handler-4.1.113.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.113.Final.jar -- lib/io.netty-netty-resolver-4.1.113.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.113.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar -- lib/io.netty-netty-transport-4.1.113.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar +- lib/io.netty-netty-buffer-4.1.115.Final.jar +- lib/io.netty-netty-codec-4.1.115.Final.jar +- lib/io.netty-netty-codec-dns-4.1.115.Final.jar +- lib/io.netty-netty-codec-http-4.1.115.Final.jar +- lib/io.netty-netty-codec-http2-4.1.115.Final.jar +- lib/io.netty-netty-codec-socks-4.1.115.Final.jar +- lib/io.netty-netty-common-4.1.115.Final.jar +- lib/io.netty-netty-handler-4.1.115.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.115.Final.jar +- lib/io.netty-netty-resolver-4.1.115.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.115.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar +- lib/io.netty-netty-transport-4.1.115.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.115.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.113.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.115.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 c5e9b51ab44..9d65a58dd09 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -5,25 +5,25 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.113.Final.jar -- lib/io.netty-netty-codec-4.1.113.Final.jar -- lib/io.netty-netty-common-4.1.113.Final.jar -- lib/io.netty-netty-handler-4.1.113.Final.jar -- lib/io.netty-netty-resolver-4.1.113.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar -- lib/io.netty-netty-transport-4.1.113.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar +- lib/io.netty-netty-buffer-4.1.115.Final.jar +- lib/io.netty-netty-codec-4.1.115.Final.jar +- lib/io.netty-netty-common-4.1.115.Final.jar +- lib/io.netty-netty-handler-4.1.115.Final.jar +- lib/io.netty-netty-resolver-4.1.115.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar +- lib/io.netty-netty-transport-4.1.115.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.115.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.113.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.115.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 208afe4c377..69aef1d677d 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -5,31 +5,31 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.113.Final.jar -- lib/io.netty-netty-codec-4.1.113.Final.jar -- lib/io.netty-netty-codec-dns-4.1.113.Final.jar -- lib/io.netty-netty-codec-http-4.1.113.Final.jar -- lib/io.netty-netty-codec-http2-4.1.113.Final.jar -- lib/io.netty-netty-codec-socks-4.1.113.Final.jar -- lib/io.netty-netty-common-4.1.113.Final.jar -- lib/io.netty-netty-handler-4.1.113.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.113.Final.jar -- lib/io.netty-netty-resolver-4.1.113.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.113.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.66.Final.jar -- lib/io.netty-netty-transport-4.1.113.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.113.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar +- lib/io.netty-netty-buffer-4.1.115.Final.jar +- lib/io.netty-netty-codec-4.1.115.Final.jar +- lib/io.netty-netty-codec-dns-4.1.115.Final.jar +- lib/io.netty-netty-codec-http-4.1.115.Final.jar +- lib/io.netty-netty-codec-http2-4.1.115.Final.jar +- lib/io.netty-netty-codec-socks-4.1.115.Final.jar +- lib/io.netty-netty-common-4.1.115.Final.jar +- lib/io.netty-netty-handler-4.1.115.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.115.Final.jar +- lib/io.netty-netty-resolver-4.1.115.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.115.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar +- lib/io.netty-netty-transport-4.1.115.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.115.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.113.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.115.Final.jar The Netty Project diff --git a/pom.xml b/pom.xml index fc45653f953..338eaa711ac 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 2.18.0 1.3.0 3.12.4 - 4.1.113.Final + 4.1.115.Final 0.0.25.Final 9.1.3 2.0.9 From d1a3bc6a50b2ac5ba468647cdb031ce0d44a52e7 Mon Sep 17 00:00:00 2001 From: Yuri Mizushima Date: Fri, 20 Dec 2024 15:44:59 +0900 Subject: [PATCH 195/233] chore: remove docker tuning from tune-runner-vm action (#4536) (cherry picked from commit e9b1949a9ab06a855482d4895fa492cb1557df84) --- .github/actions/tune-runner-vm/action.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/actions/tune-runner-vm/action.yml b/.github/actions/tune-runner-vm/action.yml index 7e5f77f9a83..32b7ed6bba3 100644 --- a/.github/actions/tune-runner-vm/action.yml +++ b/.github/actions/tune-runner-vm/action.yml @@ -76,13 +76,6 @@ runs: # stop Azure Linux agent to save RAM sudo systemctl stop walinuxagent.service || true - - # enable docker experimental mode which is - # required for using "docker build --squash" / "-Ddocker.squash=true" - daemon_json="$(sudo cat /etc/docker/daemon.json | jq '.experimental = true')" - echo "$daemon_json" | sudo tee /etc/docker/daemon.json - # restart docker daemon - sudo systemctl restart docker echo '::endgroup::' # show memory From baffa345d3d128905c099776f0e555b327661962 Mon Sep 17 00:00:00 2001 From: Zhangjian He Date: Fri, 10 Jan 2025 21:38:07 +0800 Subject: [PATCH 196/233] Bump vertx.version from 4.5.7 to 4.5.11 to address CVE-2024-8391 (#4545) Signed-off-by: Zhangjian He (cherry picked from commit 3732f4b33f919f58d299dc890f34dc4e42794354) --- bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 10 +++++----- .../src/main/resources/LICENSE-server.bin.txt | 10 +++++----- pom.xml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 9faf244e122..071272b18a7 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -251,11 +251,11 @@ Apache Software License, Version 2. - lib/io.prometheus-simpleclient_tracer_common-0.15.0.jar [12] - lib/io.prometheus-simpleclient_tracer_otel-0.15.0.jar [12] - lib/io.prometheus-simpleclient_tracer_otel_agent-0.15.0.jar [12] -- lib/io.vertx-vertx-auth-common-4.5.7.jar [13] -- lib/io.vertx-vertx-bridge-common-4.5.7.jar [14] -- lib/io.vertx-vertx-core-4.5.7.jar [15] -- lib/io.vertx-vertx-web-4.5.7.jar [16] -- lib/io.vertx-vertx-web-common-4.5.7.jar [16] +- lib/io.vertx-vertx-auth-common-4.5.11.jar [13] +- lib/io.vertx-vertx-bridge-common-4.5.11.jar [14] +- lib/io.vertx-vertx-core-4.5.11.jar [15] +- lib/io.vertx-vertx-web-4.5.11.jar [16] +- lib/io.vertx-vertx-web-common-4.5.11.jar [16] - lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [17] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [17] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17] diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index e6430f129a9..d7823fa0aa3 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -251,11 +251,11 @@ Apache Software License, Version 2. - lib/io.prometheus-simpleclient_tracer_common-0.15.0.jar [12] - lib/io.prometheus-simpleclient_tracer_otel-0.15.0.jar [12] - lib/io.prometheus-simpleclient_tracer_otel_agent-0.15.0.jar [12] -- lib/io.vertx-vertx-auth-common-4.5.7.jar [13] -- lib/io.vertx-vertx-bridge-common-4.5.7.jar [14] -- lib/io.vertx-vertx-core-4.5.7.jar [15] -- lib/io.vertx-vertx-web-4.5.7.jar [16] -- lib/io.vertx-vertx-web-common-4.5.7.jar [16] +- lib/io.vertx-vertx-auth-common-4.5.11.jar [13] +- lib/io.vertx-vertx-bridge-common-4.5.11.jar [14] +- lib/io.vertx-vertx-core-4.5.11.jar [15] +- lib/io.vertx-vertx-web-4.5.11.jar [16] +- lib/io.vertx-vertx-web-common-4.5.11.jar [16] - lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [17] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [17] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17] diff --git a/pom.xml b/pom.xml index 338eaa711ac..3993cdf2549 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ 4.6.0 1.3.2 1.19.4 - 4.5.7 + 4.5.11 3.9.3 1.1.10.5 2.1.2 From e46da064d1fc917a7ec80bdc67954aab51a1fd21 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 1 Apr 2025 06:49:35 +0300 Subject: [PATCH 197/233] Add documentation to bk_server.conf about RocksDB config (#4561) (cherry picked from commit 64abf31a299a1aad02d4b6ead3fcf24a1cd73025) --- conf/bk_server.conf | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/conf/bk_server.conf b/conf/bk_server.conf index db7cd9cfe08..8a475c2fae2 100755 --- a/conf/bk_server.conf +++ b/conf/bk_server.conf @@ -760,17 +760,31 @@ gcEntryLogMetadataCacheEnabled=false # How many entries to pre-fill in cache after a read cache miss # dbStorage_readAheadCacheBatchSize=100 +############################################################################# ## RocksDB specific configurations +############################################################################# ## DbLedgerStorage uses RocksDB to store the indexes from -## (ledgerId, entryId) -> (entryLog, offset) - +## (ledgerId, entryId) -> (entryLog, offset). This is called the entry location database. +## There's also a separate RocksDB database to to store the ledger metadata. +# +# RocksDB configuration can be applied in two ways: by using a configuration file +# or by setting individual properties. +# +# Most individual properties are applied only to the entry location database. +# To fine-tune the ledger metadata database, the configuration file method should be used. +# +# These properties apply to both entry location and ledger metadata databases +############################################################################# +# dbStorage_rocksDB_format_version=5 +# dbStorage_rocksDB_checksum_type=kxxHash +############################################################################# +# Entry location RocksDB database specific configurations: # Size of RocksDB block-cache. For best performance, this cache # should be big enough to hold a significant portion of the index # database which can reach ~2GB in some cases # Default is to use 10% / numberOfLedgers of the direct memory size # dbStorage_rocksDB_blockCacheSize= - -# Other RocksDB specific tunables +# Other RocksDB specific tunables for the entry location database # dbStorage_rocksDB_writeBufferSizeMB=64 # dbStorage_rocksDB_sstSizeInMB=64 # dbStorage_rocksDB_blockSize=65536 @@ -779,7 +793,12 @@ gcEntryLogMetadataCacheEnabled=false # dbStorage_rocksDB_numFilesInLevel0=4 # dbStorage_rocksDB_maxSizeInLevel1MB=256 # dbStorage_rocksDB_logPath= -# dbStorage_rocksDB_format_version=5 +############################################################################# +# Alternative RocksDB configuration by using configuration files. +############################################################################# +# entryLocationRocksdbConf=conf/entry_location_rocksdb.conf +# ledgerMetadataRocksdbConf=conf/ledger_metadata_rocksdb.conf +# defaultRocksdbConf=conf/default_rocksdb.conf ############################################################################# ## DirectIO entry logger configuration From b00d2e0cd45ee4301ed4af74a734384877ad4e8e Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 1 Apr 2025 17:58:10 +0300 Subject: [PATCH 198/233] Ensure that formatVersion is specified for all RocksDB dbs (#4559) (cherry picked from commit 4d8b927945a4f235c4a91b3fc7387fa7bf939c0d) --- .../bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java index 0c13c1c8bff..22c5bc75dbc 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java @@ -182,6 +182,7 @@ private RocksDB initializeRocksDBWithBookieConf(String basePath, String subPath, Options options = new Options(); options.setCreateIfMissing(true); ChecksumType checksumType = ChecksumType.valueOf(conf.getString(ROCKSDB_CHECKSUM_TYPE, "kxxHash")); + int formatVersion = conf.getInt(ROCKSDB_FORMAT_VERSION, 5); if (dbConfigType == DbConfigType.EntryLocation) { /* Set default RocksDB block-cache size to 10% / numberOfLedgers of direct memory, unless override */ @@ -198,7 +199,6 @@ private RocksDB initializeRocksDBWithBookieConf(String basePath, String subPath, int blockSize = conf.getInt(ROCKSDB_BLOCK_SIZE, 64 * 1024); int bloomFilterBitsPerKey = conf.getInt(ROCKSDB_BLOOM_FILTERS_BITS_PER_KEY, 10); boolean lz4CompressionEnabled = conf.getBoolean(ROCKSDB_LZ4_COMPRESSION_ENABLED, true); - int formatVersion = conf.getInt(ROCKSDB_FORMAT_VERSION, 5); if (lz4CompressionEnabled) { options.setCompressionType(CompressionType.LZ4_COMPRESSION); @@ -235,6 +235,7 @@ private RocksDB initializeRocksDBWithBookieConf(String basePath, String subPath, } else { this.cache = null; BlockBasedTableConfig tableOptions = new BlockBasedTableConfig(); + tableOptions.setFormatVersion(formatVersion); tableOptions.setChecksumType(checksumType); options.setTableFormatConfig(tableOptions); } From a18dc640ba4f23d24f3bf80787ecf2123a9a0751 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 2 Apr 2025 10:43:00 +0300 Subject: [PATCH 199/233] Improve locating config files (#4560) (cherry picked from commit f34455b2dafb7ce164b5f81db8b252a7b5cd1a7d) --- .../storage/ldb/KeyValueStorageRocksDB.java | 3 +- .../bookkeeper/conf/ServerConfiguration.java | 46 +++++++++++-------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java index 22c5bc75dbc..c9e72847fbc 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java @@ -40,6 +40,7 @@ import java.util.concurrent.TimeUnit; import org.apache.bookkeeper.bookie.storage.ldb.KeyValueStorageFactory.DbConfigType; import org.apache.bookkeeper.conf.ServerConfiguration; +import org.apache.commons.lang3.StringUtils; import org.rocksdb.BlockBasedTableConfig; import org.rocksdb.BloomFilter; import org.rocksdb.Cache; @@ -131,7 +132,7 @@ public KeyValueStorageRocksDB(String basePath, String subPath, DbConfigType dbCo dbFilePath = conf.getDefaultRocksDBConf(); } log.info("Searching for a RocksDB configuration file in {}", dbFilePath); - if (Paths.get(dbFilePath).toFile().exists()) { + if (StringUtils.isNotBlank(dbFilePath) && Paths.get(dbFilePath).toFile().exists()) { log.info("Found a RocksDB configuration file and using it to initialize the RocksDB"); db = initializeRocksDBWithConfFile(basePath, subPath, dbConfigType, conf, readOnly, dbFilePath); } else { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java index 1f04e53f575..9a6f0e5b9e3 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java @@ -25,6 +25,7 @@ import java.io.File; import java.net.URL; import java.util.concurrent.TimeUnit; +import lombok.SneakyThrows; import org.apache.bookkeeper.bookie.FileChannelProvider; import org.apache.bookkeeper.bookie.InterleavedLedgerStorage; import org.apache.bookkeeper.bookie.LedgerStorage; @@ -4047,12 +4048,7 @@ public boolean isSkipReplayJournalInvalidRecord() { * @return String configured default rocksdb conf. */ public String getDefaultRocksDBConf() { - String defaultPath = "conf/default_rocksdb.conf"; - URL defURL = getClass().getClassLoader().getResource(defaultPath); - if (defURL != null) { - defaultPath = defURL.getPath(); - } - return getString(DEFAULT_ROCKSDB_CONF, defaultPath); + return getString(DEFAULT_ROCKSDB_CONF, getDefaultFilePath("conf/default_rocksdb.conf")); } /** @@ -4071,12 +4067,7 @@ public ServerConfiguration setDefaultRocksDBConf(String defaultRocksdbConf) { * @return String configured entry Location rocksdb conf. */ public String getEntryLocationRocksdbConf() { - String defaultPath = "conf/entry_location_rocksdb.conf"; - URL defURL = getClass().getClassLoader().getResource(defaultPath); - if (defURL != null) { - defaultPath = defURL.getPath(); - } - return getString(ENTRY_LOCATION_ROCKSDB_CONF, defaultPath); + return getString(ENTRY_LOCATION_ROCKSDB_CONF, getDefaultFilePath("conf/entry_location_rocksdb.conf")); } /** @@ -4095,12 +4086,7 @@ public ServerConfiguration setEntryLocationRocksdbConf(String entryLocationRocks * @return String configured ledger metadata rocksdb conf. */ public String getLedgerMetadataRocksdbConf() { - String defaultPath = "conf/ledger_metadata_rocksdb.conf"; - URL defURL = getClass().getClassLoader().getResource(defaultPath); - if (defURL != null) { - defaultPath = defURL.getPath(); - } - return getString(LEDGER_METADATA_ROCKSDB_CONF, defaultPath); + return getString(LEDGER_METADATA_ROCKSDB_CONF, getDefaultFilePath("conf/ledger_metadata_rocksdb.conf")); } /** @@ -4133,4 +4119,28 @@ public ServerConfiguration setOperationMaxNumbersInSingleRocksDBWriteBatch(int m public int getMaxOperationNumbersInSingleRocksDBBatch() { return getInt(MAX_OPERATION_NUMBERS_IN_SINGLE_ROCKSDB_WRITE_BATCH, 100000); } + + /** + * Retrieves the default file path for the specified file name. + * This method prioritizes a file available in the classpath, which is often used in testing scenarios. + * If the file is not found in the classpath, the original file name is returned. + * + * @param fileName the name of the file for which to retrieve the path. + * @return the path of the file if found in the classpath, otherwise the input file name. + */ + @SneakyThrows + private String getDefaultFilePath(String fileName) { + // Attempt to locate the file in the classpath, used mainly for testing purposes. + URL resourceURL = getClass().getClassLoader().getResource(fileName); + if (resourceURL != null && "file".equals(resourceURL.getProtocol())) { + // Convert the URL to a File object using toURI() for proper URL decoding + // and platform specific file path handling (such as on Windows OS) + File file = new File(resourceURL.toURI()); + if (file.exists()) { + return file.getAbsolutePath(); + } + } + // Return the original file name if no path was found in the classpath + return fileName; + } } From 84ca507b823754085162f7b71a0dbdf8a1e1a5fc Mon Sep 17 00:00:00 2001 From: lifepuzzlefun Date: Wed, 16 Apr 2025 17:36:57 +0800 Subject: [PATCH 200/233] Reduce metadataLock contention in LedgerHandle (#4549) (cherry picked from commit b10aec21bf35eefb73b96e95028eab7d759209f6) --- .../bookkeeper/client/LedgerHandle.java | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java index 0ea5f8fec14..e99d8ba91df 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java @@ -1849,19 +1849,24 @@ void notifyWriteFailed(int index, BookieId addr) { } void maybeHandleDelayedWriteBookieFailure() { + Map toReplace = null; synchronized (metadataLock) { if (delayedWriteFailedBookies.isEmpty()) { return; } - Map toReplace = new HashMap<>(delayedWriteFailedBookies); + toReplace = new HashMap<>(delayedWriteFailedBookies); delayedWriteFailedBookies.clear(); + } - // Original intent of this change is to do a best-effort ensemble change. - // But this is not possible until the local metadata is completely immutable. - // Until the feature "Make LedgerMetadata Immutable #610" Is complete we will use - // handleBookieFailure() to handle delayed writes as regular bookie failures. - handleBookieFailure(toReplace); + if (toReplace.isEmpty()) { + return; } + + // Original intent of this change is to do a best-effort ensemble change. + // But this is not possible until the local metadata is completely immutable. + // Until the feature "Make LedgerMetadata Immutable #610" Is complete we will use + // handleBookieFailure() to handle delayed writes as regular bookie failures. + handleBookieFailure(toReplace); } void handleBookieFailure(final Map failedBookies) { @@ -1980,12 +1985,12 @@ void ensembleChangeLoop(List origEnsemble, Map fail List newEnsemble = null; Set replaced = null; + + Map toReplace = null; synchronized (metadataLock) { if (!delayedWriteFailedBookies.isEmpty()) { - Map toReplace = new HashMap<>(delayedWriteFailedBookies); + toReplace = new HashMap<>(delayedWriteFailedBookies); delayedWriteFailedBookies.clear(); - - ensembleChangeLoop(origEnsemble, toReplace); } else { newEnsemble = getCurrentEnsemble(); replaced = EnsembleUtils.diffEnsemble(origEnsemble, newEnsemble); @@ -1994,6 +1999,11 @@ void ensembleChangeLoop(List origEnsemble, Map fail changingEnsemble = false; } } + + if (toReplace != null && !toReplace.isEmpty()) { + ensembleChangeLoop(origEnsemble, toReplace); + } + if (newEnsemble != null) { // unsetSuccess outside of lock unsetSuccessAndSendWriteRequest(newEnsemble, replaced); } From 2182932602d1ecb0b24c9d38cde25c13dea1ca75 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 16 Apr 2025 16:29:41 +0300 Subject: [PATCH 201/233] Upgrade Netty to 4.1.119, tcnative to 2.0.70 and io_uring to 0.0.26 (#4584) (cherry picked from commit 02d7f9fb35ac9799e7c62a31d089762f6483fb2f) --- .../src/main/resources/LICENSE-all.bin.txt | 110 +++++++++--------- .../src/main/resources/LICENSE-bkctl.bin.txt | 98 ++++++++-------- .../src/main/resources/LICENSE-server.bin.txt | 110 +++++++++--------- .../src/main/resources/NOTICE-all.bin.txt | 50 ++++---- .../src/main/resources/NOTICE-bkctl.bin.txt | 38 +++--- .../src/main/resources/NOTICE-server.bin.txt | 50 ++++---- pom.xml | 4 +- 7 files changed, 230 insertions(+), 230 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 071272b18a7..822a641b006 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -217,32 +217,32 @@ 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.115.Final.jar [11] -- lib/io.netty-netty-codec-4.1.115.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.115.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.115.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.115.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.115.Final.jar [11] -- lib/io.netty-netty-common-4.1.115.Final.jar [11] -- lib/io.netty-netty-handler-4.1.115.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.115.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.115.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.115.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar [11] -- lib/io.netty-netty-transport-4.1.115.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.115.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.115.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.119.Final.jar [11] +- lib/io.netty-netty-codec-4.1.119.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.119.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.119.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.119.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.119.Final.jar [11] +- lib/io.netty-netty-common-4.1.119.Final.jar [11] +- lib/io.netty-netty-handler-4.1.119.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.119.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.119.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.119.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar [11] +- lib/io.netty-netty-transport-4.1.119.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.26.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.119.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] @@ -332,7 +332,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.115.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.119.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 @@ -372,9 +372,9 @@ Apache Software License, Version 2. [53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.115.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.115.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.119.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: @@ -383,7 +383,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.115.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -391,7 +391,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.115.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -399,7 +399,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -407,7 +407,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -417,7 +417,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.119.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: @@ -425,7 +425,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.115.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.119.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: @@ -434,7 +434,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.115.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -442,7 +442,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.115.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -450,7 +450,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.119.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: @@ -458,7 +458,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.115.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -466,7 +466,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.115.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -474,7 +474,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.119.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: @@ -482,7 +482,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.115.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -490,7 +490,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.119.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: @@ -499,7 +499,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -507,7 +507,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -515,7 +515,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -523,7 +523,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -531,7 +531,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -539,7 +539,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -547,7 +547,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.119.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: @@ -555,7 +555,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.115.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.119.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: @@ -563,7 +563,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.115.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.119.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: @@ -571,7 +571,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.115.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.119.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: @@ -580,7 +580,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.115.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.119.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: @@ -588,7 +588,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.115.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.119.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 dd20fe2fe22..b80c54515dc 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -217,26 +217,26 @@ 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.115.Final.jar [11] -- lib/io.netty-netty-codec-4.1.115.Final.jar [11] -- lib/io.netty-netty-common-4.1.115.Final.jar [11] -- lib/io.netty-netty-handler-4.1.115.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.115.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar [11] -- lib/io.netty-netty-transport-4.1.115.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.115.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.115.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.119.Final.jar [11] +- lib/io.netty-netty-codec-4.1.119.Final.jar [11] +- lib/io.netty-netty-common-4.1.119.Final.jar [11] +- lib/io.netty-netty-handler-4.1.119.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.119.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar [11] +- lib/io.netty-netty-transport-4.1.119.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.26.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.119.Final.jar [11] - lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16] @@ -299,7 +299,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.115.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.119.Final [16] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.18.0 [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 @@ -330,9 +330,9 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.115.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.115.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.119.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: @@ -341,7 +341,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.115.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -349,7 +349,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.115.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -357,7 +357,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -365,7 +365,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -375,7 +375,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.119.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: @@ -383,7 +383,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.115.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.119.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: @@ -392,7 +392,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.115.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -400,7 +400,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.115.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -408,7 +408,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.119.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: @@ -416,7 +416,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.115.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -424,7 +424,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.115.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -432,7 +432,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.119.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: @@ -440,7 +440,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.115.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -448,7 +448,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.119.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: @@ -457,7 +457,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -465,7 +465,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -473,7 +473,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -481,7 +481,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -489,7 +489,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -497,7 +497,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -505,7 +505,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.119.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: @@ -513,7 +513,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.115.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.119.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: @@ -521,7 +521,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.115.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.119.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: @@ -529,7 +529,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.115.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.119.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: @@ -538,7 +538,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.115.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.119.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: @@ -546,7 +546,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.115.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.119.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 d7823fa0aa3..b962cf3842f 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -217,32 +217,32 @@ 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.115.Final.jar [11] -- lib/io.netty-netty-codec-4.1.115.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.115.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.115.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.115.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.115.Final.jar [11] -- lib/io.netty-netty-common-4.1.115.Final.jar [11] -- lib/io.netty-netty-handler-4.1.115.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.115.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.115.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.115.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar [11] -- lib/io.netty-netty-transport-4.1.115.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.115.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.115.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.119.Final.jar [11] +- lib/io.netty-netty-codec-4.1.119.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.119.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.119.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.119.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.119.Final.jar [11] +- lib/io.netty-netty-common-4.1.119.Final.jar [11] +- lib/io.netty-netty-handler-4.1.119.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.119.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.119.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.119.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar [11] +- lib/io.netty-netty-transport-4.1.119.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar [11] +- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.26.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.119.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] @@ -328,7 +328,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.115.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.119.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 @@ -367,9 +367,9 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.115.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.115.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.119.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: @@ -378,7 +378,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.115.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -386,7 +386,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.115.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -394,7 +394,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -402,7 +402,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -412,7 +412,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.119.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: @@ -420,7 +420,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.115.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.119.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: @@ -429,7 +429,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.115.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -437,7 +437,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.115.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -445,7 +445,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.119.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: @@ -453,7 +453,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.115.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -461,7 +461,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.115.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -469,7 +469,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.119.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: @@ -477,7 +477,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.115.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -485,7 +485,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.119.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: @@ -494,7 +494,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -502,7 +502,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -510,7 +510,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -518,7 +518,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -526,7 +526,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -534,7 +534,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.115.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -542,7 +542,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.115.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.119.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: @@ -550,7 +550,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.115.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.119.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: @@ -558,7 +558,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.115.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.119.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: @@ -566,7 +566,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.115.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.119.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: @@ -575,7 +575,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.115.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.119.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: @@ -583,7 +583,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.115.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.119.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 bacdd97dff5..6a5034b6495 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -23,31 +23,31 @@ LongAdder), which was released with the following comments: http://creativecommons.org/publicdomain/zero/1.0/ ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.115.Final.jar -- lib/io.netty-netty-codec-4.1.115.Final.jar -- lib/io.netty-netty-codec-dns-4.1.115.Final.jar -- lib/io.netty-netty-codec-http-4.1.115.Final.jar -- lib/io.netty-netty-codec-http2-4.1.115.Final.jar -- lib/io.netty-netty-codec-socks-4.1.115.Final.jar -- lib/io.netty-netty-common-4.1.115.Final.jar -- lib/io.netty-netty-handler-4.1.115.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.115.Final.jar -- lib/io.netty-netty-resolver-4.1.115.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.115.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar -- lib/io.netty-netty-transport-4.1.115.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.115.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.115.Final.jar +- lib/io.netty-netty-buffer-4.1.119.Final.jar +- lib/io.netty-netty-codec-4.1.119.Final.jar +- lib/io.netty-netty-codec-dns-4.1.119.Final.jar +- lib/io.netty-netty-codec-http-4.1.119.Final.jar +- lib/io.netty-netty-codec-http2-4.1.119.Final.jar +- lib/io.netty-netty-codec-socks-4.1.119.Final.jar +- lib/io.netty-netty-common-4.1.119.Final.jar +- lib/io.netty-netty-handler-4.1.119.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.119.Final.jar +- lib/io.netty-netty-resolver-4.1.119.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.119.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar +- lib/io.netty-netty-transport-4.1.119.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.119.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 9d65a58dd09..602eb0b5850 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -5,25 +5,25 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.115.Final.jar -- lib/io.netty-netty-codec-4.1.115.Final.jar -- lib/io.netty-netty-common-4.1.115.Final.jar -- lib/io.netty-netty-handler-4.1.115.Final.jar -- lib/io.netty-netty-resolver-4.1.115.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar -- lib/io.netty-netty-transport-4.1.115.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.115.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.115.Final.jar +- lib/io.netty-netty-buffer-4.1.119.Final.jar +- lib/io.netty-netty-codec-4.1.119.Final.jar +- lib/io.netty-netty-common-4.1.119.Final.jar +- lib/io.netty-netty-handler-4.1.119.Final.jar +- lib/io.netty-netty-resolver-4.1.119.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar +- lib/io.netty-netty-transport-4.1.119.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.119.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 69aef1d677d..54322df1ae2 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -5,31 +5,31 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.115.Final.jar -- lib/io.netty-netty-codec-4.1.115.Final.jar -- lib/io.netty-netty-codec-dns-4.1.115.Final.jar -- lib/io.netty-netty-codec-http-4.1.115.Final.jar -- lib/io.netty-netty-codec-http2-4.1.115.Final.jar -- lib/io.netty-netty-codec-socks-4.1.115.Final.jar -- lib/io.netty-netty-common-4.1.115.Final.jar -- lib/io.netty-netty-handler-4.1.115.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.115.Final.jar -- lib/io.netty-netty-resolver-4.1.115.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.115.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar [11] -- lib/io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar [11] -- lib/io.netty-netty-tcnative-classes-2.0.69.Final.jar -- lib/io.netty-netty-transport-4.1.115.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.115.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.115.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.115.Final.jar +- lib/io.netty-netty-buffer-4.1.119.Final.jar +- lib/io.netty-netty-codec-4.1.119.Final.jar +- lib/io.netty-netty-codec-dns-4.1.119.Final.jar +- lib/io.netty-netty-codec-http-4.1.119.Final.jar +- lib/io.netty-netty-codec-http2-4.1.119.Final.jar +- lib/io.netty-netty-codec-socks-4.1.119.Final.jar +- lib/io.netty-netty-common-4.1.119.Final.jar +- lib/io.netty-netty-handler-4.1.119.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.119.Final.jar +- lib/io.netty-netty-resolver-4.1.119.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.119.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-aarch_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar [11] +- lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] +- lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar +- lib/io.netty-netty-transport-4.1.119.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar +- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.119.Final.jar The Netty Project diff --git a/pom.xml b/pom.xml index 3993cdf2549..e8f86548469 100644 --- a/pom.xml +++ b/pom.xml @@ -155,8 +155,8 @@ 2.18.0 1.3.0 3.12.4 - 4.1.115.Final - 0.0.25.Final + 4.1.119.Final + 0.0.26.Final 9.1.3 2.0.9 0.15.0 From a01aa111a4b10c779cd883a120e7ee3a2e3226d5 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 16 Apr 2025 12:42:57 +0300 Subject: [PATCH 202/233] Upgrade Apache Commons libraries to compatible versions (#4582) While working on #4580, I noticed that the Commons Compress version and the Commons Codec library version aren't compatible. It causes a ClassDefNotFoundError in running tests which were using some specific methods of docker-java. While exploring this, I noticed that Apache Commons library versions haven't been kept up-to-date for a long time and it's better to handle that for 4.18.0 release. - upgrade commons-cli from 1.2 to 1.9.0 - upgrade commons-codec from 1.6 to 1.18.0 - upgrade commons-io from 2.17.0 to 2.19.0 - upgrade commons-lang3 from 3.6 to 3.17.0 - upgrade commons-compress from 1.26.0 to 1.27.0 (cherry picked from commit bcd6b52fcaa9b82cd60dbc3a8583df4ca60796e7) --- .../src/main/resources/LICENSE-all.bin.txt | 15 ++++++++------- .../src/main/resources/LICENSE-bkctl.bin.txt | 16 ++++++++-------- .../src/main/resources/LICENSE-server.bin.txt | 15 ++++++++------- pom.xml | 10 +++++----- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 822a641b006..863e2cb17de 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -211,10 +211,10 @@ Apache Software License, Version 2. - lib/com.google.guava-guava-32.0.1-jre.jar [4] - lib/com.google.guava-failureaccess-1.0.1.jar [4] - lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4] -- lib/commons-cli-commons-cli-1.2.jar [5] -- lib/commons-codec-commons-codec-1.6.jar [6] +- lib/commons-cli-commons-cli-1.9.0.jar [5] +- lib/commons-codec-commons-codec-1.18.0.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.19.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.119.Final.jar [11] @@ -260,7 +260,7 @@ Apache Software License, Version 2. - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [17] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17] - lib/org.apache.commons-commons-collections4-4.1.jar [19] -- lib/org.apache.commons-commons-lang3-3.6.jar [20] +- lib/org.apache.commons-commons-lang3-3.17.0.jar [58] - lib/org.apache.zookeeper-zookeeper-3.9.3.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [21] - lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [21] @@ -326,10 +326,10 @@ Apache Software License, Version 2. [2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1 [3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1 [4] Source available at https://github.com/google/guava/tree/v32.0.1 -[5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2 -[6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2 +[5] Source available at https://github.com/apache/commons-cli/tree/rel/commons-cli-1.9.0 +[6] Source available at https://github.com/apache/commons-codec/tree/rel/commons-codec-1.18.0 [7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10 -[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.7 +[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0 [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.119.Final @@ -370,6 +370,7 @@ Apache Software License, Version 2. [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/HdrHistogram/HdrHistogram/tree/HdrHistogram-2.1.10 [53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 +[58] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0 ------------------------------------------------------------------------------------ lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index b80c54515dc..95c925e1ff2 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -211,10 +211,10 @@ Apache Software License, Version 2. - lib/com.google.guava-guava-32.0.1-jre.jar [4] - lib/com.google.guava-failureaccess-1.0.1.jar [4] - lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4] -- lib/commons-cli-commons-cli-1.2.jar [5] -- lib/commons-codec-commons-codec-1.6.jar [6] +- lib/commons-cli-commons-cli-1.9.0.jar [5] +- lib/commons-codec-commons-codec-1.18.0.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.19.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.119.Final.jar [11] @@ -241,7 +241,7 @@ Apache Software License, Version 2. - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16] - lib/org.apache.commons-commons-collections4-4.1.jar [18] -- lib/org.apache.commons-commons-lang3-3.6.jar [19] +- lib/org.apache.commons-commons-lang3-3.17.0.jar [55] - lib/org.apache.zookeeper-zookeeper-3.9.3.jar [20] - lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [20] - lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [20] @@ -293,10 +293,10 @@ Apache Software License, Version 2. [2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1 [3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1 [4] Source available at https://github.com/google/guava/tree/v32.0.1 -[5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2 -[6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2 +[5] Source available at https://github.com/apache/commons-cli/tree/rel/commons-cli-1.9.0 +[6] Source available at https://github.com/apache/commons-codec/tree/rel/commons-codec-1.18.0 [7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10 -[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.7 +[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0 [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.119.Final @@ -328,7 +328,7 @@ Apache Software License, Version 2. [50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5 [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 - +[55] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0 ------------------------------------------------------------------------------------ lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index b962cf3842f..923799bd091 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -211,10 +211,10 @@ Apache Software License, Version 2. - lib/com.google.guava-guava-32.0.1-jre.jar [4] - lib/com.google.guava-failureaccess-1.0.1.jar [4] - lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4] -- lib/commons-cli-commons-cli-1.2.jar [5] -- lib/commons-codec-commons-codec-1.6.jar [6] +- lib/commons-cli-commons-cli-1.9.0.jar [5] +- lib/commons-codec-commons-codec-1.18.0.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.19.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.119.Final.jar [11] @@ -260,7 +260,7 @@ Apache Software License, Version 2. - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [17] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17] - lib/org.apache.commons-commons-collections4-4.1.jar [19] -- lib/org.apache.commons-commons-lang3-3.6.jar [20] +- lib/org.apache.commons-commons-lang3-3.17.0.jar [57] - lib/org.apache.zookeeper-zookeeper-3.9.3.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [21] - lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [21] @@ -322,10 +322,10 @@ Apache Software License, Version 2. [2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1 [3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1 [4] Source available at https://github.com/google/guava/tree/v32.0.1 -[5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2 -[6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2 +[5] Source available at https://github.com/apache/commons-cli/tree/rel/commons-cli-1.9.0 +[6] Source available at https://github.com/apache/commons-codec/tree/rel/commons-codec-1.18.0 [7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10 -[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.7 +[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0 [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.119.Final @@ -365,6 +365,7 @@ Apache Software License, Version 2. [50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5 [51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1 [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 +[57] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0 ------------------------------------------------------------------------------------ lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies diff --git a/pom.xml b/pom.xml index e8f86548469..a728d3e46fb 100644 --- a/pom.xml +++ b/pom.xml @@ -118,14 +118,14 @@ 1.18.2 1.8.0.Final 3.0.1 - 1.2 + 1.9.0 4.1 - 1.6 + 1.18.0 1.10 - 1.26.0 + 1.27.1 2.6 - 3.6 - 2.7 + 3.17.0 + 2.19.0 1.0.2.4 5.7.1 4.1.12.1 From 3795f559e006726cc0d500e5f98386693b47bdb5 Mon Sep 17 00:00:00 2001 From: zzb <48124861+zhaizhibo@users.noreply.github.com> Date: Thu, 17 Apr 2025 16:33:04 +0800 Subject: [PATCH 203/233] Fix the coredump that occurs when calling KeyValueStorageRocksDB.count after rocksdb has been closed (#4581) * Fix the coredump that occurs when calling KeyValueStorageRocksDB.count() (possibly triggered by Prometheus) after RocksDB has been closed(#4243) * fix race when count op in process and db gets closed. --------- Co-authored-by: zhaizhibo (cherry picked from commit 2831ed3405069f2212e2c6204f645e503319ba69) --- .../storage/ldb/KeyValueStorageRocksDB.java | 25 +++++++++++++++++-- .../ldb/KeyValueStorageRocksDBTest.java | 17 +++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java index c9e72847fbc..b870fb5939d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java @@ -38,6 +38,7 @@ import java.util.List; import java.util.Map.Entry; import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.bookkeeper.bookie.storage.ldb.KeyValueStorageFactory.DbConfigType; import org.apache.bookkeeper.conf.ServerConfiguration; import org.apache.commons.lang3.StringUtils; @@ -74,6 +75,8 @@ public class KeyValueStorageRocksDB implements KeyValueStorage { static KeyValueStorageFactory factory = (defaultBasePath, subPath, dbConfigType, conf) -> new KeyValueStorageRocksDB(defaultBasePath, subPath, dbConfigType, conf); + private volatile boolean closed = true; + private final ReentrantReadWriteLock closedLock = new ReentrantReadWriteLock(); private final RocksDB db; private RocksObject options; private List columnFamilyDescriptors; @@ -147,6 +150,7 @@ public KeyValueStorageRocksDB(String basePath, String subPath, DbConfigType dbCo optionDontCache.setFillCache(false); this.writeBatchMaxSize = conf.getMaxOperationNumbersInSingleRocksDBBatch(); + this.closed = false; } private RocksDB initializeRocksDBWithConfFile(String basePath, String subPath, DbConfigType dbConfigType, @@ -287,7 +291,13 @@ private RocksDB initializeRocksDBWithBookieConf(String basePath, String subPath, @Override public void close() throws IOException { - db.close(); + try { + closedLock.writeLock().lock(); + closed = true; + db.close(); + } finally { + closedLock.writeLock().unlock(); + } if (cache != null) { cache.close(); } @@ -513,7 +523,18 @@ public void close() { @Override public long count() throws IOException { try { - return db.getLongProperty("rocksdb.estimate-num-keys"); + if (closed) { + throw new IOException("RocksDB is closed"); + } + try { + closedLock.readLock().lock(); + if (!closed) { + return db.getLongProperty("rocksdb.estimate-num-keys"); + } + throw new IOException("RocksDB is closed"); + } finally { + closedLock.readLock().unlock(); + } } catch (RocksDBException e) { throw new IOException("Error in getting records count", e); } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDBTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDBTest.java index 2ef3e010f8b..97be7ae7c78 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDBTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDBTest.java @@ -21,9 +21,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import java.io.File; +import java.io.IOException; import java.net.URL; import java.nio.file.Files; import java.nio.file.Paths; @@ -131,4 +133,19 @@ public void testLevelCompactionDynamicLevelBytesFromConfigurationFile() throws E ColumnFamilyOptions familyOptions = columnFamilyDescriptorList.get(0).getOptions(); assertEquals(true, familyOptions.levelCompactionDynamicLevelBytes()); } + + @Test + public void testCallCountAfterClose() throws IOException { + ServerConfiguration configuration = new ServerConfiguration(); + URL url = getClass().getClassLoader().getResource("test_entry_location_rocksdb.conf"); + configuration.setEntryLocationRocksdbConf(url.getPath()); + File tmpDir = Files.createTempDirectory("bk-kv-rocksdbtest-file").toFile(); + Files.createDirectory(Paths.get(tmpDir.toString(), "subDir")); + KeyValueStorageRocksDB rocksDB = new KeyValueStorageRocksDB(tmpDir.toString(), "subDir", + KeyValueStorageFactory.DbConfigType.EntryLocation, configuration); + assertNotNull(rocksDB.getColumnFamilyDescriptors()); + rocksDB.close(); + IOException exception = assertThrows(IOException.class, rocksDB::count); + assertEquals("RocksDB is closed", exception.getMessage()); + } } From 82171ba198981695cf5ded4e5420716bfd3ce450 Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Thu, 11 Jan 2024 05:50:48 +0800 Subject: [PATCH 204/233] Improve auto-recovery noise log when some bookie down. (#4118) * Improve auto-recovery noise log when some bookie down. * Address comment. (cherry picked from commit 54168b5d6441f7cbe0b478867d8301a6eee0b891) --- .../RackawareEnsemblePlacementPolicyImpl.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java index 86a9d507fe5..f71302e3d1d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java @@ -467,13 +467,26 @@ public PlacementResult replaceBookie(int ensembleSize, int writeQuorum try { excludeBookies = addDefaultRackBookiesIfMinNumRacksIsEnforced(excludeBookies); excludeBookies.addAll(currentEnsemble); + + Set ensembleNodes = new HashSet<>(); + Set excludeNodes = new HashSet<>(); BookieNode bn = knownBookies.get(bookieToReplace); if (null == bn) { bn = createBookieNode(bookieToReplace); } - - Set ensembleNodes = convertBookiesToNodes(currentEnsemble); - Set excludeNodes = convertBookiesToNodes(excludeBookies); + for (BookieId bookieId : currentEnsemble) { + if (bookieId.equals(bookieToReplace)) { + continue; + } + ensembleNodes.add(convertBookieToNode(bookieId)); + } + for (BookieId bookieId : excludeBookies) { + if (bookieId.equals(bookieToReplace)) { + excludeNodes.add(bn); + continue; + } + excludeNodes.add(convertBookieToNode(bookieId)); + } excludeNodes.addAll(ensembleNodes); excludeNodes.add(bn); From 9877db9e29143cfe3671a1faff7cf0d069801b68 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov <8622884+dlg99@users.noreply.github.com> Date: Thu, 13 Feb 2025 17:42:44 -0800 Subject: [PATCH 205/233] [cli] Fix: recover command doesn't accept rate limit parameter (#4535) * Fix: recover command didn't accept rate limit parameter (cherry picked from commit a3e3668fbd1c5bb024a3ce793867248546f9ad75) --- .../src/main/java/org/apache/bookkeeper/bookie/BookieShell.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java index 944b97e79dc..8cf34f24898 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java @@ -488,7 +488,7 @@ public RecoverCmd() { opts.addOption("sk", "skipOpenLedgers", false, "Skip recovering open ledgers"); opts.addOption("d", "deleteCookie", false, "Delete cookie node for the bookie."); opts.addOption("sku", "skipUnrecoverableLedgers", false, "Skip unrecoverable ledgers."); - opts.addOption("rate", "replicationRate", false, "Replication rate by bytes"); + opts.addOption("rate", "replicationRate", true, "Replication rate by bytes"); } @Override From c9dc52a4f1eef9411c1da480b3c49b720b6e081d Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Sun, 27 Apr 2025 10:09:05 +0300 Subject: [PATCH 206/233] Upgrade Netty to 4.1.121.Final (#4597) --- .../src/main/resources/LICENSE-all.bin.txt | 90 +++++++++---------- .../src/main/resources/LICENSE-bkctl.bin.txt | 78 ++++++++-------- .../src/main/resources/LICENSE-server.bin.txt | 90 +++++++++---------- .../src/main/resources/NOTICE-all.bin.txt | 32 +++---- .../src/main/resources/NOTICE-bkctl.bin.txt | 20 ++--- .../src/main/resources/NOTICE-server.bin.txt | 32 +++---- pom.xml | 2 +- 7 files changed, 172 insertions(+), 172 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 863e2cb17de..584308becdc 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.19.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.119.Final.jar [11] -- lib/io.netty-netty-codec-4.1.119.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.119.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.119.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.119.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.119.Final.jar [11] -- lib/io.netty-netty-common-4.1.119.Final.jar [11] -- lib/io.netty-netty-handler-4.1.119.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.119.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.119.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.119.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.121.Final.jar [11] +- lib/io.netty-netty-codec-4.1.121.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.121.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.121.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.121.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.121.Final.jar [11] +- lib/io.netty-netty-common-4.1.121.Final.jar [11] +- lib/io.netty-netty-handler-4.1.121.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.121.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.121.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.121.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar [11] @@ -235,14 +235,14 @@ Apache Software License, Version 2. - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar [11] -- lib/io.netty-netty-transport-4.1.119.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-transport-4.1.121.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.121.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.26.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.119.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.121.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] @@ -332,7 +332,7 @@ Apache Software License, Version 2. [8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0 [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.119.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.121.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 @@ -373,9 +373,9 @@ Apache Software License, Version 2. [58] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.119.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.121.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: @@ -384,7 +384,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.119.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -392,7 +392,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.119.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -400,7 +400,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -408,7 +408,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -418,7 +418,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.121.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: @@ -426,7 +426,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.119.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.121.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: @@ -435,7 +435,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.119.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -443,7 +443,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.119.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -451,7 +451,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.121.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: @@ -459,7 +459,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.119.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -467,7 +467,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.119.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -475,7 +475,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.121.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: @@ -483,7 +483,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.119.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -491,7 +491,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.121.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: @@ -500,7 +500,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -508,7 +508,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -516,7 +516,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -524,7 +524,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -532,7 +532,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -540,7 +540,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -548,7 +548,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.121.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: @@ -556,7 +556,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.119.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.121.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: @@ -564,7 +564,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.119.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.121.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: @@ -572,7 +572,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.119.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.121.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: @@ -581,7 +581,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.119.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.121.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: @@ -589,7 +589,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.119.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.121.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 95c925e1ff2..20007fd504a 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -217,11 +217,11 @@ Apache Software License, Version 2. - lib/commons-io-commons-io-2.19.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.119.Final.jar [11] -- lib/io.netty-netty-codec-4.1.119.Final.jar [11] -- lib/io.netty-netty-common-4.1.119.Final.jar [11] -- lib/io.netty-netty-handler-4.1.119.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.119.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.121.Final.jar [11] +- lib/io.netty-netty-codec-4.1.121.Final.jar [11] +- lib/io.netty-netty-common-4.1.121.Final.jar [11] +- lib/io.netty-netty-handler-4.1.121.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.121.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar [11] @@ -229,14 +229,14 @@ Apache Software License, Version 2. - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar [11] -- lib/io.netty-netty-transport-4.1.119.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-transport-4.1.121.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.121.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.26.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.119.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.121.Final.jar [11] - lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [16] - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16] @@ -299,7 +299,7 @@ Apache Software License, Version 2. [8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0 [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.119.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.121.Final [16] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.18.0 [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 @@ -330,9 +330,9 @@ Apache Software License, Version 2. [52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1 [55] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.119.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.121.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: @@ -341,7 +341,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.119.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -349,7 +349,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.119.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -357,7 +357,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -365,7 +365,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -375,7 +375,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.121.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: @@ -383,7 +383,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.119.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.121.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: @@ -392,7 +392,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.119.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -400,7 +400,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.119.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -408,7 +408,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.121.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: @@ -416,7 +416,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.119.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -424,7 +424,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.119.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -432,7 +432,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.121.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: @@ -440,7 +440,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.119.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -448,7 +448,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.121.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: @@ -457,7 +457,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -465,7 +465,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -473,7 +473,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -481,7 +481,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -489,7 +489,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -497,7 +497,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -505,7 +505,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.121.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: @@ -513,7 +513,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.119.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.121.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: @@ -521,7 +521,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.119.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.121.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: @@ -529,7 +529,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.119.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.121.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: @@ -538,7 +538,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.119.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.121.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: @@ -546,7 +546,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.119.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.121.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 923799bd091..d0bc4b0a369 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.19.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.119.Final.jar [11] -- lib/io.netty-netty-codec-4.1.119.Final.jar [11] -- lib/io.netty-netty-codec-dns-4.1.119.Final.jar [11] -- lib/io.netty-netty-codec-http-4.1.119.Final.jar [11] -- lib/io.netty-netty-codec-http2-4.1.119.Final.jar [11] -- lib/io.netty-netty-codec-socks-4.1.119.Final.jar [11] -- lib/io.netty-netty-common-4.1.119.Final.jar [11] -- lib/io.netty-netty-handler-4.1.119.Final.jar [11] -- lib/io.netty-netty-handler-proxy-4.1.119.Final.jar [11] -- lib/io.netty-netty-resolver-4.1.119.Final.jar [11] -- lib/io.netty-netty-resolver-dns-4.1.119.Final.jar [11] +- lib/io.netty-netty-buffer-4.1.121.Final.jar [11] +- lib/io.netty-netty-codec-4.1.121.Final.jar [11] +- lib/io.netty-netty-codec-dns-4.1.121.Final.jar [11] +- lib/io.netty-netty-codec-http-4.1.121.Final.jar [11] +- lib/io.netty-netty-codec-http2-4.1.121.Final.jar [11] +- lib/io.netty-netty-codec-socks-4.1.121.Final.jar [11] +- lib/io.netty-netty-common-4.1.121.Final.jar [11] +- lib/io.netty-netty-handler-4.1.121.Final.jar [11] +- lib/io.netty-netty-handler-proxy-4.1.121.Final.jar [11] +- lib/io.netty-netty-resolver-4.1.121.Final.jar [11] +- lib/io.netty-netty-resolver-dns-4.1.121.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar [11] @@ -235,14 +235,14 @@ Apache Software License, Version 2. - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar [11] -- lib/io.netty-netty-transport-4.1.119.Final.jar [11] -- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar [11] -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar [11] +- lib/io.netty-netty-transport-4.1.121.Final.jar [11] +- lib/io.netty-netty-transport-classes-epoll-4.1.121.Final.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-aarch_64.jar [11] +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar [11] - lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.26.Final.jar [11] -- lib/io.netty-netty-transport-native-unix-common-4.1.119.Final.jar [11] +- lib/io.netty-netty-transport-native-unix-common-4.1.121.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] @@ -328,7 +328,7 @@ Apache Software License, Version 2. [8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0 [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.119.Final +[11] Source available at https://github.com/netty/netty/tree/netty-4.1.121.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 @@ -368,9 +368,9 @@ Apache Software License, Version 2. [57] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0 ------------------------------------------------------------------------------------ -lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies +lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies -lib/io.netty-netty-codec-4.1.119.Final.jar contains the extensions to Java Collections Framework which has +lib/io.netty-netty-codec-4.1.121.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: @@ -379,7 +379,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.119.Final.jar contains a modified version of Robert Harder's Public Domain +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: * LICENSE: @@ -387,7 +387,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.119.Final.jar contains a modified portion of 'Webbit', an event based +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at: * LICENSE: @@ -395,7 +395,7 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'SLF4J', a simple logging +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: * LICENSE: @@ -403,7 +403,7 @@ facade for Java, which can be obtained at: * HOMEPAGE: * http://www.slf4j.org/ -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'Apache Harmony', an open source +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: * NOTICE: @@ -413,7 +413,7 @@ Java SE, which can be obtained at: * HOMEPAGE: * http://archive.apache.org/dist/harmony/ -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'jbzip2', a Java bzip2 compression +lib/io.netty-netty-codec-4.1.121.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: @@ -421,7 +421,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.119.Final.jar contains a modified portion of 'libdivsufsort', a C API library to construct +lib/io.netty-netty-codec-4.1.121.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: @@ -430,7 +430,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.119.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, which can be obtained at: * LICENSE: @@ -438,7 +438,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.119.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: * LICENSE: @@ -446,7 +446,7 @@ pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Compress-LZF', a Java library for encoding and +lib/io.netty-netty-codec-4.1.121.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: @@ -454,7 +454,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.119.Final.jar optionally depends on 'lz4', a LZ4 Java compression +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'lz4', a LZ4 Java compression and decompression library written by Adrien Grand. It can be obtained at: * LICENSE: @@ -462,7 +462,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.119.Final.jar optionally depends on 'lzma-java', a LZMA Java compression +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'lzma-java', a LZMA Java compression and decompression library, which can be obtained at: * LICENSE: @@ -470,7 +470,7 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified portion of 'jfastlz', a Java port of FastLZ compression +lib/io.netty-netty-codec-4.1.121.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: @@ -478,7 +478,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.119.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', +lib/io.netty-netty-codec-4.1.121.Final.jar contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: * LICENSE: @@ -486,7 +486,7 @@ Google's data interchange format, which can be obtained at: * HOMEPAGE: * https://github.com/google/protobuf -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Bouncy Castle Crypto APIs' to generate +lib/io.netty-netty-codec-4.1.121.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: @@ -495,7 +495,7 @@ equivalent functionality. It can be obtained at: * HOMEPAGE: * http://www.bouncycastle.org/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Snappy', a compression library produced +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: * LICENSE: @@ -503,7 +503,7 @@ by Google Inc, which can be obtained at: * HOMEPAGE: * https://github.com/google/snappy -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: @@ -511,7 +511,7 @@ serialization API, which can be obtained at: * HOMEPAGE: * https://github.com/jboss-remoting/jboss-marshalling -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Caliper', Google's micro- +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: * LICENSE: @@ -519,7 +519,7 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Commons Logging', a logging +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: * LICENSE: @@ -527,7 +527,7 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Apache Log4J', a logging framework, which +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: * LICENSE: @@ -535,7 +535,7 @@ can be obtained at: * HOMEPAGE: * http://logging.apache.org/log4j/ -lib/io.netty-netty-codec-4.1.119.Final.jar optionally depends on 'Aalto XML', an ultra-high performance +lib/io.netty-netty-codec-4.1.121.Final.jar optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: * LICENSE: @@ -543,7 +543,7 @@ non-blocking XML processor, which can be obtained at: * HOMEPAGE: * http://wiki.fasterxml.com/AaltoHome -lib/io.netty-netty-codec-4.1.119.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.121.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: @@ -551,7 +551,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.119.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.121.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: @@ -559,7 +559,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.119.Final.jar contains a modified version of 'HPACK', a Java implementation of +lib/io.netty-netty-codec-4.1.121.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: @@ -567,7 +567,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.119.Final.jar contains a modified portion of 'Apache Commons Lang', a Java library +lib/io.netty-netty-codec-4.1.121.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: @@ -576,7 +576,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.119.Final.jar contains the Maven wrapper scripts from 'Maven Wrapper', +lib/io.netty-netty-codec-4.1.121.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: @@ -584,7 +584,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.119.Final.jar contains the dnsinfo.h header file, +lib/io.netty-netty-codec-4.1.121.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 6a5034b6495..d8e2d64dea2 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.119.Final.jar -- lib/io.netty-netty-codec-4.1.119.Final.jar -- lib/io.netty-netty-codec-dns-4.1.119.Final.jar -- lib/io.netty-netty-codec-http-4.1.119.Final.jar -- lib/io.netty-netty-codec-http2-4.1.119.Final.jar -- lib/io.netty-netty-codec-socks-4.1.119.Final.jar -- lib/io.netty-netty-common-4.1.119.Final.jar -- lib/io.netty-netty-handler-4.1.119.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.119.Final.jar -- lib/io.netty-netty-resolver-4.1.119.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.119.Final.jar +- lib/io.netty-netty-buffer-4.1.121.Final.jar +- lib/io.netty-netty-codec-4.1.121.Final.jar +- lib/io.netty-netty-codec-dns-4.1.121.Final.jar +- lib/io.netty-netty-codec-http-4.1.121.Final.jar +- lib/io.netty-netty-codec-http2-4.1.121.Final.jar +- lib/io.netty-netty-codec-socks-4.1.121.Final.jar +- lib/io.netty-netty-common-4.1.121.Final.jar +- lib/io.netty-netty-handler-4.1.121.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.121.Final.jar +- lib/io.netty-netty-resolver-4.1.121.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.121.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.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.70.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar -- lib/io.netty-netty-transport-4.1.119.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar +- lib/io.netty-netty-transport-4.1.121.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.121.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.119.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.121.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 602eb0b5850..47d5c6a522e 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt @@ -5,11 +5,11 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------------------ -- lib/io.netty-netty-buffer-4.1.119.Final.jar -- lib/io.netty-netty-codec-4.1.119.Final.jar -- lib/io.netty-netty-common-4.1.119.Final.jar -- lib/io.netty-netty-handler-4.1.119.Final.jar -- lib/io.netty-netty-resolver-4.1.119.Final.jar +- lib/io.netty-netty-buffer-4.1.121.Final.jar +- lib/io.netty-netty-codec-4.1.121.Final.jar +- lib/io.netty-netty-common-4.1.121.Final.jar +- lib/io.netty-netty-handler-4.1.121.Final.jar +- lib/io.netty-netty-resolver-4.1.121.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar [11] @@ -17,13 +17,13 @@ The Apache Software Foundation (http://www.apache.org/). - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar -- lib/io.netty-netty-transport-4.1.119.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar +- lib/io.netty-netty-transport-4.1.121.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.121.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.119.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.121.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 54322df1ae2..488aad4530a 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.119.Final.jar -- lib/io.netty-netty-codec-4.1.119.Final.jar -- lib/io.netty-netty-codec-dns-4.1.119.Final.jar -- lib/io.netty-netty-codec-http-4.1.119.Final.jar -- lib/io.netty-netty-codec-http2-4.1.119.Final.jar -- lib/io.netty-netty-codec-socks-4.1.119.Final.jar -- lib/io.netty-netty-common-4.1.119.Final.jar -- lib/io.netty-netty-handler-4.1.119.Final.jar -- lib/io.netty-netty-handler-proxy-4.1.119.Final.jar -- lib/io.netty-netty-resolver-4.1.119.Final.jar -- lib/io.netty-netty-resolver-dns-4.1.119.Final.jar +- lib/io.netty-netty-buffer-4.1.121.Final.jar +- lib/io.netty-netty-codec-4.1.121.Final.jar +- lib/io.netty-netty-codec-dns-4.1.121.Final.jar +- lib/io.netty-netty-codec-http-4.1.121.Final.jar +- lib/io.netty-netty-codec-http2-4.1.121.Final.jar +- lib/io.netty-netty-codec-socks-4.1.121.Final.jar +- lib/io.netty-netty-common-4.1.121.Final.jar +- lib/io.netty-netty-handler-4.1.121.Final.jar +- lib/io.netty-netty-handler-proxy-4.1.121.Final.jar +- lib/io.netty-netty-resolver-4.1.121.Final.jar +- lib/io.netty-netty-resolver-dns-4.1.121.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.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.70.Final-osx-x86_64.jar [11] - lib/io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar [11] - lib/io.netty-netty-tcnative-classes-2.0.70.Final.jar -- lib/io.netty-netty-transport-4.1.119.Final.jar -- lib/io.netty-netty-transport-classes-epoll-4.1.119.Final.jar -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar +- lib/io.netty-netty-transport-4.1.121.Final.jar +- lib/io.netty-netty-transport-classes-epoll-4.1.121.Final.jar +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-aarch_64.jar +- lib/io.netty-netty-transport-native-epoll-4.1.121.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar - lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar -- lib/io.netty-netty-transport-native-unix-common-4.1.119.Final.jar +- lib/io.netty-netty-transport-native-unix-common-4.1.121.Final.jar The Netty Project diff --git a/pom.xml b/pom.xml index a728d3e46fb..d9df195307c 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 2.18.0 1.3.0 3.12.4 - 4.1.119.Final + 4.1.121.Final 0.0.26.Final 9.1.3 2.0.9 From f0c406b3eb643864dceac40845ad39335803cd04 Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Wed, 28 May 2025 10:07:27 +0800 Subject: [PATCH 207/233] Fix check read failed entry memory leak issue. (#4513) * Fix check read failed entry memory leak issue. * address the comments. --- .../org/apache/bookkeeper/replication/ReplicationWorker.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java index cf1f2f2f598..05807455dc4 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java @@ -61,6 +61,7 @@ import org.apache.bookkeeper.client.BookKeeperAdmin; import org.apache.bookkeeper.client.EnsemblePlacementPolicy; import org.apache.bookkeeper.client.LedgerChecker; +import org.apache.bookkeeper.client.LedgerEntry; import org.apache.bookkeeper.client.LedgerFragment; import org.apache.bookkeeper.client.LedgerHandle; import org.apache.bookkeeper.client.api.LedgerMetadata; @@ -351,6 +352,10 @@ private boolean tryReadingFaultyEntries(LedgerHandle lh, LedgerFragment ledgerFr lh.asyncReadEntries(entryIdToRead, entryIdToRead, (rc, ledHan, seq, ctx) -> { long thisEntryId = (Long) ctx; if (rc == BKException.Code.OK) { + while (seq.hasMoreElements()) { + LedgerEntry entry = seq.nextElement(); + entry.getEntryBuffer().release(); + } entriesUnableToReadForThisLedger.remove(thisEntryId); if (numOfResponsesToWaitFor.decrementAndGet() == 0) { multiReadComplete.countDown(); From 52d779ae4a6b28a1c3c7221ef21c04878257c342 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Fri, 30 May 2025 10:10:16 +0800 Subject: [PATCH 208/233] Fix the data loss issue that caused by the wrong entry log header (#4607) * Fix the data loss issue that caused by the wrong entry log header --- # Motivation We observed numerous errors in the broker that failed to read the ledger from the bookkeeper; although the ledger metadata still exists, it was unable to read from the bookkeeper. After checking the data, we found the ledger located entry log was deleted by the bookkeeper. We have a data loss issue with the bookkeeper. The entry log file was deleted by the Garbage collector because the entry log file wrote a wrong file header. And there is an example that the shows the header is wrong: ``` Failed to get ledgers map index from: 82.log : Not all ledgers were found in ledgers map index. expected: -1932430239 -- found: 0 -- entryLogId: 82 ``` * Add test --- .../bookkeeper/bookie/DefaultEntryLogger.java | 4 ++ .../bookie/EntryLoggerAllocator.java | 1 + .../bookie/GarbageCollectorThread.java | 3 +- .../bookie/DefaultEntryLogTest.java | 40 +++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java index ab200b7ca0d..cfe7aac7936 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java @@ -1152,6 +1152,10 @@ EntryLogMetadata extractEntryLogMetadataFromIndex(long entryLogId) throws IOExce + " -- found: " + meta.getLedgersMap().size() + " -- entryLogId: " + entryLogId); } + if (header.ledgersCount == 0) { + throw new IOException("No ledgers map found in entryLogId " + entryLogId + ", do scan to double confirm"); + } + return meta; } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java index 68fc1eb3caf..e9ff5030d18 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java @@ -81,6 +81,7 @@ class EntryLoggerAllocator { // within the same JVM. All of these Bookie instances access this header // so there can be race conditions when entry logs are rolled over and // this header buffer is cleared before writing it into the new logChannel. + logfileHeader.setZero(0, DefaultEntryLogger.LOGFILE_HEADER_SIZE); logfileHeader.writeBytes("BKLO".getBytes(UTF_8)); logfileHeader.writeInt(DefaultEntryLogger.HEADER_CURRENT_VERSION); logfileHeader.writerIndex(DefaultEntryLogger.LOGFILE_HEADER_SIZE); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java index 5abf79b2e64..d70082256f9 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java @@ -791,11 +791,12 @@ protected void extractMetaFromEntryLogs() throws EntryLogMetadataMapException { continue; } - LOG.info("Extracting entry log meta from entryLogId: {}", entryLogId); try { // Read through the entry log file and extract the entry log meta EntryLogMetadata entryLogMeta = entryLogger.getEntryLogMetadata(entryLogId, throttler); + LOG.info("Extracted entry log meta from entryLogId: {}, ledgers {}", + entryLogId, entryLogMeta.getLedgersMap().keys()); removeIfLedgerNotExists(entryLogMeta); if (entryLogMeta.isEmpty()) { // This means the entry log is not associated with any active diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java index 38a9ebaf213..cbf12511126 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java @@ -366,6 +366,46 @@ public void testRecoverFromLedgersMap() throws Exception { assertEquals(120, meta.getRemainingSize()); } + @Test + public void testLedgersMapIsEmpty() throws Exception { + // create some entries + entryLogger.addEntry(1L, generateEntry(1, 1).nioBuffer()); + entryLogger.addEntry(3L, generateEntry(3, 1).nioBuffer()); + entryLogger.addEntry(2L, generateEntry(2, 1).nioBuffer()); + entryLogger.addEntry(1L, generateEntry(1, 2).nioBuffer()); + ((EntryLogManagerBase) entryLogger.getEntryLogManager()).createNewLog(DefaultEntryLogger.UNASSIGNED_LEDGERID); + entryLogger.close(); + + // Rewrite the entry log header to be on V0 format + File f = new File(curDir, "0.log"); + RandomAccessFile raf = new RandomAccessFile(f, "rw"); + raf.seek(8); + // Mock that there is a ledgers map offset but the ledgers count is 0 + raf.writeLong(40); + raf.writeInt(0); + raf.close(); + + // now see which ledgers are in the log + entryLogger = new DefaultEntryLogger(conf, dirsMgr); + + try { + entryLogger.extractEntryLogMetadataFromIndex(0L); + fail("Should not be possible to recover from ledgers map index"); + } catch (IOException e) { + assertEquals("No ledgers map found in entryLogId 0, do scan to double confirm", e.getMessage()); + } + + // Public method should succeed by falling back to scanning the file + EntryLogMetadata meta = entryLogger.getEntryLogMetadata(0L); + LOG.info("Extracted Meta From Entry Log {}", meta); + assertEquals(60, meta.getLedgersMap().get(1L)); + assertEquals(30, meta.getLedgersMap().get(2L)); + assertEquals(30, meta.getLedgersMap().get(3L)); + assertFalse(meta.getLedgersMap().containsKey(4L)); + assertEquals(120, meta.getTotalSize()); + assertEquals(120, meta.getRemainingSize()); + } + /** * Explicitly try to recover using the ledgers map index at the end of the entry log. */ From f507b1c54a95610bc0874e4620105a98429374a9 Mon Sep 17 00:00:00 2001 From: Shen Liu Date: Fri, 14 Feb 2025 16:19:47 +0800 Subject: [PATCH 209/233] Fix region aware placement policy disk weight dose not update. (#4522) * Fix region aware placement policy disk weight dose not update. (cherry picked from commit 55d274bbb3f4dc119db6f454aff8ae4022f3a74a) --- .../RegionAwareEnsemblePlacementPolicy.java | 8 ++ ...estRegionAwareEnsemblePlacementPolicy.java | 97 +++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java index ef68e024672..eb8784a6219 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java @@ -649,4 +649,12 @@ public PlacementPolicyAdherence isEnsembleAdheringToPlacementPolicy(List bookieInfoMap) { + super.updateBookieInfo(bookieInfoMap); + for (TopologyAwareEnsemblePlacementPolicy policy : perRegionPlacement.values()) { + policy.updateBookieInfo(bookieInfoMap); + } + } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java index 9d8e36a350d..1f04ffa718b 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java @@ -1780,6 +1780,103 @@ public void testRegionsWithDiskWeight() throws Exception { assertEquals(3, ensemble.size()); } + @Test + public void testRegionsWithDifferentDiskWeight() throws Exception { + repp.uninitalize(); + repp = new RegionAwareEnsemblePlacementPolicy(); + conf.setProperty(REPP_ENABLE_VALIDATION, false); + conf.setDiskWeightBasedPlacementEnabled(true); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, + NullStatsLogger.INSTANCE, BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER); + BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181); + BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.3", 3181); + BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.4", 3181); + BookieSocketAddress addr4 = new BookieSocketAddress("127.0.0.5", 3181); + BookieSocketAddress addr5 = new BookieSocketAddress("127.0.0.6", 3181); + + // update dns mapping + StaticDNSResolver.addNodeToRack(addr1.getHostName(), "/region1/r1"); + StaticDNSResolver.addNodeToRack(addr2.getHostName(), "/region1/r1"); + StaticDNSResolver.addNodeToRack(addr3.getHostName(), "/region2/r2"); + StaticDNSResolver.addNodeToRack(addr4.getHostName(), "/region2/r2"); + StaticDNSResolver.addNodeToRack(addr5.getHostName(), "/region2/r2"); + // Update cluster + Set addrs = new HashSet<>(); + addrs.add(addr1.toBookieId()); + addrs.add(addr2.toBookieId()); + addrs.add(addr3.toBookieId()); + addrs.add(addr4.toBookieId()); + addrs.add(addr5.toBookieId()); + repp.onClusterChanged(addrs, new HashSet<>()); + + // update bookie weight + // due to default BookieMaxWeightMultipleForWeightBasedPlacement=3, the test cases need to be in the range + Map bookieInfoMap = new HashMap<>(); + bookieInfoMap.put(addr1.toBookieId(), new BookieInfoReader.BookieInfo(1000000, 800000)); + bookieInfoMap.put(addr2.toBookieId(), new BookieInfoReader.BookieInfo(1000000, 400000)); + bookieInfoMap.put(addr3.toBookieId(), new BookieInfoReader.BookieInfo(1000000, 200000)); + bookieInfoMap.put(addr4.toBookieId(), new BookieInfoReader.BookieInfo(1000000, 300000)); + bookieInfoMap.put(addr5.toBookieId(), new BookieInfoReader.BookieInfo(1000000, 400000)); + repp.updateBookieInfo(bookieInfoMap); + + List ensemble; + Map countMap = new HashMap<>(); + addrs.forEach(a -> countMap.put(a, 0)); + int loopTimes = 5000; + for (int i = 0; i < loopTimes; ++i) { + ensemble = repp.newEnsemble(2, 2, 2, null, + new HashSet<>()).getResult(); + for (BookieId bookieId : ensemble) { + countMap.put(bookieId, countMap.get(bookieId) + 1); + } + } + + // c1 should be 2x than c2 + // c4 should be 1.5x than c3 + // c5 should be 2x than c3 + // we allow a range of (-50%, 50%) deviation instead of the exact multiples + int c1, c2, c3, c4, c5; + c1 = countMap.get(addr1.toBookieId()); + c2 = countMap.get(addr2.toBookieId()); + c3 = countMap.get(addr3.toBookieId()); + c4 = countMap.get(addr4.toBookieId()); + c5 = countMap.get(addr5.toBookieId()); + assertTrue(Math.abs((double) c1 / c2 - 2.0) < 1.0); + assertTrue(Math.abs((double) c4 / c3 - 1.5) < 1.0); + assertTrue(Math.abs((double) c5 / c3 - 2.0) < 1.0); + + // update bookie weight + // due to default BookieMaxWeightMultipleForWeightBasedPlacement=3, the test cases need to be in the range + bookieInfoMap.put(addr1.toBookieId(), new BookieInfoReader.BookieInfo(1000000, 400000)); + bookieInfoMap.put(addr2.toBookieId(), new BookieInfoReader.BookieInfo(1000000, 800000)); + bookieInfoMap.put(addr3.toBookieId(), new BookieInfoReader.BookieInfo(1000000, 400000)); + bookieInfoMap.put(addr4.toBookieId(), new BookieInfoReader.BookieInfo(1000000, 300000)); + bookieInfoMap.put(addr5.toBookieId(), new BookieInfoReader.BookieInfo(1000000, 200000)); + repp.updateBookieInfo(bookieInfoMap); + + addrs.forEach(a -> countMap.put(a, 0)); + for (int i = 0; i < loopTimes; ++i) { + ensemble = repp.newEnsemble(2, 2, 2, null, + new HashSet<>()).getResult(); + for (BookieId bookieId : ensemble) { + countMap.put(bookieId, countMap.get(bookieId) + 1); + } + } + + // c2 should be 2x than c1 + // c4 should be 1.5x than c5 + // c3 should be 2x than c5 + // we allow a range of (-50%, 50%) deviation instead of the exact multiples + c1 = countMap.get(addr1.toBookieId()); + c2 = countMap.get(addr2.toBookieId()); + c3 = countMap.get(addr3.toBookieId()); + c4 = countMap.get(addr4.toBookieId()); + c5 = countMap.get(addr5.toBookieId()); + assertTrue(Math.abs((double) c2 / c1 - 2.0) < 1.0); + assertTrue(Math.abs((double) c4 / c5 - 1.5) < 1.0); + assertTrue(Math.abs((double) c3 / c5 - 2.0) < 1.0); + } + @Test public void testNotifyRackChangeWithOldRegion() throws Exception { BookieSocketAddress addr1 = new BookieSocketAddress("127.0.1.1", 3181); From 857959eb8c5cb3c1ceca2da5a36db26419a8a5f3 Mon Sep 17 00:00:00 2001 From: YingQun Zhong Date: Sun, 16 Feb 2025 07:17:49 +0800 Subject: [PATCH 210/233] remove in address2Region while bookie left to get correct rack info (#4504) (cherry picked from commit 07de650ea03612fb9b81647c2a55fd538d0cda3a) --- .../RegionAwareEnsemblePlacementPolicy.java | 17 +++ ...estRegionAwareEnsemblePlacementPolicy.java | 121 +++++++++++++++++- 2 files changed, 136 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java index eb8784a6219..bc882589b36 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java @@ -117,6 +117,23 @@ protected String parseBookieRegion(BookieId addr) { @Override public void handleBookiesThatLeft(Set leftBookies) { + // case 1: (In some situation, eg, Broker and bookie restart concurrently.) + //1. Bookie X join cluster for the first time, encounters a region exception, and `address2Region` record X's + // region as default-region. + //2. Bookie X left cluster and is removed from knownBookies, but address2Region retains the information of + // bookie X. + //3. update Bookie X's rack info, and calling `onBookieRackChange` will only update address2Region for + // addresses present in knownBookies; therefore, bookie X's region info is not updated. + //4. Bookie X join cluster again, since address2Region contains the previous default-region information, + // getRegion will directly use cached data, resulting of an incorrect region. + + // The bookie region is initialized to "default-region" in address2Region. + // We should ensure that when a bookie leaves the cluster, + // we also clean up the corresponding region information for that bookie in address2Region, + // so that it can update the correct region for the bookie during onBookieRackChange and + // handleBookiesThatJoined. + // to avoid traffic skew in ensemble selection. + leftBookies.forEach(address2Region::remove); super.handleBookiesThatLeft(leftBookies); for (TopologyAwareEnsemblePlacementPolicy policy: perRegionPlacement.values()) { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java index 1f04ffa718b..ca6c074b33e 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java @@ -1066,7 +1066,7 @@ public void testEnsembleWithThreeRegionsReplaceDisableDurability() throws Except testEnsembleWithThreeRegionsReplaceInternal(1, true, false); } - public void testEnsembleWithThreeRegionsReplaceInternal(int minDurability, boolean disableDurability, + private void testEnsembleWithThreeRegionsReplaceInternal(int minDurability, boolean disableDurability, boolean disableOneRegion) throws Exception { repp.uninitalize(); repp = new RegionAwareEnsemblePlacementPolicy(); @@ -1208,7 +1208,7 @@ public void testEnsembleDisableDurability() throws Exception { testEnsembleDurabilityDisabledInternal(2, true); } - public void testEnsembleDurabilityDisabledInternal(int minDurability, boolean disableDurability) throws Exception { + private void testEnsembleDurabilityDisabledInternal(int minDurability, boolean disableDurability) throws Exception { repp.uninitalize(); repp = new RegionAwareEnsemblePlacementPolicy(); conf.setProperty(REPP_REGIONS_TO_WRITE, "region1;region2;region3"); @@ -2027,4 +2027,121 @@ public void testNotifyRackChangeWithNewRegion() throws Exception { assertEquals("region2", repp.address2Region.get(addr3.toBookieId())); assertEquals("region3", repp.address2Region.get(addr4.toBookieId())); } + + @Test + public void testBookieLeftThenJoinWithDNSResolveFailed() throws Exception { + + BookieSocketAddress addr1 = new BookieSocketAddress("127.0.1.1", 3181); + BookieSocketAddress addr2 = new BookieSocketAddress("127.0.1.2", 3181); + BookieSocketAddress addr3 = new BookieSocketAddress("127.0.1.3", 3181); + BookieSocketAddress addr4 = new BookieSocketAddress("127.0.1.4", 3181); + + // init dns mapping + // 2. mock dns resolver failed, use default region and rack. + // addr1 rack info. /region-1/default-rack -> /default-region/default-rack. + + // 1. mock addr1 dns resolver failed and use default region and rack. + StaticDNSResolver.addNodeToRack(addr1.getHostName(), "/default-region/default-rack"); + StaticDNSResolver.addNodeToRack(addr2.getHostName(), "/region-1/default-rack"); + StaticDNSResolver.addNodeToRack(addr3.getHostName(), "/region-2/default-rack"); + StaticDNSResolver.addNodeToRack(addr4.getHostName(), "/region-3/default-rack"); + + // init cluster + Set addrs = Sets.newHashSet(addr1.toBookieId(), + addr2.toBookieId(), addr3.toBookieId(), addr4.toBookieId()); + repp.onClusterChanged(addrs, new HashSet<>()); + + assertEquals(4, repp.knownBookies.size()); + assertEquals("/default-region/default-rack", repp.knownBookies.get(addr1.toBookieId()).getNetworkLocation()); + assertEquals("/region-1/default-rack", repp.knownBookies.get(addr2.toBookieId()).getNetworkLocation()); + assertEquals("/region-2/default-rack", repp.knownBookies.get(addr3.toBookieId()).getNetworkLocation()); + assertEquals("/region-3/default-rack", repp.knownBookies.get(addr4.toBookieId()).getNetworkLocation()); + + assertEquals(4, repp.perRegionPlacement.size()); + TopologyAwareEnsemblePlacementPolicy unknownRegionPlacement = repp.perRegionPlacement.get("UnknownRegion"); + assertEquals(1, unknownRegionPlacement.knownBookies.keySet().size()); + assertEquals("/default-region/default-rack", + unknownRegionPlacement.knownBookies.get(addr1.toBookieId()).getNetworkLocation()); + + TopologyAwareEnsemblePlacementPolicy region1Placement = repp.perRegionPlacement.get("region-1"); + assertEquals(1, region1Placement.knownBookies.keySet().size()); + assertEquals("/region-1/default-rack", + region1Placement.knownBookies.get(addr2.toBookieId()).getNetworkLocation()); + + TopologyAwareEnsemblePlacementPolicy region2Placement = repp.perRegionPlacement.get("region-2"); + assertEquals(1, region2Placement.knownBookies.keySet().size()); + assertEquals("/region-2/default-rack", + region2Placement.knownBookies.get(addr3.toBookieId()).getNetworkLocation()); + + TopologyAwareEnsemblePlacementPolicy region3Placement = repp.perRegionPlacement.get("region-3"); + assertEquals(1, region3Placement.knownBookies.keySet().size()); + assertEquals("/region-3/default-rack", + region3Placement.knownBookies.get(addr4.toBookieId()).getNetworkLocation()); + + assertEquals("UnknownRegion", repp.address2Region.get(addr1.toBookieId())); + assertEquals("region-1", repp.address2Region.get(addr2.toBookieId())); + assertEquals("region-2", repp.address2Region.get(addr3.toBookieId())); + assertEquals("region-3", repp.address2Region.get(addr4.toBookieId())); + + // 2. addr1 bookie shutdown and decommission + addrs.remove(addr1.toBookieId()); + repp.onClusterChanged(addrs, new HashSet<>()); + + assertEquals(3, repp.knownBookies.size()); + assertNull(repp.knownBookies.get(addr1.toBookieId())); + assertEquals("/region-1/default-rack", repp.knownBookies.get(addr2.toBookieId()).getNetworkLocation()); + assertEquals("/region-2/default-rack", repp.knownBookies.get(addr3.toBookieId()).getNetworkLocation()); + assertEquals("/region-3/default-rack", repp.knownBookies.get(addr4.toBookieId()).getNetworkLocation()); + + // UnknownRegion,region-1,region-2,region-3 + assertEquals(4, repp.perRegionPlacement.size()); + // after addr1 bookie left, it should remove from locally address2Region + assertNull(repp.address2Region.get(addr1.toBookieId())); + assertEquals("region-1", repp.address2Region.get(addr2.toBookieId())); + assertEquals("region-2", repp.address2Region.get(addr3.toBookieId())); + assertEquals("region-3", repp.address2Region.get(addr4.toBookieId())); + + + // 3. addr1 bookie start and join + addrs.add(addr1.toBookieId()); + repp.onClusterChanged(addrs, new HashSet<>()); + + assertEquals(4, repp.knownBookies.size()); + assertEquals("/default-region/default-rack", repp.knownBookies.get(addr1.toBookieId()).getNetworkLocation()); + assertEquals("/region-1/default-rack", repp.knownBookies.get(addr2.toBookieId()).getNetworkLocation()); + assertEquals("/region-2/default-rack", repp.knownBookies.get(addr3.toBookieId()).getNetworkLocation()); + assertEquals("/region-3/default-rack", repp.knownBookies.get(addr4.toBookieId()).getNetworkLocation()); + + // UnknownRegion,region-1,region-2,region-3 + assertEquals(4, repp.perRegionPlacement.size()); + assertEquals("UnknownRegion", repp.address2Region.get(addr1.toBookieId())); + // addr1 bookie belongs to unknown region + unknownRegionPlacement = repp.perRegionPlacement.get("UnknownRegion"); + assertEquals(1, unknownRegionPlacement.knownBookies.keySet().size()); + assertEquals("/default-region/default-rack", + unknownRegionPlacement.knownBookies.get(addr1.toBookieId()).getNetworkLocation()); + + // 4. Update the correct rack. + // change addr1 rack info. /default-region/default-rack -> /region-1/default-rack. + List bookieAddressList = new ArrayList<>(); + List rackList = new ArrayList<>(); + bookieAddressList.add(addr1); + rackList.add("/region-1/default-rack"); + // onBookieRackChange + StaticDNSResolver.changeRack(bookieAddressList, rackList); + + assertEquals(4, repp.perRegionPlacement.size()); + // addr1 bookie, oldRegion=default-region, newRegion=region-1 + assertEquals("region-1", repp.address2Region.get(addr1.toBookieId())); + + unknownRegionPlacement = repp.perRegionPlacement.get("UnknownRegion"); + assertEquals(0, unknownRegionPlacement.knownBookies.keySet().size()); + assertNotNull(unknownRegionPlacement.historyBookies.get(addr1.toBookieId())); + + + region1Placement = repp.perRegionPlacement.get("region-1"); + assertEquals(2, region1Placement.knownBookies.keySet().size()); + assertEquals("/region-1/default-rack", + region1Placement.knownBookies.get(addr1.toBookieId()).getNetworkLocation()); + } } From 804b2b611c6a11b42ca0307dd9803c16b9cc3915 Mon Sep 17 00:00:00 2001 From: fengyubiao Date: Wed, 14 May 2025 09:37:52 +0800 Subject: [PATCH 211/233] [fix] Write stuck due to pending add callback by multiple threads (#4557) [fix] Write stuck due to pending add callback by multiple threads (#4557) (cherry picked from commit e47926bc71c8f4b9fc548646b2abb46700923b37) --- .../bookkeeper/proto/BookieClientImpl.java | 30 ++-- .../proto/PerChannelBookieClient.java | 8 +- .../proto/ClientSocketDisconnectTest.java | 144 ++++++++++++++++++ 3 files changed, 171 insertions(+), 11 deletions(-) create mode 100644 bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ClientSocketDisconnectTest.java diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java index 5dde52bc3f5..1e5184d07e8 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java @@ -22,6 +22,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; +import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.protobuf.ExtensionRegistry; import io.netty.buffer.ByteBuf; @@ -355,7 +356,9 @@ private void completeRead(final int rc, } } - private static class ChannelReadyForAddEntryCallback + // Without test, this class should be modifier with "private". + @VisibleForTesting + static class ChannelReadyForAddEntryCallback implements GenericCallback { private final Handle recyclerHandle; @@ -365,7 +368,9 @@ private static class ChannelReadyForAddEntryCallback private long entryId; private BookieId addr; private Object ctx; - private WriteCallback cb; + // Without test, this class should be modifier with "private". + @VisibleForTesting + WriteCallback cb; private int options; private byte[] masterKey; private boolean allowFastFail; @@ -394,17 +399,24 @@ static ChannelReadyForAddEntryCallback create( @Override public void operationComplete(final int rc, PerChannelBookieClient pcbc) { - try { - if (rc != BKException.Code.OK) { - bookieClient.completeAdd(rc, ledgerId, entryId, addr, cb, ctx); - } else { + if (rc != BKException.Code.OK) { + bookieClient.executor.executeOrdered(ledgerId, () -> { + try { + bookieClient.completeAdd(rc, ledgerId, entryId, addr, cb, ctx); + } finally { + ReferenceCountUtil.release(toSend); + } + recycle(); + }); + } else { + try { pcbc.addEntry(ledgerId, masterKey, entryId, toSend, cb, ctx, options, allowFastFail, writeFlags); + } finally { + ReferenceCountUtil.release(toSend); } - } finally { - ReferenceCountUtil.release(toSend); + recycle(); } - recycle(); } private ChannelReadyForAddEntryCallback( diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java index a3475533f1a..80c3a1d9de6 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java @@ -615,11 +615,15 @@ protected void initChannel(Channel ch) throws Exception { } ChannelFuture future = bootstrap.connect(bookieAddr); - future.addListener(contextPreservingListener(new ConnectionFutureListener(startTime))); - future.addListener(x -> makeWritable()); + addChannelListeners(future, startTime); return future; } + protected void addChannelListeners(ChannelFuture future, long connectStartTime) { + future.addListener(contextPreservingListener(new ConnectionFutureListener(connectStartTime))); + future.addListener(x -> makeWritable()); + } + void cleanDisconnectAndClose() { disconnect(); close(); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ClientSocketDisconnectTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ClientSocketDisconnectTest.java new file mode 100644 index 00000000000..2b4eb74397b --- /dev/null +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ClientSocketDisconnectTest.java @@ -0,0 +1,144 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.bookkeeper.proto; + +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelFutureListener; +import io.netty.util.concurrent.DefaultThreadFactory; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.atomic.AtomicInteger; +import lombok.extern.slf4j.Slf4j; +import org.apache.bookkeeper.client.LedgerHandle; +import org.apache.bookkeeper.client.api.BookKeeper; +import org.apache.bookkeeper.client.api.DigestType; +import org.apache.bookkeeper.conf.ClientConfiguration; +import org.apache.bookkeeper.net.BookieId; +import org.apache.bookkeeper.test.BookKeeperClusterTestCase; +import org.apache.bookkeeper.tls.SecurityException; +import org.apache.bookkeeper.util.EventLoopUtil; +import org.junit.Assert; +import org.junit.jupiter.api.Test; + +@Slf4j +public class ClientSocketDisconnectTest extends BookKeeperClusterTestCase { + + public ClientSocketDisconnectTest() { + super(1); + this.useUUIDasBookieId = true; + } + + public static class PerChannelBookieClientDecorator extends PerChannelBookieClient { + + private final ThreadCounter threadCounter; + private final AtomicInteger failurePredicate = new AtomicInteger(); + + public PerChannelBookieClientDecorator(PerChannelBookieClient client, BookieId addr, ThreadCounter tCounter) + throws SecurityException { + super(client.executor, client.eventLoopGroup, addr, client.bookieAddressResolver); + this.threadCounter = tCounter; + } + + // Inject a disconnection per two connections. + protected void addChannelListeners(ChannelFuture future, long connectStartTime) { + future.addListener((ChannelFutureListener) future1 -> { + if (failurePredicate.incrementAndGet() % 2 == 1) { + future1.channel().close(); + } + }); + super.addChannelListeners(future, connectStartTime); + } + + // Records the thread who running "PendingAddOp.writeComplete". + @Override + protected void connectIfNeededAndDoOp(BookkeeperInternalCallbacks.GenericCallback op) { + BookieClientImpl.ChannelReadyForAddEntryCallback callback = + (BookieClientImpl.ChannelReadyForAddEntryCallback) op; + BookkeeperInternalCallbacks.WriteCallback originalCallback = callback.cb; + callback.cb = (rc, ledgerId, entryId, addr, ctx) -> { + threadCounter.record(); + originalCallback.writeComplete(rc, ledgerId, entryId, addr, ctx); + }; + super.connectIfNeededAndDoOp(op); + } + } + + private static class ThreadCounter { + + private final Map records = new ConcurrentHashMap<>(); + + public void record() { + Thread currentThread = Thread.currentThread(); + records.computeIfAbsent(currentThread, k -> new AtomicInteger()); + records.get(currentThread).incrementAndGet(); + } + } + + @Test + public void testAddEntriesCallbackWithBKClientThread() throws Exception { + // Create BKC and a ledger handle. + ClientConfiguration conf = new ClientConfiguration(); + conf.setMetadataServiceUri(zkUtil.getMetadataServiceUri()); + org.apache.bookkeeper.client.BookKeeper bkc = + (org.apache.bookkeeper.client.BookKeeper) BookKeeper.newBuilder(conf) + .eventLoopGroup( + EventLoopUtil.getClientEventLoopGroup(conf, new DefaultThreadFactory("test-io"))) + .build(); + final BookieClientImpl bookieClient = (BookieClientImpl) bkc.getClientCtx().getBookieClient(); + LedgerHandle lh = (LedgerHandle) bkc.newCreateLedgerOp() + .withEnsembleSize(1) + .withWriteQuorumSize(1) + .withAckQuorumSize(1) + .withDigestType(DigestType.CRC32C) + .withPassword(new byte[0]) + .execute().join(); + + // Inject two operations. + // 1. Inject a disconnection when connecting successfully. + // 2. Records the thread who running "PendingAddOp.writeComplete". + final ThreadCounter callbackThreadRecorder = new ThreadCounter(); + List ensemble = lh.getLedgerMetadata() + .getAllEnsembles().entrySet().iterator().next().getValue(); + DefaultPerChannelBookieClientPool clientPool = + (DefaultPerChannelBookieClientPool) bookieClient.lookupClient(ensemble.get(0)); + PerChannelBookieClient[] clients = clientPool.clients; + + // Write 100 entries and wait for finishing. + for (int i = 0; i < clients.length; i++) { + clients[i] = new PerChannelBookieClientDecorator(clients[i], ensemble.get(0), callbackThreadRecorder); + } + int addCount = 1000; + CountDownLatch countDownLatch = new CountDownLatch(addCount); + for (int i = 0; i < addCount; i++) { + lh.asyncAddEntry(new byte[]{1}, (rc, lh1, entryId, ctx) -> { + countDownLatch.countDown(); + }, i); + } + countDownLatch.await(); + + // Verify: all callback will run in the "BookKeeperClientWorker" thread. + for (Thread callbackThread : callbackThreadRecorder.records.keySet()) { + Assert.assertTrue(callbackThread.getName(), callbackThread.getName().startsWith("BookKeeperClientWorker")); + } + } +} \ No newline at end of file From 3bceb37b41048512bf0db3a0f84253946eb2a308 Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Wed, 4 Jun 2025 18:46:27 -0700 Subject: [PATCH 212/233] fix branch-4.16 ci (#4612) --- .../org/apache/bookkeeper/proto/ClientSocketDisconnectTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ClientSocketDisconnectTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ClientSocketDisconnectTest.java index 2b4eb74397b..709ed771ddc 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ClientSocketDisconnectTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ClientSocketDisconnectTest.java @@ -38,7 +38,7 @@ import org.apache.bookkeeper.tls.SecurityException; import org.apache.bookkeeper.util.EventLoopUtil; import org.junit.Assert; -import org.junit.jupiter.api.Test; +import org.junit.Test; @Slf4j public class ClientSocketDisconnectTest extends BookKeeperClusterTestCase { From 0d31202037b81b44fc1f290eef3319ac86b02740 Mon Sep 17 00:00:00 2001 From: ken <1647023764@qq.com> Date: Fri, 14 Feb 2025 14:15:32 +0800 Subject: [PATCH 213/233] fix pendingDeletedLedgers do not remove ledger error (#4525) * fix pendingDeletedLedgers not remove ledger (cherry picked from commit 0df3caf530dacc41a48fa45f0ebfd8efedf81f95) --- .../storage/ldb/LedgerMetadataIndex.java | 1 + .../storage/ldb/DbLedgerStorageTest.java | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java index 9b50479b7d5..edc816ce4b9 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java @@ -336,6 +336,7 @@ public void removeDeletedLedgers() throws IOException { key.set(ledgerId); ledgersDb.delete(key.array); ++deletedLedgers; + pendingDeletedLedgers.remove(ledgerId); } if (log.isDebugEnabled()) { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java index 65f11e5d6a3..dfc2459678b 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java @@ -33,8 +33,10 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.lang.reflect.Field; import java.nio.ByteBuffer; import java.util.List; +import java.util.Set; import org.apache.bookkeeper.bookie.Bookie; import org.apache.bookkeeper.bookie.Bookie.NoEntryException; import org.apache.bookkeeper.bookie.BookieException; @@ -52,6 +54,7 @@ import org.apache.bookkeeper.conf.TestBKConfiguration; import org.apache.bookkeeper.proto.BookieProtocol; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; @@ -822,4 +825,60 @@ public void testSingleLedgerDirectoryCheckpoint() throws Exception { assertEquals(7, logMark.getLogFileId()); assertEquals(8, logMark.getLogFileOffset()); } + + @Test + public void testSingleLedgerDirectoryCheckpointTriggerRemovePendingDeletedLedgers() + throws Exception { + int gcWaitTime = 1000; + File ledgerDir = new File(tmpDir, "dir"); + ServerConfiguration conf = TestBKConfiguration.newServerConfiguration(); + conf.setGcWaitTime(gcWaitTime); + conf.setProperty(DbLedgerStorage.WRITE_CACHE_MAX_SIZE_MB, 4); + conf.setProperty(DbLedgerStorage.READ_AHEAD_CACHE_MAX_SIZE_MB, 4); + conf.setLedgerStorageClass(DbLedgerStorage.class.getName()); + conf.setLedgerDirNames(new String[] { ledgerDir.getCanonicalPath() }); + + BookieImpl bookie = new TestBookieImpl(conf); + ByteBuf entry1 = Unpooled.buffer(1024); + entry1.writeLong(1); // ledger id + entry1.writeLong(2); // entry id + entry1.writeBytes("entry-1".getBytes()); + bookie.getLedgerStorage().addEntry(entry1); + + bookie.getJournals().get(0).getLastLogMark().getCurMark().setLogMark(1, 2); + ((DbLedgerStorage) bookie.getLedgerStorage()).getLedgerStorageList().get(0).flush(); + + File ledgerDirMark = new File(ledgerDir + "/current", "lastMark"); + try { + LogMark logMark = readLogMark(ledgerDirMark); + assertEquals(1, logMark.getLogFileId()); + assertEquals(2, logMark.getLogFileOffset()); + } catch (Exception e) { + fail(); + } + + ByteBuf entry2 = Unpooled.buffer(1024); + entry2.writeLong(2); // ledger id + entry2.writeLong(1); // entry id + entry2.writeBytes("entry-2".getBytes()); + + bookie.getLedgerStorage().addEntry(entry2); + // write one entry to first ledger directory and flush with logMark(1, 2), + // only the first ledger directory should have lastMark + bookie.getJournals().get(0).getLastLogMark().getCurMark().setLogMark(4, 5); + + SingleDirectoryDbLedgerStorage storage1 = + ((DbLedgerStorage) bookie.getLedgerStorage()).getLedgerStorageList().get(0); + Field field = SingleDirectoryDbLedgerStorage.class.getDeclaredField("ledgerIndex"); + field.setAccessible(true); + LedgerMetadataIndex ledgerMetadataIndex = (LedgerMetadataIndex) field.get(storage1); + Field field1 = LedgerMetadataIndex.class.getDeclaredField("pendingDeletedLedgers"); + field1.setAccessible(true); + Set pendingDeletedLedgers = (Set) field1.get(ledgerMetadataIndex); + + Assert.assertEquals(pendingDeletedLedgers.size(), 0); + pendingDeletedLedgers.add(2L); + bookie.getLedgerStorage().flush(); + Assert.assertEquals(pendingDeletedLedgers.size(), 0); + } } From 065b9feb94838377f85157809a535eb470c04975 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 22 Apr 2025 22:37:55 +0300 Subject: [PATCH 214/233] Adjust DNS cache expiration in tests to reduce test timeout failures (#4586) (cherry picked from commit 7fbb8d89f880579035b5ba2752caf8583d34611a) --- .github/workflows/bk-ci.yml | 14 ++++++++++++++ pom.xml | 6 +++--- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bk-ci.yml b/.github/workflows/bk-ci.yml index 19bdbfa9b18..c7e23a8c6f5 100644 --- a/.github/workflows/bk-ci.yml +++ b/.github/workflows/bk-ci.yml @@ -155,6 +155,13 @@ jobs: distribution: 'temurin' java-version: 11 + - name: Tune Java DNS TTL settings + run: | + sudo tee -a $JAVA_HOME/conf/security/java.security <org.apache.maven.plugins maven-surefire-plugin - -Xmx2G -Djava.net.preferIPv4Stack=true -Dio.netty.leakDetection.level=paranoid ${test.additional.args} + -Xmx2G -Dsun.net.inetaddr.ttl=1 -Dsun.net.inetaddr.negative.ttl=1 -Djava.net.preferIPv4Stack=true -Dio.netty.leakDetection.level=paranoid ${test.additional.args} ${redirectTestOutputToFile} ${forkCount.variable} false @@ -1298,7 +1298,7 @@ org.apache.maven.plugins maven-surefire-plugin - -Xmx2G -Djava.net.preferIPv4Stack=true + -Xmx2G -Dsun.net.inetaddr.ttl=1 -Dsun.net.inetaddr.negative.ttl=1 -Djava.net.preferIPv4Stack=true false ${forkCount.variable} false @@ -1318,7 +1318,7 @@ org.apache.maven.plugins maven-surefire-plugin - -Xmx2G -Djava.net.preferIPv4Stack=true -Dio.netty.leakDetection.level=paranoid -Dbookkeeper.log.root.level=INFO -Dbookkeeper.log.root.appender=CONSOLE + -Xmx2G -Dsun.net.inetaddr.ttl=1 -Dsun.net.inetaddr.negative.ttl=1 -Djava.net.preferIPv4Stack=true -Dio.netty.leakDetection.level=paranoid -Dbookkeeper.log.root.level=INFO -Dbookkeeper.log.root.appender=CONSOLE false ${forkCount.variable} false diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index ace02d2328e..f349e469822 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -109,7 +109,7 @@ maven-surefire-plugin ${redirectTestOutputToFile} - -Xmx3G -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G ${test.additional.args} + -Xmx3G -Dsun.net.inetaddr.ttl=1 -Dsun.net.inetaddr.negative.ttl=1 -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G ${test.additional.args} 1 false 1800 diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 829f87347ad..5394afaab14 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -110,7 +110,7 @@ false ${redirectTestOutputToFile} - -Xmx3G -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G ${test.additional.args} + -Xmx3G -Dsun.net.inetaddr.ttl=1 -Dsun.net.inetaddr.negative.ttl=1 -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G ${test.additional.args} 1 false 1800 diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 8b58e847ce6..7782decff17 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -75,7 +75,7 @@ maven-surefire-plugin ${redirectTestOutputToFile} - -Xmx3G -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G -Dio.netty.leakDetection.level=PARANOID ${test.additional.args} + -Xmx3G -Dsun.net.inetaddr.ttl=1 -Dsun.net.inetaddr.negative.ttl=1 -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G -Dio.netty.leakDetection.level=PARANOID ${test.additional.args} 1 false 1800 diff --git a/stream/pom.xml b/stream/pom.xml index 8fa49ed367c..eae3285744f 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -57,7 +57,7 @@ true ${redirectTestOutputToFile} - -Xmx3G -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G -Dio.netty.leakDetection.level=PARANOID ${test.additional.args} + -Xmx3G -Dsun.net.inetaddr.ttl=1 -Dsun.net.inetaddr.negative.ttl=1 -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G -Dio.netty.leakDetection.level=PARANOID ${test.additional.args} 1 false 1800 diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 9cfe7845a43..06a406666d6 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -68,7 +68,7 @@ org.apache.maven.plugins maven-surefire-plugin - -Xmx4G -Djava.net.preferIPv4Stack=true ${test.additional.args} + -Xmx4G -Dsun.net.inetaddr.ttl=1 -Dsun.net.inetaddr.negative.ttl=1 -Djava.net.preferIPv4Stack=true ${test.additional.args} 1 false From cda3c6b684f95158d238ba121f0770c616103b65 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 6 May 2025 10:39:19 +0800 Subject: [PATCH 215/233] Upgrade Jetty to 9.4.57.v20241219 to address CVE-2024-6763 (#4600) ### Motivation & Changes Upgrade Jetty to 9.4.57.v20241219 to address CVE-2024-6763 Jetty 9.4.57.v20241219 contains backported CVE-2024-6763 fix in https://github.com/jetty/jetty.project/pull/12532 although it's not explicitly mentioned and most security scanners don't yet contain the information that it's been addressed in 9.4.57. More details: * https://github.com/jetty/jetty.project/issues/12630 * https://github.com/jetty/jetty.project/releases/tag/jetty-9.4.57.v20241219 Note: The backport is a partial mitigation and Jetty 9.4.57 will continue to be marked as vulnerable. There's a discussion and explanation here: https://gitlab.eclipse.org/security/cve-assignement/-/issues/25#note_2968611 (cherry picked from commit 99eb63a5a417e9fdd7a7df4a5974491d51893c8e) --- .../src/main/resources/LICENSE-all.bin.txt | 16 ++++++++-------- .../src/main/resources/LICENSE-server.bin.txt | 16 ++++++++-------- .../src/main/resources/NOTICE-all.bin.txt | 16 ++++++++-------- .../src/main/resources/NOTICE-server.bin.txt | 16 ++++++++-------- pom.xml | 2 +- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 584308becdc..457888bebe0 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -264,14 +264,14 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.9.3.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [21] - lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [21] -- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar [22] -- lib/org.rocksdb-rocksdbjni-7.9.2.jar [23] +- lib/org.eclipse.jetty-jetty-http-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar [22] +- lib/org.rocksdb-rocksdbjni-9.9.3.jar [23] - lib/com.beust-jcommander-1.82.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] - lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25] diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index d0bc4b0a369..e5ac87b75f7 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -264,14 +264,14 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.9.3.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [21] - lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [21] -- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar [22] -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar [22] -- lib/org.rocksdb-rocksdbjni-7.9.2.jar [23] +- lib/org.eclipse.jetty-jetty-http-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar [22] +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar [22] +- lib/org.rocksdb-rocksdbjni-9.9.3.jar [23] - lib/com.beust-jcommander-1.82.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] - lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25] diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index d8e2d64dea2..168d4a1ff59 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -93,13 +93,13 @@ SoundCloud Ltd. (http://soundcloud.com/). This product includes software developed as part of the Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). ------------------------------------------------------------------------------------ -- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-http-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar ============================================================== Jetty Web Container @@ -121,7 +121,7 @@ Jetty is dual licensed under both Jetty may be distributed under either license. -lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar bundles UnixCrypt +lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar bundles UnixCrypt The UnixCrypt.java code implements the one way cryptography used by Unix systems for simple password protection. Copyright 1996 Aki Yoshida, diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt index 488aad4530a..210718ee9fe 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -75,13 +75,13 @@ SoundCloud Ltd. (http://soundcloud.com/). This product includes software developed as part of the Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). ------------------------------------------------------------------------------------ -- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar -- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar +- lib/org.eclipse.jetty-jetty-http-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-io-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-security-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-server-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar ============================================================== Jetty Web Container @@ -103,7 +103,7 @@ Jetty is dual licensed under both Jetty may be distributed under either license. -lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar bundles UnixCrypt +lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar bundles UnixCrypt The UnixCrypt.java code implements the one way cryptography used by Unix systems for simple password protection. Copyright 1996 Aki Yoshida, diff --git a/pom.xml b/pom.xml index 0456bcf7f24..bb93c24322d 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ 2.1.10 2.17.1 1.82 - 9.4.53.v20231009 + 9.4.57.v20241219 1.37 2.8.2 1.14.3 From 8e0d75ac36ba9132b2c0b33920a1954971d0e6ee Mon Sep 17 00:00:00 2001 From: lushiji Date: Wed, 18 Jun 2025 09:55:46 +0800 Subject: [PATCH 216/233] Update python version to 4.16.7 --- stream/clients/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream/clients/python/setup.py b/stream/clients/python/setup.py index c8c17ce200b..b5f214960cb 100644 --- a/stream/clients/python/setup.py +++ b/stream/clients/python/setup.py @@ -19,7 +19,7 @@ name = 'apache-bookkeeper-client' description = 'Apache BookKeeper client library' -version = '4.16.6' +version = '4.16.7' # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta' From c39dcef0241a6612dacfb9bab508164cbf343ce5 Mon Sep 17 00:00:00 2001 From: lushiji Date: Fri, 20 Jun 2025 01:50:59 +0000 Subject: [PATCH 217/233] [maven-release-plugin] prepare release v4.16.7-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 4 ++-- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 95 insertions(+), 95 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 7492d652bd6..411f23cc0cf 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 1876af1688e..222c08ee056 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index b22a020b473..96709ea70cf 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 1078aba5dd8..e96b1bb1867 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 6ce6431ea19..c081197a6f6 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 2fe5e1f1436..6764ed9c33f 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index bb249f3dcde..b269cc71adf 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index c1159a8c16a..d0890f2c733 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 76d4f7c3647..7a58421d109 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index bd95c063a76..498d8d24495 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 75ce4d816b0..69b1e10d7b4 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 5262f84d1ea..333fed86c43 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index b192afde27e..30efa7338a6 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 288135f20f2..5e640fbeb5f 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 0ac4cae87f2..840847272e3 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 451332633d7..f446e056212 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 7f6c3b3843d..24026e9f0cf 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 buildtools Apache BookKeeper :: Build Tools - 4.16.7-SNAPSHOT + 4.16.7 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index c9bf3601964..d890fc07f07 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 9d3d0100335..1c5b71e1094 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 326f0f6c34e..b3e15284f7d 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7-SNAPSHOT + 4.16.7 .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index f027b52ecd9..39a8b4a7e7f 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index b50896aac54..dbb6aed191a 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 06b950e6563..2eeb66840e2 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 61a4ca7568f..5268ddc5c1c 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/pom.xml b/pom.xml index bb93c24322d..0d153d0ec38 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper pom Apache BookKeeper :: Parent @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/bookkeeper.git scm:git:https://github.com/apache/bookkeeper.git https://github.com/apache/bookkeeper - v4.16.6-rc0 + v4.16.7-rc0 JIRA diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 65582a3d6ec..89cba13b42d 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index b4d32c0599c..affd4787e87 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 4080e671ff1..869df33d665 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 3e58b84dc64..2803597b3a0 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 98f96245bc9..7177afa4745 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 7928409a6da..d1285ca13e6 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index a66d4eb824c..0e9e61446ff 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 5980fa42777..c96af2e21cc 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 2d01f361368..70c3fcc0c0e 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index e7e95853970..983cc15dfe4 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index f59d0d709ac..bb6aa959bcb 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 1a684f68270..26fbec5b85d 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 8e8f9129e7f..e0c8c7ba6fc 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 7ee5100c759..3605e69f78b 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 895ae8ffe5d..8d93ec3506e 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index f6a2f229129..8eb89dea95b 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 17a35ad6f94..118ac307e50 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 32e37b39d26..111fbe27e8f 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index f349e469822..2a6304ed4b9 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 5394afaab14..9ec172593ba 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 50b084a2ff0..70b76105404 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.7-SNAPSHOT + 4.16.7 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 256850ad27d..15a3403dd57 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 7782decff17..b5d1a8912dd 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 9db284c0379..e49f99071d7 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index eae3285744f..268a39b2e3b 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 60e69e2398e..643b649cac9 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 7b644466461..72195a6b3e6 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 0db4a66af4f..3fe97655374 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 70a413e30e3..02c9119a4fc 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index b6d79ee6849..45449c71428 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 00aef435915..860e2d70db7 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index cc490837069..c0394bf3d4e 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index de91b12a8f7..d5906452b2d 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index fef5bc0784d..f25ba4b5cc3 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index b9f437ed2ff..7877556a77a 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 1da66ddc790..20eea5a9b30 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 293ff3c7f04..ab79ad6ebac 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 1c11ec0248c..574d8881f8a 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.7-SNAPSHOT + 4.16.7 ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 8fa26233121..ccee082db25 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index ec47b2e864c..8310f01bc3d 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 1833bcbb9c6..fdccdf59a5b 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 7bd465457bb..89633787a21 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 13f223d855a..cdb3d949ad1 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 86bf338e5e3..e0fe9bb3bf1 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 61a14d4cd88..19c30f53f36 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 7931a66edc1..f5d3f5e7472 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 06a406666d6..3627fbb2ade 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.7-SNAPSHOT + 4.16.7 ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 8b712485770..b24b1de85cb 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 54a8398ee63..17007f0e174 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index c95333c49e4..b27b7a50c4d 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 47829bc6497..4648e56708f 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 2d1bc68fab1..f7a19ee530d 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 86f7195c4a4..10caf539298 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 5a3dfa2fe53..fcf477f33fc 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/pom.xml b/tests/pom.xml index 099a730f46b..96745b500fe 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index dceacea3e88..2a02b2b0c4e 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 69ee0c0162f..150170c6da2 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index a8f23c611b9..699580d7878 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 5c7f5c6678b..cbd7c478277 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 8d6988575fd..e101add51c3 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 4d7293cf0c7..54e3a95d925 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 testtools Apache BookKeeper :: Test Tools - 4.16.7-SNAPSHOT + 4.16.7 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 28e7135dbed..019bb375ac9 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 5bc795e8637..5288d94a995 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 9c3c94a635f..af2d7a5b587 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 9166e9e1388..f984fc5e8cc 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 77407dcb950..89a42e35880 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index af2aa576295..331583fb664 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-cli Apache BookKeeper :: Tools :: Stream From 0efca25126d5ffc38c711e0e243acd849f985910 Mon Sep 17 00:00:00 2001 From: lushiji Date: Fri, 20 Jun 2025 07:14:10 +0000 Subject: [PATCH 218/233] [maven-release-plugin] rollback changes from release preparation of v4.16.7-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 411f23cc0cf..7492d652bd6 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 222c08ee056..1876af1688e 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 96709ea70cf..b22a020b473 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index e96b1bb1867..1078aba5dd8 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index c081197a6f6..6ce6431ea19 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 6764ed9c33f..2fe5e1f1436 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index b269cc71adf..bb249f3dcde 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index d0890f2c733..c1159a8c16a 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 7a58421d109..76d4f7c3647 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 498d8d24495..bd95c063a76 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 69b1e10d7b4..75ce4d816b0 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 333fed86c43..5262f84d1ea 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 30efa7338a6..b192afde27e 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 5e640fbeb5f..288135f20f2 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 840847272e3..0ac4cae87f2 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index f446e056212..451332633d7 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 24026e9f0cf..7f6c3b3843d 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.7 + 4.16.7-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index d890fc07f07..c9bf3601964 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 1c5b71e1094..9d3d0100335 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index b3e15284f7d..326f0f6c34e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7 + 4.16.7-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 39a8b4a7e7f..f027b52ecd9 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index dbb6aed191a..b50896aac54 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 2eeb66840e2..06b950e6563 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 5268ddc5c1c..61a4ca7568f 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 0d153d0ec38..a7c26a4e4b6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 89cba13b42d..65582a3d6ec 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index affd4787e87..b4d32c0599c 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 869df33d665..4080e671ff1 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 2803597b3a0..3e58b84dc64 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 7177afa4745..98f96245bc9 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index d1285ca13e6..7928409a6da 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 0e9e61446ff..a66d4eb824c 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index c96af2e21cc..5980fa42777 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 70c3fcc0c0e..2d01f361368 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 983cc15dfe4..e7e95853970 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index bb6aa959bcb..f59d0d709ac 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 26fbec5b85d..1a684f68270 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index e0c8c7ba6fc..8e8f9129e7f 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 3605e69f78b..7ee5100c759 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 8d93ec3506e..895ae8ffe5d 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 8eb89dea95b..f6a2f229129 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 118ac307e50..17a35ad6f94 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 111fbe27e8f..32e37b39d26 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 2a6304ed4b9..f349e469822 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 9ec172593ba..5394afaab14 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 70b76105404..50b084a2ff0 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.7 + 4.16.7-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 15a3403dd57..256850ad27d 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index b5d1a8912dd..7782decff17 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index e49f99071d7..9db284c0379 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 268a39b2e3b..eae3285744f 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 643b649cac9..60e69e2398e 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 72195a6b3e6..7b644466461 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 3fe97655374..0db4a66af4f 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 02c9119a4fc..70a413e30e3 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 45449c71428..b6d79ee6849 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 860e2d70db7..00aef435915 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index c0394bf3d4e..cc490837069 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index d5906452b2d..de91b12a8f7 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index f25ba4b5cc3..fef5bc0784d 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 7877556a77a..b9f437ed2ff 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 20eea5a9b30..1da66ddc790 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index ab79ad6ebac..293ff3c7f04 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 574d8881f8a..1c11ec0248c 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.7 + 4.16.7-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index ccee082db25..8fa26233121 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 8310f01bc3d..ec47b2e864c 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index fdccdf59a5b..1833bcbb9c6 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 89633787a21..7bd465457bb 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index cdb3d949ad1..13f223d855a 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index e0fe9bb3bf1..86bf338e5e3 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 19c30f53f36..61a14d4cd88 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index f5d3f5e7472..7931a66edc1 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 3627fbb2ade..06a406666d6 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.7 + 4.16.7-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index b24b1de85cb..8b712485770 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 17007f0e174..54a8398ee63 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index b27b7a50c4d..c95333c49e4 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 4648e56708f..47829bc6497 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index f7a19ee530d..2d1bc68fab1 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 10caf539298..86f7195c4a4 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index fcf477f33fc..5a3dfa2fe53 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 96745b500fe..099a730f46b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 2a02b2b0c4e..dceacea3e88 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 150170c6da2..69ee0c0162f 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 699580d7878..a8f23c611b9 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index cbd7c478277..5c7f5c6678b 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index e101add51c3..8d6988575fd 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 54e3a95d925..4d7293cf0c7 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.7 + 4.16.7-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 019bb375ac9..28e7135dbed 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 5288d94a995..5bc795e8637 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index af2d7a5b587..9c3c94a635f 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index f984fc5e8cc..9166e9e1388 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 89a42e35880..77407dcb950 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 331583fb664..af2aa576295 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From 9f79c71b07bf25738ea7cfdd38b61bd8ac483133 Mon Sep 17 00:00:00 2001 From: lushiji Date: Mon, 23 Jun 2025 00:42:05 +0000 Subject: [PATCH 219/233] [maven-release-plugin] prepare release v4.16.7-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 7492d652bd6..411f23cc0cf 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 1876af1688e..222c08ee056 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index b22a020b473..96709ea70cf 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 1078aba5dd8..e96b1bb1867 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 6ce6431ea19..c081197a6f6 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 2fe5e1f1436..6764ed9c33f 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index bb249f3dcde..b269cc71adf 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index c1159a8c16a..d0890f2c733 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 76d4f7c3647..7a58421d109 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index bd95c063a76..498d8d24495 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 75ce4d816b0..69b1e10d7b4 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 5262f84d1ea..333fed86c43 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index b192afde27e..30efa7338a6 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 288135f20f2..5e640fbeb5f 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 0ac4cae87f2..840847272e3 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 451332633d7..f446e056212 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 7f6c3b3843d..24026e9f0cf 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 buildtools Apache BookKeeper :: Build Tools - 4.16.7-SNAPSHOT + 4.16.7 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index c9bf3601964..d890fc07f07 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 9d3d0100335..1c5b71e1094 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 326f0f6c34e..b3e15284f7d 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7-SNAPSHOT + 4.16.7 .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index f027b52ecd9..39a8b4a7e7f 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index b50896aac54..dbb6aed191a 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 06b950e6563..2eeb66840e2 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 61a4ca7568f..5268ddc5c1c 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/pom.xml b/pom.xml index a7c26a4e4b6..0d153d0ec38 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 65582a3d6ec..89cba13b42d 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index b4d32c0599c..affd4787e87 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 4080e671ff1..869df33d665 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 3e58b84dc64..2803597b3a0 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 98f96245bc9..7177afa4745 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 7928409a6da..d1285ca13e6 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index a66d4eb824c..0e9e61446ff 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 5980fa42777..c96af2e21cc 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 2d01f361368..70c3fcc0c0e 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index e7e95853970..983cc15dfe4 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index f59d0d709ac..bb6aa959bcb 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 1a684f68270..26fbec5b85d 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 8e8f9129e7f..e0c8c7ba6fc 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 7ee5100c759..3605e69f78b 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 895ae8ffe5d..8d93ec3506e 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index f6a2f229129..8eb89dea95b 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 17a35ad6f94..118ac307e50 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 32e37b39d26..111fbe27e8f 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index f349e469822..2a6304ed4b9 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 5394afaab14..9ec172593ba 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 50b084a2ff0..70b76105404 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.7-SNAPSHOT + 4.16.7 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 256850ad27d..15a3403dd57 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 7782decff17..b5d1a8912dd 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 9db284c0379..e49f99071d7 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index eae3285744f..268a39b2e3b 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 60e69e2398e..643b649cac9 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 7b644466461..72195a6b3e6 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 0db4a66af4f..3fe97655374 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 70a413e30e3..02c9119a4fc 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index b6d79ee6849..45449c71428 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 00aef435915..860e2d70db7 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index cc490837069..c0394bf3d4e 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index de91b12a8f7..d5906452b2d 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index fef5bc0784d..f25ba4b5cc3 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index b9f437ed2ff..7877556a77a 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 1da66ddc790..20eea5a9b30 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 293ff3c7f04..ab79ad6ebac 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 1c11ec0248c..574d8881f8a 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.7-SNAPSHOT + 4.16.7 ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 8fa26233121..ccee082db25 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index ec47b2e864c..8310f01bc3d 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 1833bcbb9c6..fdccdf59a5b 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 7bd465457bb..89633787a21 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 13f223d855a..cdb3d949ad1 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 86bf338e5e3..e0fe9bb3bf1 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 61a14d4cd88..19c30f53f36 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 7931a66edc1..f5d3f5e7472 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 06a406666d6..3627fbb2ade 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.7-SNAPSHOT + 4.16.7 ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 8b712485770..b24b1de85cb 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 54a8398ee63..17007f0e174 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index c95333c49e4..b27b7a50c4d 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 47829bc6497..4648e56708f 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 2d1bc68fab1..f7a19ee530d 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 86f7195c4a4..10caf539298 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 5a3dfa2fe53..fcf477f33fc 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/pom.xml b/tests/pom.xml index 099a730f46b..96745b500fe 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index dceacea3e88..2a02b2b0c4e 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 69ee0c0162f..150170c6da2 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index a8f23c611b9..699580d7878 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 5c7f5c6678b..cbd7c478277 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 8d6988575fd..e101add51c3 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 4d7293cf0c7..54e3a95d925 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 testtools Apache BookKeeper :: Test Tools - 4.16.7-SNAPSHOT + 4.16.7 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 28e7135dbed..019bb375ac9 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 5bc795e8637..5288d94a995 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 9c3c94a635f..af2d7a5b587 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 9166e9e1388..f984fc5e8cc 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 77407dcb950..89a42e35880 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index af2aa576295..331583fb664 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-cli Apache BookKeeper :: Tools :: Stream From dd1442b31d4f09530f4e35acd01b4b7ea6f19bcc Mon Sep 17 00:00:00 2001 From: lushiji Date: Mon, 23 Jun 2025 01:03:33 +0000 Subject: [PATCH 220/233] [maven-release-plugin] rollback changes from release preparation of v4.16.7-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 411f23cc0cf..7492d652bd6 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 222c08ee056..1876af1688e 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 96709ea70cf..b22a020b473 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index e96b1bb1867..1078aba5dd8 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index c081197a6f6..6ce6431ea19 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 6764ed9c33f..2fe5e1f1436 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index b269cc71adf..bb249f3dcde 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index d0890f2c733..c1159a8c16a 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 7a58421d109..76d4f7c3647 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 498d8d24495..bd95c063a76 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 69b1e10d7b4..75ce4d816b0 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 333fed86c43..5262f84d1ea 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 30efa7338a6..b192afde27e 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 5e640fbeb5f..288135f20f2 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 840847272e3..0ac4cae87f2 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index f446e056212..451332633d7 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 24026e9f0cf..7f6c3b3843d 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.7 + 4.16.7-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index d890fc07f07..c9bf3601964 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 1c5b71e1094..9d3d0100335 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index b3e15284f7d..326f0f6c34e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7 + 4.16.7-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 39a8b4a7e7f..f027b52ecd9 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index dbb6aed191a..b50896aac54 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 2eeb66840e2..06b950e6563 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 5268ddc5c1c..61a4ca7568f 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 0d153d0ec38..a7c26a4e4b6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 89cba13b42d..65582a3d6ec 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index affd4787e87..b4d32c0599c 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 869df33d665..4080e671ff1 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 2803597b3a0..3e58b84dc64 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 7177afa4745..98f96245bc9 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index d1285ca13e6..7928409a6da 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 0e9e61446ff..a66d4eb824c 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index c96af2e21cc..5980fa42777 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 70c3fcc0c0e..2d01f361368 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 983cc15dfe4..e7e95853970 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index bb6aa959bcb..f59d0d709ac 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 26fbec5b85d..1a684f68270 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index e0c8c7ba6fc..8e8f9129e7f 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 3605e69f78b..7ee5100c759 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 8d93ec3506e..895ae8ffe5d 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 8eb89dea95b..f6a2f229129 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 118ac307e50..17a35ad6f94 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 111fbe27e8f..32e37b39d26 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 2a6304ed4b9..f349e469822 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 9ec172593ba..5394afaab14 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 70b76105404..50b084a2ff0 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.7 + 4.16.7-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 15a3403dd57..256850ad27d 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index b5d1a8912dd..7782decff17 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index e49f99071d7..9db284c0379 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 268a39b2e3b..eae3285744f 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 643b649cac9..60e69e2398e 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 72195a6b3e6..7b644466461 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 3fe97655374..0db4a66af4f 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 02c9119a4fc..70a413e30e3 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 45449c71428..b6d79ee6849 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 860e2d70db7..00aef435915 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index c0394bf3d4e..cc490837069 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index d5906452b2d..de91b12a8f7 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index f25ba4b5cc3..fef5bc0784d 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 7877556a77a..b9f437ed2ff 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 20eea5a9b30..1da66ddc790 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index ab79ad6ebac..293ff3c7f04 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 574d8881f8a..1c11ec0248c 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.7 + 4.16.7-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index ccee082db25..8fa26233121 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 8310f01bc3d..ec47b2e864c 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index fdccdf59a5b..1833bcbb9c6 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 89633787a21..7bd465457bb 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index cdb3d949ad1..13f223d855a 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index e0fe9bb3bf1..86bf338e5e3 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 19c30f53f36..61a14d4cd88 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index f5d3f5e7472..7931a66edc1 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 3627fbb2ade..06a406666d6 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.7 + 4.16.7-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index b24b1de85cb..8b712485770 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 17007f0e174..54a8398ee63 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index b27b7a50c4d..c95333c49e4 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 4648e56708f..47829bc6497 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index f7a19ee530d..2d1bc68fab1 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 10caf539298..86f7195c4a4 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index fcf477f33fc..5a3dfa2fe53 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 96745b500fe..099a730f46b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 2a02b2b0c4e..dceacea3e88 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 150170c6da2..69ee0c0162f 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 699580d7878..a8f23c611b9 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index cbd7c478277..5c7f5c6678b 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index e101add51c3..8d6988575fd 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 54e3a95d925..4d7293cf0c7 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.7 + 4.16.7-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 019bb375ac9..28e7135dbed 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 5288d94a995..5bc795e8637 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index af2d7a5b587..9c3c94a635f 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index f984fc5e8cc..9166e9e1388 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 89a42e35880..77407dcb950 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 331583fb664..af2aa576295 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From aea1fea7558bdf0bc73d1062c53f672385aedf47 Mon Sep 17 00:00:00 2001 From: lushiji Date: Tue, 24 Jun 2025 01:43:35 +0000 Subject: [PATCH 221/233] [maven-release-plugin] prepare release v4.16.7-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 7492d652bd6..411f23cc0cf 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 1876af1688e..222c08ee056 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index b22a020b473..96709ea70cf 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 1078aba5dd8..e96b1bb1867 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 6ce6431ea19..c081197a6f6 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 2fe5e1f1436..6764ed9c33f 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index bb249f3dcde..b269cc71adf 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index c1159a8c16a..d0890f2c733 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 76d4f7c3647..7a58421d109 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index bd95c063a76..498d8d24495 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 75ce4d816b0..69b1e10d7b4 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 5262f84d1ea..333fed86c43 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index b192afde27e..30efa7338a6 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 288135f20f2..5e640fbeb5f 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 0ac4cae87f2..840847272e3 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 451332633d7..f446e056212 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 7f6c3b3843d..24026e9f0cf 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 buildtools Apache BookKeeper :: Build Tools - 4.16.7-SNAPSHOT + 4.16.7 diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index c9bf3601964..d890fc07f07 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 9d3d0100335..1c5b71e1094 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 326f0f6c34e..b3e15284f7d 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7-SNAPSHOT + 4.16.7 .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index f027b52ecd9..39a8b4a7e7f 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index b50896aac54..dbb6aed191a 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 06b950e6563..2eeb66840e2 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 61a4ca7568f..5268ddc5c1c 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/pom.xml b/pom.xml index a7c26a4e4b6..0d153d0ec38 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 65582a3d6ec..89cba13b42d 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index b4d32c0599c..affd4787e87 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 4080e671ff1..869df33d665 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 3e58b84dc64..2803597b3a0 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 98f96245bc9..7177afa4745 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 7928409a6da..d1285ca13e6 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index a66d4eb824c..0e9e61446ff 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 5980fa42777..c96af2e21cc 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 2d01f361368..70c3fcc0c0e 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index e7e95853970..983cc15dfe4 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index f59d0d709ac..bb6aa959bcb 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 1a684f68270..26fbec5b85d 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 8e8f9129e7f..e0c8c7ba6fc 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 7ee5100c759..3605e69f78b 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 895ae8ffe5d..8d93ec3506e 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index f6a2f229129..8eb89dea95b 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 17a35ad6f94..118ac307e50 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 32e37b39d26..111fbe27e8f 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index f349e469822..2a6304ed4b9 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 5394afaab14..9ec172593ba 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 50b084a2ff0..70b76105404 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.7-SNAPSHOT + 4.16.7 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 256850ad27d..15a3403dd57 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 7782decff17..b5d1a8912dd 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 9db284c0379..e49f99071d7 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.7 distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index eae3285744f..268a39b2e3b 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 60e69e2398e..643b649cac9 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 7b644466461..72195a6b3e6 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 0db4a66af4f..3fe97655374 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 70a413e30e3..02c9119a4fc 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index b6d79ee6849..45449c71428 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 00aef435915..860e2d70db7 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index cc490837069..c0394bf3d4e 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index de91b12a8f7..d5906452b2d 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index fef5bc0784d..f25ba4b5cc3 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index b9f437ed2ff..7877556a77a 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 1da66ddc790..20eea5a9b30 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 293ff3c7f04..ab79ad6ebac 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 1c11ec0248c..574d8881f8a 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.7-SNAPSHOT + 4.16.7 ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 8fa26233121..ccee082db25 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index ec47b2e864c..8310f01bc3d 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 1833bcbb9c6..fdccdf59a5b 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 7bd465457bb..89633787a21 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 13f223d855a..cdb3d949ad1 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 86bf338e5e3..e0fe9bb3bf1 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 61a14d4cd88..19c30f53f36 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.7 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 7931a66edc1..f5d3f5e7472 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 06a406666d6..3627fbb2ade 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.7-SNAPSHOT + 4.16.7 ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 8b712485770..b24b1de85cb 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 54a8398ee63..17007f0e174 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index c95333c49e4..b27b7a50c4d 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 47829bc6497..4648e56708f 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 2d1bc68fab1..f7a19ee530d 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 86f7195c4a4..10caf539298 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 5a3dfa2fe53..fcf477f33fc 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.7 .. diff --git a/tests/pom.xml b/tests/pom.xml index 099a730f46b..96745b500fe 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index dceacea3e88..2a02b2b0c4e 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 69ee0c0162f..150170c6da2 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index a8f23c611b9..699580d7878 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 5c7f5c6678b..cbd7c478277 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 8d6988575fd..e101add51c3 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.7 .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 4d7293cf0c7..54e3a95d925 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 testtools Apache BookKeeper :: Test Tools - 4.16.7-SNAPSHOT + 4.16.7 diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 28e7135dbed..019bb375ac9 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 5bc795e8637..5288d94a995 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 9c3c94a635f..af2d7a5b587 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 9166e9e1388..f984fc5e8cc 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 77407dcb950..89a42e35880 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.7 bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index af2aa576295..331583fb664 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7-SNAPSHOT + 4.16.7 stream-storage-cli Apache BookKeeper :: Tools :: Stream From b086540f7ac6e314fd00f2d9f9b28544b9afc7dd Mon Sep 17 00:00:00 2001 From: lushiji Date: Tue, 24 Jun 2025 01:47:44 +0000 Subject: [PATCH 222/233] [maven-release-plugin] rollback changes from release preparation of v4.16.7-rc0 --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 411f23cc0cf..7492d652bd6 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 222c08ee056..1876af1688e 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 96709ea70cf..b22a020b473 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index e96b1bb1867..1078aba5dd8 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index c081197a6f6..6ce6431ea19 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 6764ed9c33f..2fe5e1f1436 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index b269cc71adf..bb249f3dcde 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index d0890f2c733..c1159a8c16a 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 7a58421d109..76d4f7c3647 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index 498d8d24495..bd95c063a76 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 69b1e10d7b4..75ce4d816b0 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 333fed86c43..5262f84d1ea 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 30efa7338a6..b192afde27e 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 5e640fbeb5f..288135f20f2 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 840847272e3..0ac4cae87f2 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index f446e056212..451332633d7 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 24026e9f0cf..7f6c3b3843d 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.7 + 4.16.7-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index d890fc07f07..c9bf3601964 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 1c5b71e1094..9d3d0100335 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index b3e15284f7d..326f0f6c34e 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7 + 4.16.7-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index 39a8b4a7e7f..f027b52ecd9 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index dbb6aed191a..b50896aac54 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 2eeb66840e2..06b950e6563 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 5268ddc5c1c..61a4ca7568f 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 0d153d0ec38..a7c26a4e4b6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 89cba13b42d..65582a3d6ec 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index affd4787e87..b4d32c0599c 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 869df33d665..4080e671ff1 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 2803597b3a0..3e58b84dc64 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 7177afa4745..98f96245bc9 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index d1285ca13e6..7928409a6da 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index 0e9e61446ff..a66d4eb824c 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index c96af2e21cc..5980fa42777 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 70c3fcc0c0e..2d01f361368 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index 983cc15dfe4..e7e95853970 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index bb6aa959bcb..f59d0d709ac 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 26fbec5b85d..1a684f68270 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index e0c8c7ba6fc..8e8f9129e7f 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 3605e69f78b..7ee5100c759 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 8d93ec3506e..895ae8ffe5d 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index 8eb89dea95b..f6a2f229129 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 118ac307e50..17a35ad6f94 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 111fbe27e8f..32e37b39d26 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 2a6304ed4b9..f349e469822 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 9ec172593ba..5394afaab14 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 70b76105404..50b084a2ff0 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.7 + 4.16.7-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 15a3403dd57..256850ad27d 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index b5d1a8912dd..7782decff17 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index e49f99071d7..9db284c0379 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7 + 4.16.7-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index 268a39b2e3b..eae3285744f 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 643b649cac9..60e69e2398e 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 72195a6b3e6..7b644466461 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 3fe97655374..0db4a66af4f 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 02c9119a4fc..70a413e30e3 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 45449c71428..b6d79ee6849 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 860e2d70db7..00aef435915 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index c0394bf3d4e..cc490837069 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index d5906452b2d..de91b12a8f7 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index f25ba4b5cc3..fef5bc0784d 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index 7877556a77a..b9f437ed2ff 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 20eea5a9b30..1da66ddc790 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index ab79ad6ebac..293ff3c7f04 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 574d8881f8a..1c11ec0248c 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.7 + 4.16.7-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index ccee082db25..8fa26233121 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index 8310f01bc3d..ec47b2e864c 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index fdccdf59a5b..1833bcbb9c6 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 89633787a21..7bd465457bb 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index cdb3d949ad1..13f223d855a 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index e0fe9bb3bf1..86bf338e5e3 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 19c30f53f36..61a14d4cd88 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7 + 4.16.7-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index f5d3f5e7472..7931a66edc1 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 3627fbb2ade..06a406666d6 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.7 + 4.16.7-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index b24b1de85cb..8b712485770 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 17007f0e174..54a8398ee63 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index b27b7a50c4d..c95333c49e4 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 4648e56708f..47829bc6497 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index f7a19ee530d..2d1bc68fab1 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 10caf539298..86f7195c4a4 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index fcf477f33fc..5a3dfa2fe53 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7 + 4.16.7-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 96745b500fe..099a730f46b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 2a02b2b0c4e..dceacea3e88 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 150170c6da2..69ee0c0162f 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index 699580d7878..a8f23c611b9 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index cbd7c478277..5c7f5c6678b 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index e101add51c3..8d6988575fd 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7 + 4.16.7-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 54e3a95d925..4d7293cf0c7 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.7 + 4.16.7-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 019bb375ac9..28e7135dbed 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 5288d94a995..5bc795e8637 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index af2d7a5b587..9c3c94a635f 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index f984fc5e8cc..9166e9e1388 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 89a42e35880..77407dcb950 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7 + 4.16.7-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index 331583fb664..af2aa576295 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7 + 4.16.7-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From add680828de960793163e38a9cec0dd2c9ca63ae Mon Sep 17 00:00:00 2001 From: StevenLuMT Date: Mon, 7 Jul 2025 09:28:34 +0800 Subject: [PATCH 223/233] fix cherry-pick: Upgrade Jetty to 9.4.57.v20241219 to address CVE-2024-6763 (#4600) (#4631) --- bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 2 +- bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 457888bebe0..ccf7b55bf1a 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -271,7 +271,7 @@ Apache Software License, Version 2. - lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar [22] - lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar [22] - lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar [22] -- lib/org.rocksdb-rocksdbjni-9.9.3.jar [23] +- lib/org.rocksdb-rocksdbjni-7.9.2.jar [23] - lib/com.beust-jcommander-1.82.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] - lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25] diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index e5ac87b75f7..61a176243ad 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -271,7 +271,7 @@ Apache Software License, Version 2. - lib/org.eclipse.jetty-jetty-servlet-9.4.57.v20241219.jar [22] - lib/org.eclipse.jetty-jetty-util-9.4.57.v20241219.jar [22] - lib/org.eclipse.jetty-jetty-util-ajax-9.4.57.v20241219.jar [22] -- lib/org.rocksdb-rocksdbjni-9.9.3.jar [23] +- lib/org.rocksdb-rocksdbjni-7.9.2.jar [23] - lib/com.beust-jcommander-1.82.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] - lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25] From 951d9566113588fbac4a416390e78b75e5e6f381 Mon Sep 17 00:00:00 2001 From: StevenLuMT Date: Mon, 7 Jul 2025 11:11:34 +0800 Subject: [PATCH 224/233] Bump branch-4.16 to 4.16.8-SNAPSHOT (#4629) --- bookkeeper-benchmark/pom.xml | 2 +- bookkeeper-common-allocator/pom.xml | 2 +- bookkeeper-common/pom.xml | 2 +- bookkeeper-dist/all/pom.xml | 2 +- bookkeeper-dist/bkctl/pom.xml | 2 +- bookkeeper-dist/pom.xml | 2 +- bookkeeper-dist/server/pom.xml | 2 +- bookkeeper-http/http-server/pom.xml | 2 +- bookkeeper-http/pom.xml | 2 +- bookkeeper-http/servlet-http-server/pom.xml | 2 +- bookkeeper-http/vertx-http-server/pom.xml | 2 +- bookkeeper-proto/pom.xml | 2 +- bookkeeper-server/pom.xml | 2 +- bookkeeper-slogger/api/pom.xml | 2 +- bookkeeper-slogger/pom.xml | 2 +- bookkeeper-slogger/slf4j/pom.xml | 2 +- buildtools/pom.xml | 4 ++-- circe-checksum/pom.xml | 2 +- cpu-affinity/pom.xml | 2 +- metadata-drivers/etcd/pom.xml | 2 +- metadata-drivers/jetcd-core-shaded/pom.xml | 2 +- metadata-drivers/pom.xml | 2 +- microbenchmarks/pom.xml | 2 +- native-io/pom.xml | 2 +- pom.xml | 2 +- shaded/bookkeeper-server-shaded/pom.xml | 2 +- shaded/bookkeeper-server-tests-shaded/pom.xml | 2 +- shaded/distributedlog-core-shaded/pom.xml | 2 +- shaded/pom.xml | 2 +- stats/bookkeeper-stats-api/pom.xml | 2 +- .../codahale-metrics-provider/pom.xml | 2 +- stats/bookkeeper-stats-providers/pom.xml | 2 +- .../prometheus-metrics-provider/pom.xml | 2 +- stats/pom.xml | 2 +- stats/utils/pom.xml | 2 +- stream/api/pom.xml | 2 +- stream/bk-grpc-name-resolver/pom.xml | 2 +- stream/clients/java/all/pom.xml | 2 +- stream/clients/java/base/pom.xml | 2 +- stream/clients/java/kv/pom.xml | 2 +- stream/clients/java/pom.xml | 2 +- stream/clients/pom.xml | 2 +- stream/common/pom.xml | 2 +- stream/distributedlog/common/pom.xml | 2 +- stream/distributedlog/core/pom.xml | 2 +- stream/distributedlog/io/dlfs/pom.xml | 2 +- stream/distributedlog/io/pom.xml | 2 +- stream/distributedlog/pom.xml | 2 +- stream/distributedlog/protocol/pom.xml | 2 +- stream/pom.xml | 2 +- stream/proto/pom.xml | 2 +- stream/server/pom.xml | 2 +- stream/statelib/pom.xml | 2 +- stream/storage/api/pom.xml | 2 +- stream/storage/impl/pom.xml | 2 +- stream/storage/pom.xml | 2 +- stream/tests-common/pom.xml | 2 +- tests/backward-compat/bc-non-fips/pom.xml | 2 +- tests/backward-compat/current-server-old-clients/pom.xml | 2 +- tests/backward-compat/hierarchical-ledger-manager/pom.xml | 2 +- tests/backward-compat/hostname-bookieid/pom.xml | 2 +- tests/backward-compat/old-cookie-new-cluster/pom.xml | 2 +- tests/backward-compat/pom.xml | 2 +- tests/backward-compat/recovery-no-password/pom.xml | 2 +- tests/backward-compat/upgrade-direct/pom.xml | 2 +- tests/backward-compat/upgrade/pom.xml | 2 +- tests/backward-compat/yahoo-custom-version/pom.xml | 2 +- tests/docker-images/all-released-versions-image/pom.xml | 2 +- tests/docker-images/all-versions-image/pom.xml | 2 +- tests/docker-images/current-version-image/pom.xml | 2 +- tests/docker-images/pom.xml | 2 +- tests/integration-tests-base-groovy/pom.xml | 2 +- tests/integration-tests-base/pom.xml | 2 +- tests/integration-tests-topologies/pom.xml | 2 +- tests/integration-tests-utils/pom.xml | 2 +- tests/integration/cluster/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/smoke/pom.xml | 2 +- tests/integration/standalone/pom.xml | 2 +- tests/pom.xml | 2 +- tests/scripts/pom.xml | 2 +- tests/shaded/bookkeeper-server-shaded-test/pom.xml | 2 +- tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml | 2 +- tests/shaded/distributedlog-core-shaded-test/pom.xml | 2 +- tests/shaded/pom.xml | 2 +- testtools/pom.xml | 4 ++-- tools/all/pom.xml | 2 +- tools/framework/pom.xml | 2 +- tools/ledger/pom.xml | 2 +- tools/perf/pom.xml | 2 +- tools/pom.xml | 2 +- tools/stream/pom.xml | 2 +- 92 files changed, 94 insertions(+), 94 deletions(-) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 7492d652bd6..2c7567869d0 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -21,7 +21,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper bookkeeper-benchmark diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 1876af1688e..6d07d8dbdcf 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT bookkeeper-common-allocator Apache BookKeeper :: Common :: Allocator diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index b22a020b473..d2ad1110b1d 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT bookkeeper-common Apache BookKeeper :: Common diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 1078aba5dd8..da8d30aff3e 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index 6ce6431ea19..7f93c8770ba 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 2fe5e1f1436..5b9dc71fd56 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT 4.0.0 bookkeeper-dist diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index bb249f3dcde..89bf168e9b0 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -23,7 +23,7 @@ bookkeeper-dist org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index c1159a8c16a..f0ec5e587de 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml index 76d4f7c3647..dc45181f402 100644 --- a/bookkeeper-http/pom.xml +++ b/bookkeeper-http/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT 4.0.0 org.apache.bookkeeper.http diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml index bd95c063a76..057bf4b2fd9 100644 --- a/bookkeeper-http/servlet-http-server/pom.xml +++ b/bookkeeper-http/servlet-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index 75ce4d816b0..4a526714d65 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT ../.. 4.0.0 diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml index 5262f84d1ea..6f2fe20bfce 100644 --- a/bookkeeper-proto/pom.xml +++ b/bookkeeper-proto/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT bookkeeper-proto Apache BookKeeper :: Protocols diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index b192afde27e..f378b303bc3 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT bookkeeper-server Apache BookKeeper :: Server diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 288135f20f2..b3de6c6b4da 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. org.apache.bookkeeper diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index 0ac4cae87f2..0122f1a63b8 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -18,7 +18,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. pom diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 451332633d7..69a0e1e0015 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -18,7 +18,7 @@ bookkeeper-slogger-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. org.apache.bookkeeper diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 7f6c3b3843d..8427398bfe9 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,9 +20,9 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT buildtools Apache BookKeeper :: Build Tools - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index c9bf3601964..9fb5cc73e57 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 9d3d0100335..94c3c6eb2ca 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index 326f0f6c34e..2b1a445578d 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. 4.0.0 diff --git a/metadata-drivers/jetcd-core-shaded/pom.xml b/metadata-drivers/jetcd-core-shaded/pom.xml index f027b52ecd9..5abdc2a7428 100644 --- a/metadata-drivers/jetcd-core-shaded/pom.xml +++ b/metadata-drivers/jetcd-core-shaded/pom.xml @@ -24,7 +24,7 @@ org.apache.bookkeeper.metadata.drivers metadata-drivers-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. org.apache.bookkeeper.metadata.drivers diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index b50896aac54..4ae4ff7de79 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -19,7 +19,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT 4.0.0 org.apache.bookkeeper.metadata.drivers diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 06b950e6563..234b77273d9 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT microbenchmarks Apache BookKeeper :: microbenchmarks diff --git a/native-io/pom.xml b/native-io/pom.xml index 61a4ca7568f..87de56d83dc 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index a7c26a4e4b6..5b689079006 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT bookkeeper pom Apache BookKeeper :: Parent diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 65582a3d6ec..487f76ed306 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. bookkeeper-server-shaded diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index b4d32c0599c..7a901d7a744 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. bookkeeper-server-tests-shaded diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 4080e671ff1..1bb8cc50376 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper shaded-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. org.apache.distributedlog diff --git a/shaded/pom.xml b/shaded/pom.xml index 3e58b84dc64..eb89d2ad112 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper shaded-parent diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 98f96245bc9..7b117c3e252 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-api diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 7928409a6da..36e74f580fd 100644 --- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper.stats codahale-metrics-provider diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml index a66d4eb824c..55e8298adf8 100644 --- a/stats/bookkeeper-stats-providers/pom.xml +++ b/stats/bookkeeper-stats-providers/pom.xml @@ -19,7 +19,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 5980fa42777..47f4d2d4fc8 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -20,7 +20,7 @@ bookkeeper-stats-providers org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper.stats prometheus-metrics-provider diff --git a/stats/pom.xml b/stats/pom.xml index 2d01f361368..54e89834d42 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -22,7 +22,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT pom org.apache.bookkeeper.stats diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml index e7e95853970..4d88d5ee6ca 100644 --- a/stats/utils/pom.xml +++ b/stats/utils/pom.xml @@ -22,7 +22,7 @@ bookkeeper-stats-parent org.apache.bookkeeper.stats - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper.stats bookkeeper-stats-utils diff --git a/stream/api/pom.xml b/stream/api/pom.xml index f59d0d709ac..754cba33c6e 100644 --- a/stream/api/pom.xml +++ b/stream/api/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml index 1a684f68270..b0e4f9ec32a 100644 --- a/stream/bk-grpc-name-resolver/pom.xml +++ b/stream/bk-grpc-name-resolver/pom.xml @@ -22,7 +22,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 8e8f9129e7f..78acc068870 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT stream-storage-java-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 7ee5100c759..2511b3eb1a8 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT stream-storage-java-client-base Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml index 895ae8ffe5d..6e958202424 100644 --- a/stream/clients/java/kv/pom.xml +++ b/stream/clients/java/kv/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-java-client-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT stream-storage-java-kv-client Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml index f6a2f229129..efb1d09cbca 100644 --- a/stream/clients/java/pom.xml +++ b/stream/clients/java/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-clients-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. stream-storage-java-client-parent diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml index 17a35ad6f94..4a695a2d80b 100644 --- a/stream/clients/pom.xml +++ b/stream/clients/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. stream-storage-clients-parent diff --git a/stream/common/pom.xml b/stream/common/pom.xml index 32e37b39d26..a8cd3c87ad3 100644 --- a/stream/common/pom.xml +++ b/stream/common/pom.xml @@ -20,7 +20,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index f349e469822..61a5e90efd5 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT distributedlog-common Apache BookKeeper :: DistributedLog :: Common diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index 5394afaab14..3cb46813252 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT distributedlog-core Apache BookKeeper :: DistributedLog :: Core Library diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 50b084a2ff0..3069d3789a2 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -20,7 +20,7 @@ distributedlog org.apache.distributedlog - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 256850ad27d..43c2787996c 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -19,7 +19,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 7782decff17..01c14ac5dc3 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT ../.. org.apache.distributedlog diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index 9db284c0379..1b5755592da 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -20,7 +20,7 @@ org.apache.distributedlog distributedlog - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT distributedlog-protocol Apache BookKeeper :: DistributedLog :: Protocol diff --git a/stream/pom.xml b/stream/pom.xml index eae3285744f..af5b2aba764 100644 --- a/stream/pom.xml +++ b/stream/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. pom diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 60e69e2398e..0e57bbd9b57 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 7b644466461..4b99b040a35 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT stream-storage-server Apache BookKeeper :: Stream Storage :: Server diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 0db4a66af4f..a610cc0060c 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -21,7 +21,7 @@ stream-storage-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. org.apache.bookkeeper diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 70a413e30e3..59db297d1c7 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. stream-storage-service-api diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index b6d79ee6849..ffcf6cdf8b2 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-service-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. stream-storage-service-impl diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 00aef435915..11274a626cc 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. stream-storage-service-parent diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index cc490837069..14a9f4212c0 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper stream-storage-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. org.apache.bookkeeper.tests diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml index de91b12a8f7..7d2b86988f7 100644 --- a/tests/backward-compat/bc-non-fips/pom.xml +++ b/tests/backward-compat/bc-non-fips/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml index fef5bc0784d..9cdb8035b99 100644 --- a/tests/backward-compat/current-server-old-clients/pom.xml +++ b/tests/backward-compat/current-server-old-clients/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index b9f437ed2ff..9b2a4d84e80 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index 1da66ddc790..4a4e89cf87a 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 293ff3c7f04..8c69564a514 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index 1c11ec0248c..1ad28543a63 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration-tests-base-groovy - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT ../integration-tests-base-groovy org.apache.bookkeeper.tests diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml index 8fa26233121..8133cb5f38f 100644 --- a/tests/backward-compat/recovery-no-password/pom.xml +++ b/tests/backward-compat/recovery-no-password/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index ec47b2e864c..63732f83bda 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index 1833bcbb9c6..c4d6f59a292 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index 7bd465457bb..18c2b0013b1 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests backward-compat - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index 13f223d855a..bc29ad6f6a3 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 86bf338e5e3..59ee779e8ca 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 61a14d4cd88..757a3b39d0d 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -19,7 +19,7 @@ org.apache.bookkeeper.tests docker-images - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT 4.0.0 org.apache.bookkeeper.tests diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index 7931a66edc1..944e7d2f4ec 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper.tests docker-images diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 06a406666d6..436df6d4435 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration-tests-base - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT ../integration-tests-base diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml index 8b712485770..51da0388cd4 100644 --- a/tests/integration-tests-base/pom.xml +++ b/tests/integration-tests-base/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml index 54a8398ee63..b44e8f7202e 100644 --- a/tests/integration-tests-topologies/pom.xml +++ b/tests/integration-tests-topologies/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml index c95333c49e4..1c90b4e6381 100644 --- a/tests/integration-tests-utils/pom.xml +++ b/tests/integration-tests-utils/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index 47829bc6497..81b8a1edc41 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 2d1bc68fab1..14a2c065c8b 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper.tests integration diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml index 86f7195c4a4..cd46b1c3ded 100644 --- a/tests/integration/smoke/pom.xml +++ b/tests/integration/smoke/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 5a3dfa2fe53..49792d0559e 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests integration - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index 099a730f46b..546e98121e8 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper.tests tests-parent diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index dceacea3e88..3017a943f0f 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT org.apache.bookkeeper.tests diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml index 69ee0c0162f..4c4668a9fee 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. bookkeeper-server-shaded-test diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml index a8f23c611b9..4f59a33f76f 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. bookkeeper-server-tests-shaded-test diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml index 5c7f5c6678b..a0ae6b30928 100644 --- a/tests/shaded/distributedlog-core-shaded-test/pom.xml +++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml @@ -20,7 +20,7 @@ org.apache.bookkeeper.tests.shaded shaded-tests-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. distributedlog-core-shaded-test diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 8d6988575fd..ee4cb73a1bd 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper.tests tests-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT .. org.apache.bookkeeper.tests.shaded diff --git a/testtools/pom.xml b/testtools/pom.xml index 4d7293cf0c7..3c721d96b7f 100644 --- a/testtools/pom.xml +++ b/testtools/pom.xml @@ -20,11 +20,11 @@ org.apache.bookkeeper bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT testtools Apache BookKeeper :: Test Tools - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 28e7135dbed..814c52185a0 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -22,7 +22,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT bookkeeper-tools Apache BookKeeper :: Tools diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml index 5bc795e8637..dbf814d2149 100644 --- a/tools/framework/pom.xml +++ b/tools/framework/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT bookkeeper-tools-framework Apache BookKeeper :: Tools :: Framework diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml index 9c3c94a635f..ca70a48257b 100644 --- a/tools/ledger/pom.xml +++ b/tools/ledger/pom.xml @@ -20,7 +20,7 @@ bookkeeper-tools-parent org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT bookkeeper-tools-ledger Apache BookKeeper :: Tools :: Ledger diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml index 9166e9e1388..5de4c61b3dc 100644 --- a/tools/perf/pom.xml +++ b/tools/perf/pom.xml @@ -17,7 +17,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT bookkeeper-perf Apache BookKeeper :: Tools :: Perf diff --git a/tools/pom.xml b/tools/pom.xml index 77407dcb950..ee35978f517 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ bookkeeper org.apache.bookkeeper - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT bookkeeper-tools-parent Apache BookKeeper :: Tools :: Parent diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml index af2aa576295..0a29280f789 100644 --- a/tools/stream/pom.xml +++ b/tools/stream/pom.xml @@ -21,7 +21,7 @@ org.apache.bookkeeper bookkeeper-tools-parent - 4.16.7-SNAPSHOT + 4.16.8-SNAPSHOT stream-storage-cli Apache BookKeeper :: Tools :: Stream From 7733db1c9a673371301d585e3d0e35c44d4110f9 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov <8622884+dlg99@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:41:21 -0800 Subject: [PATCH 225/233] Fix: Garbage collection stuck on corrupt entry log file (#4544) (cherry picked from commit 175e29407ece25fbb50d52afbcca384f2182e058) --- .../apache/bookkeeper/bookie/GarbageCollectorThread.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java index d70082256f9..41eb1d941f3 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java @@ -809,8 +809,13 @@ protected void extractMetaFromEntryLogs() throws EntryLogMetadataMapException { entryLogMetaMap.put(entryLogId, entryLogMeta); } } catch (IOException | RuntimeException e) { - LOG.warn("Premature exception when processing " + entryLogId - + " recovery will take care of the problem", e); + LOG.warn("Premature exception when processing {} recovery will take care of the problem", + entryLogId, e); + } catch (OutOfMemoryError oome) { + // somewhat similar to https://github.com/apache/bookkeeper/pull/3901 + // entrylog file can be corrupted but instead having a negative entry size + // it ends up with very large value for the entry size causing OODME + LOG.warn("OutOfMemoryError when processing {} - skipping the entry log", entryLogId, oome); } } } From 35b8f137b49e730efc3c1c0d5e294d2ff827bd42 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Tue, 12 Aug 2025 10:18:44 +0800 Subject: [PATCH 226/233] Log all the error in the GarbageCollectorThread (#4649) ### Motivation We met the GarbageCollectionThread was stopped by some runtime error, but we didn't catch it then, causing the GC to stop. Such as: https://github.com/apache/bookkeeper/pull/3901 https://github.com/apache/bookkeeper/pull/4544 In our case, the GC stopped because of the OutOfDirectMemoryException then the process stopped and the files can not be deleted. But we didn't see any error logs. This PR enhance the log info when an unhandled error happens. We already have the [PR](https://github.com/apache/bookkeeper/pull/4544) fixed that. And another fix in this PR is to change the Exception to the Throwable in the getEntryLogMetadata. Here is the error stack: ``` io.netty.util.internal.OutOfDirectMemoryError: failed to allocate 213909504 byte(s) of direct memory (used: 645922847, max: 858783744) at io.netty.util.internal.PlatformDependent.incrementMemoryCounter(PlatformDependent.java:880) at io.netty.util.internal.PlatformDependent.allocateDirectNoCleaner(PlatformDependent.java:809) at io.netty.buffer.PoolArena$DirectArena.allocateDirect(PoolArena.java:718) at io.netty.buffer.PoolArena$DirectArena.newUnpooledChunk(PoolArena.java:707) at io.netty.buffer.PoolArena.allocateHuge(PoolArena.java:224) at io.netty.buffer.PoolArena.allocate(PoolArena.java:142) at io.netty.buffer.PoolArena.reallocate(PoolArena.java:317) at io.netty.buffer.PooledByteBuf.capacity(PooledByteBuf.java:123) at io.netty.buffer.AbstractByteBuf.ensureWritable0(AbstractByteBuf.java:305) at io.netty.buffer.AbstractByteBuf.ensureWritable(AbstractByteBuf.java:280) at io.netty.buffer.AbstractByteBuf.writeBytes(AbstractByteBuf.java:1103) at org.apache.bookkeeper.bookie.BufferedReadChannel.read(BufferedReadChannel.java:104) at org.apache.bookkeeper.bookie.DefaultEntryLogger.extractEntryLogMetadataFromIndex(DefaultEntryLogger.java:1109) at org.apache.bookkeeper.bookie.DefaultEntryLogger.getEntryLogMetadata(DefaultEntryLogger.java:1060) at org.apache.bookkeeper.bookie.GarbageCollectorThread.extractMetaFromEntryLogs(GarbageCollectorThread.java:678) at org.apache.bookkeeper.bookie.GarbageCollectorThread.runWithFlags(GarbageCollectorThread.java:365) at org.apache.bookkeeper.bookie.GarbageCollectorThread.lambda$triggerGC$4(GarbageCollectorThread.java:268) at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source) at java.base/java.util.concurrent.FutureTask.run(Unknown Source) at java.base/java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(Unknown Source) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.base/java.lang.Thread.run(Unknown Source) ``` You can see it get much more memory used here extractEntryLogMetadataFromIndex(DefaultEntryLogger.java:1109). The reason is that the header has the wrong data of the header, which should already be fixed by https://github.com/apache/bookkeeper/pull/4607. Then it reading with a wrong map size which could take a lot of memory. (cherry picked from commit e80d0318cfdebbc79f37d9120de8df28c8c1c13a) --- .../java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java | 2 +- .../org/apache/bookkeeper/bookie/GarbageCollectorThread.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java index cfe7aac7936..a8065411eed 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java @@ -1062,7 +1062,7 @@ public EntryLogMetadata getEntryLogMetadata(long entryLogId, AbstractLogCompacto } catch (FileNotFoundException fne) { LOG.warn("Cannot find entry log file {}.log : {}", Long.toHexString(entryLogId), fne.getMessage()); throw fne; - } catch (Exception e) { + } catch (Throwable e) { LOG.info("Failed to get ledgers map index from: {}.log : {}", entryLogId, e.getMessage()); // Fall-back to scanning diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java index 41eb1d941f3..b1c4b0ab2d8 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java @@ -500,6 +500,10 @@ public void runWithFlags(boolean force, boolean suspendMajor, boolean suspendMin e.getMessage(), e); gcStats.getGcThreadRuntime().registerFailedEvent( MathUtils.nowInNano() - threadStart, TimeUnit.NANOSECONDS); + } catch (Throwable e) { + LOG.error("Error in garbage collector thread, Failed to complete GC/Compaction due to {}", + e.getMessage(), e); + gcStats.getGcThreadRuntime().registerFailedEvent(MathUtils.elapsedNanos(threadStart), TimeUnit.NANOSECONDS); } finally { if (force && forceGarbageCollection.compareAndSet(true, false)) { LOG.info("{} Set forceGarbageCollection to false after force GC to make it forceGC-able again.", From 2b2661de68ad0d9b02fd964c1520def07d044911 Mon Sep 17 00:00:00 2001 From: fengyubiao Date: Tue, 2 Sep 2025 12:26:50 +0800 Subject: [PATCH 227/233] [fix]Wrong error code(-107) of opening a deleted ledger (#4657) (cherry picked from commit 5870922754b9585f7d3592dcd0714a4da65d9d80) --- .../bookkeeper/bookie/BookieException.java | 12 ++ .../bookkeeper/bookie/HandleFactoryImpl.java | 2 +- .../proto/PerChannelBookieClient.java | 5 + .../bookkeeper/proto/ReadEntryProcessor.java | 2 +- .../proto/ReadEntryProcessorV3.java | 5 +- .../bookkeeper/proto/WriteEntryProcessor.java | 4 +- .../proto/WriteEntryProcessorV3.java | 4 +- .../bookkeeper/proto/WriteLacProcessorV3.java | 4 + .../apache/bookkeeper/client/TestFencing.java | 113 ++++++++++++++++++ 9 files changed, 143 insertions(+), 8 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieException.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieException.java index 2b85961cf4b..d88673d0076 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieException.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieException.java @@ -69,6 +69,8 @@ public static BookieException create(int code) { return new MetadataStoreException(); case Code.UnknownBookieIdException: return new UnknownBookieIdException(); + case Code.LedgerFencedAndDeletedException: + return new LedgerFencedAndDeletedException(); case Code.DataUnknownException: return new DataUnknownException(); default: @@ -95,6 +97,7 @@ public interface Code { int CookieExistsException = -109; int EntryLogMetadataMapException = -110; int DataUnknownException = -111; + int LedgerFencedAndDeletedException = -112; } public int getCode() { @@ -199,6 +202,15 @@ public LedgerFencedException() { } } + /** + * Signals that a ledger has been fenced in a bookie. No more entries can be appended to that ledger. + */ + public static class LedgerFencedAndDeletedException extends BookieException { + public LedgerFencedAndDeletedException() { + super(Code.LedgerFencedException); + } + } + /** * Signals that a ledger's operation has been rejected by an internal component because of the resource saturation. */ diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactoryImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactoryImpl.java index b331f125061..ac87c3aed45 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactoryImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/HandleFactoryImpl.java @@ -57,7 +57,7 @@ public LedgerDescriptor getHandle(final long ledgerId, final byte[] masterKey, b if (handle == null) { if (!journalReplay && recentlyFencedAndDeletedLedgers.getIfPresent(ledgerId) != null) { - throw BookieException.create(BookieException.Code.LedgerFencedException); + throw BookieException.create(BookieException.Code.LedgerFencedAndDeletedException); } handle = LedgerDescriptor.create(masterKey, ledgerId, ledgerStorage); ledgers.putIfAbsent(ledgerId, handle); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java index 80c3a1d9de6..7bce38aae2c 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java @@ -1165,6 +1165,11 @@ private void writeAndFlush(final Channel channel, completion.setOutstanding(); } } else { + try { + future.get(); + } catch (Exception ex) { + LOG.warn("Failed to request to the bookie: {}", bookieId, ex); + } nettyOpLogger.registerFailedEvent(MathUtils.elapsedNanos(startTime), TimeUnit.NANOSECONDS); errorOut(key); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java index 04efd9634b2..9c6d672f480 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java @@ -93,7 +93,7 @@ protected void processPacket() { handleReadResultForFenceRead(fenceResult, data, startTimeNanos); return; } - } catch (Bookie.NoLedgerException e) { + } catch (Bookie.NoLedgerException | BookieException.LedgerFencedAndDeletedException e) { if (LOG.isDebugEnabled()) { LOG.debug("Error reading {}", request, e); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessorV3.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessorV3.java index 999b8095db6..05f9de0ea3a 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessorV3.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessorV3.java @@ -215,9 +215,10 @@ protected ReadResponse getReadResponse() { } } return readEntry(readResponse, entryId, startTimeSw); - } catch (Bookie.NoLedgerException e) { + } catch (Bookie.NoLedgerException | BookieException.LedgerFencedAndDeletedException e) { if (RequestUtils.isFenceRequest(readRequest)) { - LOG.info("No ledger found reading entry {} when fencing ledger {}", entryId, ledgerId); + LOG.info("No ledger found(or it has been deleted) reading entry {} when fencing ledger {}", + entryId, ledgerId); } else if (entryId != BookieProtocol.LAST_ADD_CONFIRMED) { LOG.info("No ledger found while reading entry: {} from ledger: {}", entryId, ledgerId); } else if (LOG.isDebugEnabled()) { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java index d611ab963af..665e2d3a1c1 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessor.java @@ -90,8 +90,8 @@ protected void processPacket() { } catch (IOException e) { LOG.error("Error writing {}", request, e); rc = BookieProtocol.EIO; - } catch (BookieException.LedgerFencedException lfe) { - LOG.warn("Write attempt on fenced ledger {} by client {}", request.getLedgerId(), + } catch (BookieException.LedgerFencedException | BookieException.LedgerFencedAndDeletedException lfe) { + LOG.warn("Write attempt on fenced/deleted ledger {} by client {}", request.getLedgerId(), requestHandler.ctx().channel().remoteAddress()); rc = BookieProtocol.EFENCED; } catch (BookieException e) { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3.java index 36aff7ad924..79d9f41d5c3 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3.java @@ -136,8 +136,8 @@ public void writeComplete(int rc, long ledgerId, long entryId, logger.error("Error writing entry:{} to ledger:{}", entryId, ledgerId, e); status = StatusCode.EIO; - } catch (BookieException.LedgerFencedException e) { - logger.error("Ledger fenced while writing entry:{} to ledger:{}", + } catch (BookieException.LedgerFencedException | BookieException.LedgerFencedAndDeletedException e) { + logger.error("Ledger fenced/deleted while writing entry:{} to ledger:{}", entryId, ledgerId, e); status = StatusCode.EFENCED; } catch (BookieException e) { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteLacProcessorV3.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteLacProcessorV3.java index 293cea3bb0c..81d1bc66050 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteLacProcessorV3.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/WriteLacProcessorV3.java @@ -105,6 +105,10 @@ public void writeComplete(int rc, long ledgerId, long entryId, BookieId addr, Ob requestProcessor.bookie.setExplicitLac(Unpooled.wrappedBuffer(lacToAdd), writeCallback, requestHandler, masterKey); status = StatusCode.EOK; + } catch (BookieException.LedgerFencedAndDeletedException e) { + logger.error("Error saving lac {} for ledger:{}, which has been deleted", + lac, ledgerId, e); + status = StatusCode.ENOLEDGER; } catch (IOException e) { logger.error("Error saving lac {} for ledger:{}", lac, ledgerId, e); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java index 77382b4ebde..9f7a81450bb 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java @@ -24,6 +24,9 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import lombok.extern.slf4j.Slf4j; @@ -33,10 +36,16 @@ import org.apache.bookkeeper.bookie.SortedLedgerStorage; import org.apache.bookkeeper.bookie.storage.ldb.SingleDirectoryDbLedgerStorage; import org.apache.bookkeeper.client.BookKeeper.DigestType; +import org.apache.bookkeeper.client.api.WriteFlag; import org.apache.bookkeeper.conf.ClientConfiguration; import org.apache.bookkeeper.net.BookieId; +import org.apache.bookkeeper.proto.BookieClientImpl; +import org.apache.bookkeeper.proto.BookieProtocol; +import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks; +import org.apache.bookkeeper.proto.PerChannelBookieClient; import org.apache.bookkeeper.test.BookKeeperClusterTestCase; import org.apache.bookkeeper.test.TestStatsProvider; +import org.apache.bookkeeper.util.ByteBufList; import org.awaitility.reflect.WhiteboxImpl; import org.junit.Test; import org.slf4j.Logger; @@ -152,6 +161,110 @@ private void triggerGC(Bookie bookie) { } } + @Test(timeout = 3000 * 1000) + public void testConcurrentFenceAndDeleteLedger() throws Exception { + LedgerHandle writeLedger; + writeLedger = bkc.createLedger(digestType, "password".getBytes()); + + String tmp = "BookKeeper is cool!"; + long lac = 0; + for (int i = 0; i < 10; i++) { + long entryId = writeLedger.addEntry(tmp.getBytes()); + LOG.info("entryId: {}", entryId); + lac = entryId; + } + + // Fence and delete. + final BookieId bookieId = writeLedger.getLedgerMetadata().getEnsembleAt(0).get(0); + ClientConfiguration clientConfiguration2 = newClientConfiguration(); + clientConfiguration2.setUseV2WireProtocol(true); + ClientConfiguration clientConfiguration3 = newClientConfiguration(); + BookKeeperTestClient bkcV2 = new BookKeeperTestClient(clientConfiguration2, new TestStatsProvider()); + LedgerHandle writeLedgerV2 = bkcV2.createLedger(digestType, "password".getBytes()); + BookKeeperTestClient bkcV3 = new BookKeeperTestClient(clientConfiguration3, new TestStatsProvider()); + LedgerHandle writeLedgerV3 = bkcV3.createLedger(digestType, "password".getBytes()); + ReadOnlyLedgerHandle readLedgerV2 = + (ReadOnlyLedgerHandle) bkcV2.openLedger(writeLedger.getId(), digestType, "password".getBytes()); + ReadOnlyLedgerHandle readLedgerV3 = + (ReadOnlyLedgerHandle) bkcV3.openLedger(writeLedger.getId(), digestType, "password".getBytes()); + BookieClientImpl bookieClientV2 = (BookieClientImpl) readLedgerV2.clientCtx.getBookieClient(); + BookieClientImpl bookieClientV3 = (BookieClientImpl) readLedgerV3.clientCtx.getBookieClient(); + // Trigger opening connection. + CompletableFuture obtainV2 = new CompletableFuture<>(); + bookieClientV2.lookupClient(bookieId).obtain( + new BookkeeperInternalCallbacks.GenericCallback() { + @Override + public void operationComplete(int rc, PerChannelBookieClient result) { + obtainV2.complete(rc); + } + }, writeLedger.getId()); + assertEquals(obtainV2.get().intValue(), BKException.Code.OK); + CompletableFuture obtainV3 = new CompletableFuture<>(); + bookieClientV3.lookupClient(bookieId).obtain( + new BookkeeperInternalCallbacks.GenericCallback() { + @Override + public void operationComplete(int rc, PerChannelBookieClient result) { + obtainV3.complete(rc); + } + }, writeLedger.getId()); + assertEquals(obtainV3.get().intValue(), BKException.Code.OK); + bkcV3.deleteLedger(readLedgerV3.ledgerId); + + // Waiting for GC. + for (ServerTester server : servers) { + triggerGC(server.getServer().getBookie()); + } + + // Verify: read requests with V2 protocol will receive a NoSuchLedgerException. + final byte readEntryFlagFencing = 1; + CompletableFuture readResV2 = new CompletableFuture<>(); + bookieClientV2.readEntry(bookieId, + writeLedger.getId(), 0, (rc, ledgerId, entryId1, buffer, ctx) -> { + readResV2.complete(rc); + }, null, readEntryFlagFencing, readLedgerV2.ledgerKey); + assertEquals(BKException.Code.NoSuchLedgerExistsException, readResV2.get().intValue()); + // Verify: read requests with V3 protocol will receive a NoSuchLedgerException. + CompletableFuture readResV3 = new CompletableFuture<>(); + bookieClientV3.readEntry(bookieId, + writeLedger.getId(), 0, (rc, ledgerId, entryId1, buffer, ctx) -> { + readResV3.complete(rc); + }, null, readEntryFlagFencing, readLedgerV3.ledgerKey); + assertEquals(BKException.Code.NoSuchLedgerExistsException, readResV3.get().intValue()); + // Verify: add requests with V2 protocol will receive a NoSuchLedgerException. + log.info("Try to add the next entry: {}:{}", writeLedger.getId(), lac + 1); + final ByteBuf dataV2 = UnpooledByteBufAllocator.DEFAULT.heapBuffer(); + // Combine add request, and rewrite ledgerId of the request. + dataV2.writeByte(1); + final ByteBuf toSendV2 = (ByteBuf) writeLedgerV2.macManager.computeDigestAndPackageForSending( + lac + 1, lac, 1, dataV2, writeLedger.ledgerKey, BookieProtocol.FLAG_NONE); + toSendV2.setLong(28, writeLedger.getId()); + CompletableFuture addResV2 = new CompletableFuture<>(); + bookieClientV2.addEntry(bookieId, writeLedger.getId(), writeLedger.ledgerKey, lac + 1, toSendV2, + (rc, ledgerId, entryId1, addr, ctx) -> { + addResV2.complete(rc); + }, null, BookieProtocol.FLAG_NONE, false, WriteFlag.NONE); + assertEquals(BKException.Code.LedgerFencedException, addResV2.get().intValue()); + // Verify: read requests with V3 protocol will receive a NoSuchLedgerException. + final ByteBuf dataV3 = UnpooledByteBufAllocator.DEFAULT.heapBuffer(); + dataV3.writeByte(1); + // Combine add request, and rewrite ledgerId of the request. + final ByteBufList toSendV3 = (ByteBufList) writeLedgerV3.macManager.computeDigestAndPackageForSending( + lac + 1, lac, 1, dataV3, writeLedger.ledgerKey, BookieProtocol.FLAG_NONE); + toSendV3.getBuffer(0).setLong(0, writeLedger.getId()); + CompletableFuture addResV3 = new CompletableFuture<>(); + bookieClientV3.addEntry(bookieId, writeLedger.getId(), writeLedger.ledgerKey, lac + 1, toSendV3, + (rc, ledgerId, entryId1, addr, ctx) -> { + addResV3.complete(rc); + }, null, BookieProtocol.FLAG_NONE, false, WriteFlag.NONE); + assertEquals(BKException.Code.LedgerFencedException, addResV3.get().intValue()); + + // cleanup. + writeLedgerV2.close(); + writeLedgerV3.close(); + bkcV2.close(); + bkcV3.close(); + } + private static int threadCount = 0; class LedgerOpenThread extends Thread { From c39837965872572d45293578decc9081fafc04bb Mon Sep 17 00:00:00 2001 From: fengyubiao Date: Wed, 17 Sep 2025 12:29:19 +0800 Subject: [PATCH 228/233] [fix]BK stays at read_only state even if the disk is empty (#4640) * [fix]BK stay at read_only state even if the disk is empty * correct the javadoc * improve test (cherry picked from commit bde9ff2503ae71c4ef03b212577a1a8be673123a) --- .../bookkeeper/bookie/BookieStateManager.java | 21 ++- .../bookkeeper/bookie/BookieStatus.java | 19 ++- .../bookkeeper/bookie/LedgerDirsMonitor.java | 17 +- .../bookkeeper/bookie/StateManager.java | 12 +- .../service/BookieStateReadOnlyService.java | 4 +- .../bookie/BookieInitializationTest.java | 153 ++++++++++++++++-- .../bookkeeper/bookie/LedgerCacheTest.java | 2 +- .../replication/AuditorLedgerCheckerTest.java | 4 +- 8 files changed, 202 insertions(+), 30 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java index 620a1c2aaa4..c50d51a96aa 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java @@ -165,7 +165,7 @@ private boolean isRegistrationManagerDisabled() { @Override public void initState(){ if (forceReadOnly.get()) { - this.bookieStatus.setToReadOnlyMode(); + this.bookieStatus.setToReadOnlyMode(false); } else if (conf.isPersistBookieStatusEnabled()) { this.bookieStatus.readFromDirectories(statusDirs); } @@ -256,22 +256,22 @@ public Void call() throws IOException { } @Override - public Future transitionToWritableMode() { + public Future transitionToWritableMode(boolean isManuallyModify) { return stateService.submit(new Callable() { @Override public Void call() throws Exception{ - doTransitionToWritableMode(); + doTransitionToWritableMode(isManuallyModify); return null; } }); } @Override - public Future transitionToReadOnlyMode() { + public Future transitionToReadOnlyMode(boolean isManuallyModify) { return stateService.submit(new Callable() { @Override public Void call() throws Exception{ - doTransitionToReadOnlyMode(); + doTransitionToReadOnlyMode(isManuallyModify); return null; } }); @@ -298,10 +298,15 @@ private void doRegisterBookie(boolean isReadOnly) throws IOException { } @VisibleForTesting - public void doTransitionToWritableMode() { + public void doTransitionToWritableMode(boolean isManuallyModify) { if (shuttingdown || forceReadOnly.get()) { return; } + if (!isManuallyModify && bookieStatus.isInReadOnlyMode() && bookieStatus.isManuallyModifiedToReadOnly()) { + LOG.info("Skip to transition Bookie to Writable mode automatically because it is manually set to read-only" + + " mode, which can only be changed manually."); + return; + } if (!bookieStatus.setToWritableMode()) { // do nothing if already in writable mode @@ -334,11 +339,11 @@ public void doTransitionToWritableMode() { } @VisibleForTesting - public void doTransitionToReadOnlyMode() { + public void doTransitionToReadOnlyMode(boolean isManuallyModify) { if (shuttingdown) { return; } - if (!bookieStatus.setToReadOnlyMode()) { + if (!bookieStatus.setToReadOnlyMode(isManuallyModify)) { return; } if (!conf.isReadOnlyModeEnabled()) { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStatus.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStatus.java index 7b2d0aad990..ccbba36b532 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStatus.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStatus.java @@ -31,6 +31,7 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.util.List; +import lombok.Getter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,6 +54,8 @@ enum BookieMode { private int layoutVersion; private long lastUpdateTime; private volatile BookieMode bookieMode; + @Getter + private boolean isManuallyModifiedToReadOnly; BookieStatus() { this.bookieMode = BookieMode.READ_WRITE; @@ -72,6 +75,7 @@ synchronized boolean setToWritableMode() { if (!bookieMode.equals(BookieMode.READ_WRITE)) { bookieMode = BookieMode.READ_WRITE; this.lastUpdateTime = System.currentTimeMillis(); + this.isManuallyModifiedToReadOnly = false; return true; } return false; @@ -81,10 +85,11 @@ boolean isInReadOnlyMode() { return bookieMode.equals(BookieMode.READ_ONLY); } - synchronized boolean setToReadOnlyMode() { + synchronized boolean setToReadOnlyMode(boolean isManuallyModify) { if (!bookieMode.equals(BookieMode.READ_ONLY)) { bookieMode = BookieMode.READ_ONLY; this.lastUpdateTime = System.currentTimeMillis(); + this.isManuallyModifiedToReadOnly = isManuallyModify; return true; } return false; @@ -147,6 +152,7 @@ void readFromDirectories(List directories) { this.lastUpdateTime = status.lastUpdateTime; this.layoutVersion = status.layoutVersion; this.bookieMode = status.bookieMode; + this.isManuallyModifiedToReadOnly = status.isManuallyModifiedToReadOnly; success = true; } } @@ -216,6 +222,15 @@ public BookieStatus parse(BufferedReader reader) if (status.layoutVersion == 1 && parts.length == 3) { status.bookieMode = BookieMode.valueOf(parts[1]); status.lastUpdateTime = Long.parseLong(parts[2].trim()); + status.isManuallyModifiedToReadOnly = true; + return status; + } + // Since we should guarantee the compatibility of downgrade. We do not change the layoutVersion, otherwise, + // the string can not be parsed by the lower version. + if (status.layoutVersion == 1 && parts.length == 4) { + status.bookieMode = BookieMode.valueOf(parts[1]); + status.lastUpdateTime = Long.parseLong(parts[2].trim()); + status.isManuallyModifiedToReadOnly = Boolean.parseBoolean(parts[3].trim()); return status; } } @@ -231,6 +246,8 @@ public String toString() { builder.append(getBookieMode()); builder.append(","); builder.append(System.currentTimeMillis()); + builder.append(","); + builder.append(isManuallyModifiedToReadOnly); builder.append("\n"); return builder.toString(); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsMonitor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsMonitor.java index 7ad8ba1e0c5..73e2ba18712 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsMonitor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsMonitor.java @@ -21,6 +21,7 @@ package org.apache.bookkeeper.bookie; +import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.io.File; import java.io.IOException; @@ -54,6 +55,7 @@ class LedgerDirsMonitor { private final long minUsableSizeForHighPriorityWrites; private ScheduledExecutorService executor; private ScheduledFuture checkTask; + private boolean isFirstLoopOfCheckTask = true; public LedgerDirsMonitor(final ServerConfiguration conf, final DiskChecker diskChecker, @@ -67,6 +69,10 @@ public LedgerDirsMonitor(final ServerConfiguration conf, } private void check(final LedgerDirsManager ldm) { + final boolean isFirstLoopOfCheckTaskLocalValue = this.isFirstLoopOfCheckTask; + if (isFirstLoopOfCheckTaskLocalValue) { + this.isFirstLoopOfCheckTask = false; + } final ConcurrentMap diskUsages = ldm.getDiskUsages(); boolean someDiskFulled = false; boolean highPriorityWritesAllowed = true; @@ -175,6 +181,14 @@ private void check(final LedgerDirsManager ldm) { } } + if (isFirstLoopOfCheckTaskLocalValue && ldm.getFullFilledLedgerDirs().isEmpty()) { + // notify no disk full. + for (LedgerDirsListener listener : ldm.getListeners()) { + listener.allDisksWritable(); + } + return; + } + if (conf.isReadOnlyModeOnAnyDiskFullEnabled()) { if (someDiskFulled && !ldm.getFullFilledLedgerDirs().isEmpty()) { // notify any disk full. @@ -192,7 +206,8 @@ private void check(final LedgerDirsManager ldm) { } } - private void check() { + @VisibleForTesting + void check() { dirsManagers.forEach(this::check); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java index 7ed3f0b6572..9ef1f384e77 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/StateManager.java @@ -100,12 +100,20 @@ public interface StateManager extends AutoCloseable { /** * Change the state of bookie to Writable mode. */ - Future transitionToWritableMode(); + Future transitionToWritableMode(boolean isManuallyModify); + + default Future transitionToWritableMode() { + return transitionToWritableMode(false); + } /** * Change the state of bookie to ReadOnly mode. */ - Future transitionToReadOnlyMode(); + Future transitionToReadOnlyMode(boolean isManuallyModify); + + default Future transitionToReadOnlyMode() { + return transitionToReadOnlyMode(false); + } /** * ShutdownHandler used to shutdown bookie. diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java index d32074e2bb3..73f57c19598 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java @@ -58,14 +58,14 @@ public HttpServiceResponse handle(HttpServiceRequest request) throws Exception { response.setBody("Bookie is in forceReadOnly mode, cannot transit to writable mode"); return response; } - stateManager.transitionToWritableMode().get(); + stateManager.transitionToWritableMode(true).get(); } else if (!stateManager.isReadOnly() && inState.isReadOnly()) { if (!stateManager.isReadOnlyModeEnabled()) { response.setCode(HttpServer.StatusCode.BAD_REQUEST); response.setBody("Bookie is disabled ReadOnly mode, cannot transit to readOnly mode"); return response; } - stateManager.transitionToReadOnlyMode().get(); + stateManager.transitionToReadOnlyMode(true).get(); } } else if (!HttpServer.Method.GET.equals(request.getMethod())) { response.setCode(HttpServer.StatusCode.NOT_FOUND); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java index 5188eb816bb..bd0a12ca6cb 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java @@ -77,6 +77,7 @@ import org.apache.bookkeeper.common.component.ComponentStarter; import org.apache.bookkeeper.common.component.Lifecycle; import org.apache.bookkeeper.common.component.LifecycleComponent; +import org.apache.bookkeeper.common.util.JsonUtil; import org.apache.bookkeeper.conf.ClientConfiguration; import org.apache.bookkeeper.conf.ServerConfiguration; import org.apache.bookkeeper.conf.TestBKConfiguration; @@ -84,7 +85,10 @@ import org.apache.bookkeeper.discover.BookieServiceInfo.Endpoint; import org.apache.bookkeeper.discover.RegistrationManager; import org.apache.bookkeeper.http.HttpRouter; +import org.apache.bookkeeper.http.HttpServer; import org.apache.bookkeeper.http.HttpServerLoader; +import org.apache.bookkeeper.http.service.HttpServiceRequest; +import org.apache.bookkeeper.http.service.HttpServiceResponse; import org.apache.bookkeeper.meta.MetadataBookieDriver; import org.apache.bookkeeper.meta.exceptions.MetadataException; import org.apache.bookkeeper.meta.zk.ZKMetadataBookieDriver; @@ -96,6 +100,7 @@ import org.apache.bookkeeper.replication.ReplicationStats; import org.apache.bookkeeper.server.Main; import org.apache.bookkeeper.server.conf.BookieConfiguration; +import org.apache.bookkeeper.server.http.service.BookieStateReadOnlyService; import org.apache.bookkeeper.server.service.AutoRecoveryService; import org.apache.bookkeeper.server.service.BookieService; import org.apache.bookkeeper.stats.NullStatsLogger; @@ -107,8 +112,10 @@ import org.apache.bookkeeper.versioning.Version; import org.apache.bookkeeper.versioning.Versioned; import org.apache.bookkeeper.zookeeper.ZooKeeperClient; +import org.apache.commons.io.FileUtils; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.data.Stat; +import org.awaitility.Awaitility; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; @@ -1445,30 +1452,150 @@ public void testRetrieveBookieStatusWhenStatusFileIsCorrupted() throws Exception .setPersistBookieStatusEnabled(true) .setMetadataServiceUri(metadataServiceUri); // start a new bookie - BookieServer bookieServer = new BookieServer( + BookieServer bookieServer1 = new BookieServer( conf, new TestBookieImpl(conf), NullStatsLogger.INSTANCE, UnpooledByteBufAllocator.DEFAULT, new MockUncleanShutdownDetection()); - bookieServer.start(); + bookieServer1.start(); // transition in to read only and persist the status on disk - Bookie bookie = (BookieImpl) bookieServer.getBookie(); - assertFalse(bookie.isReadOnly()); - bookie.getStateManager().transitionToReadOnlyMode().get(); - assertTrue(bookie.isReadOnly()); + Bookie bookie1 = (BookieImpl) bookieServer1.getBookie(); + assertFalse(bookie1.isReadOnly()); + bookie1.getStateManager().transitionToReadOnlyMode().get(); + assertTrue(bookie1.isReadOnly()); // corrupt status file - List ledgerDirs = ((BookieImpl) bookie).getLedgerDirsManager().getAllLedgerDirs(); + List ledgerDirs = ((BookieImpl) bookie1).getLedgerDirsManager().getAllLedgerDirs(); corruptFile(new File(ledgerDirs.get(0), BOOKIE_STATUS_FILENAME)); corruptFile(new File(ledgerDirs.get(1), BOOKIE_STATUS_FILENAME)); // restart the bookie should be in read only mode - bookieServer.shutdown(); - bookieServer = new BookieServer( + bookieServer1.shutdown(); + BookieServer bookieServer2 = new BookieServer( conf, new TestBookieImpl(conf), NullStatsLogger.INSTANCE, UnpooledByteBufAllocator.DEFAULT, new MockUncleanShutdownDetection()); - bookieServer.start(); - bookie = bookieServer.getBookie(); - assertTrue(bookie.isReadOnly()); - bookieServer.shutdown(); + bookieServer2.start(); + BookieImpl bookie2 = (BookieImpl) bookieServer2.getBookie(); + assertTrue(bookie2.isReadOnly()); + // After a disk check, the bookie should switch to writable mode because the disk usage is fine. + bookie2.dirsMonitor.check(); + Awaitility.await().untilAsserted(() -> { + assertFalse(bookie2.isReadOnly()); + }); + bookieServer2.shutdown(); + } + + + private void setBookieToReadOnly(Bookie bookie, boolean readOnly) throws Exception { + BookieStateReadOnlyService.ReadOnlyState state = new BookieStateReadOnlyService.ReadOnlyState(); + state.setReadOnly(readOnly); + HttpServiceRequest request = new HttpServiceRequest(JsonUtil.toJson(state), HttpServer.Method.PUT, null); + BookieStateReadOnlyService service = new BookieStateReadOnlyService(bookie); + HttpServiceResponse response1 = service.handle(request); + assertEquals(HttpServer.StatusCode.OK.getValue(), response1.getStatusCode()); + } + + /** + * Verify: once the state is manually modified to read-only by Admin API, it should not be changed to writable + * by the monitor task. + * But it can be changed to read-only by monitor task if it was manually set to writable by Admin API. + */ + @Test(timeout = 1000 * 30) + public void testRetrieveBookieStatusAdminModifiedWhenStatusFileIsCorrupted() throws Exception { + File[] tmpLedgerDirs = new File[3]; + String[] filePath = new String[tmpLedgerDirs.length]; + for (int i = 0; i < tmpLedgerDirs.length; i++) { + tmpLedgerDirs[i] = tmpDirs.createNew("bookie", "test" + i); + filePath[i] = tmpLedgerDirs[i].getPath(); + } + final ServerConfiguration conf = TestBKConfiguration.newServerConfiguration(); + conf.setJournalDirName(filePath[0]) + .setLedgerDirNames(filePath) + .setReadOnlyModeEnabled(true) + .setPersistBookieStatusEnabled(true) + .setMetadataServiceUri(metadataServiceUri); + // start a new bookie + BookieServer bookieServer1 = new BookieServer( + conf, new TestBookieImpl(conf), + NullStatsLogger.INSTANCE, UnpooledByteBufAllocator.DEFAULT, + new MockUncleanShutdownDetection()); + bookieServer1.start(); + // transition in to read only and persist the status on disk + Bookie bookie1 = (BookieImpl) bookieServer1.getBookie(); + assertFalse(bookie1.isReadOnly()); + setBookieToReadOnly(bookie1, true); + assertTrue(bookie1.isReadOnly()); + // corrupt status file + List ledgerDirs = ((BookieImpl) bookie1).getLedgerDirsManager().getAllLedgerDirs(); + corruptFile(new File(ledgerDirs.get(0), BOOKIE_STATUS_FILENAME)); + corruptFile(new File(ledgerDirs.get(1), BOOKIE_STATUS_FILENAME)); + // restart the bookie should be in read only mode + bookieServer1.shutdown(); + BookieServer bookieServer2 = new BookieServer( + conf, new TestBookieImpl(conf), + NullStatsLogger.INSTANCE, UnpooledByteBufAllocator.DEFAULT, + new MockUncleanShutdownDetection()); + bookieServer2.start(); + BookieImpl bookie2 = (BookieImpl) bookieServer2.getBookie(); + assertTrue(bookie2.isReadOnly()); + // After a disk check, the bookie should not switch to writable mode because the state was set to read-only + // by admin api manually. + bookie2.dirsMonitor.check(); + Thread.sleep(2000); + Awaitility.await().untilAsserted(() -> { + assertTrue(bookie2.isReadOnly()); + }); + // We can use Admin Api to change the state back to writable. + setBookieToReadOnly(bookie2, false); + assertFalse(bookie2.isReadOnly()); + // The state can be changed to read-only by monitor task if it was manually set to writable by Admin API. + bookie2.getStateManager().transitionToReadOnlyMode().get(); + assertTrue(bookie2.isReadOnly()); + bookieServer2.shutdown(); + } + + /** + * Verify: the newest version can read the old version payload of persisted bookie status. + * old payload: "1,READ_ONLY,1752809349613" + * new payload: "1,READ_ONLY,1752809349613,false" + */ + @Test(timeout = 30000) + public void testPersistBookieStatusCompatibility() throws Exception { + File[] tmpLedgerDirs = new File[1]; + String[] filePath = new String[1]; + tmpLedgerDirs[0] = tmpDirs.createNew("bookie", "test"); + filePath[0] = tmpLedgerDirs[0].getPath(); + final ServerConfiguration conf = TestBKConfiguration.newServerConfiguration(); + conf.setJournalDirName(filePath[0]) + .setLedgerDirNames(filePath) + .setReadOnlyModeEnabled(true) + .setPersistBookieStatusEnabled(true) + .setMetadataServiceUri(metadataServiceUri); + // start a new bookie + BookieServer bookieServer1 = new BookieServer( + conf, new TestBookieImpl(conf), + NullStatsLogger.INSTANCE, UnpooledByteBufAllocator.DEFAULT, + new MockUncleanShutdownDetection()); + bookieServer1.start(); + Bookie bookie1 = (BookieImpl) bookieServer1.getBookie(); + // restart the bookie should be in read only mode + bookieServer1.shutdown(); + // Rewrite file to the old version payload. + List ledgerDirs = ((BookieImpl) bookie1).getLedgerDirsManager().getAllLedgerDirs(); + FileUtils.writeStringToFile(new File(ledgerDirs.get(0), BOOKIE_STATUS_FILENAME), + "1,READ_ONLY,1752809349613"); + BookieServer bookieServer2 = new BookieServer( + conf, new TestBookieImpl(conf), + NullStatsLogger.INSTANCE, UnpooledByteBufAllocator.DEFAULT, + new MockUncleanShutdownDetection()); + bookieServer2.start(); + BookieImpl bookie2 = (BookieImpl) bookieServer2.getBookie(); + assertTrue(bookie2.isReadOnly()); + // After a disk check, the bookie should not switch to writable mode because the state was set to read-only + // by admin api manually(the default value of previous version is true). + bookie2.dirsMonitor.check(); + Awaitility.await().untilAsserted(() -> { + assertTrue(bookie2.isReadOnly()); + }); + bookieServer2.shutdown(); } /** diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java index 4e8f06fe7f4..9e2090d7975 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java @@ -711,7 +711,7 @@ public void onSizeLimitReached(final CheckpointSource.Checkpoint cp) throws IOEx LOG.info("Started flushing mem table."); memTable.flush(FlushTestSortedLedgerStorage.this); } catch (IOException e) { - getStateManager().doTransitionToReadOnlyMode(); + getStateManager().doTransitionToReadOnlyMode(false); LOG.error("Exception thrown while flushing skip list cache.", e); } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java index 2e3e09012fb..bbeb7e758fd 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java @@ -326,7 +326,7 @@ public void testReadOnlyBookieExclusionFromURLedgersCheck() throws Exception { BookieServer bk = serverByIndex(bkIndex); bookieConf.setReadOnlyModeEnabled(true); - ((BookieImpl) bk.getBookie()).getStateManager().doTransitionToReadOnlyMode(); + ((BookieImpl) bk.getBookie()).getStateManager().doTransitionToReadOnlyMode(false); bkc.waitForReadOnlyBookie(BookieImpl.getBookieId(confByIndex(bkIndex))) .get(30, TimeUnit.SECONDS); @@ -361,7 +361,7 @@ public void testReadOnlyBookieShutdown() throws Exception { BookieServer bk = serverByIndex(bkIndex); bookieConf.setReadOnlyModeEnabled(true); - ((BookieImpl) bk.getBookie()).getStateManager().doTransitionToReadOnlyMode(); + ((BookieImpl) bk.getBookie()).getStateManager().doTransitionToReadOnlyMode(false); bkc.waitForReadOnlyBookie(BookieImpl.getBookieId(confByIndex(bkIndex))) .get(30, TimeUnit.SECONDS); From dd0ed9d65bdb88b39bcee5030e7fa024c939f48a Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Mon, 24 Nov 2025 11:32:24 +0800 Subject: [PATCH 229/233] Bring back the old public method name (#4682) (cherry picked from commit 1a509e4f736a75bc4570748324afba94ba51e471) --- .../org/apache/bookkeeper/bookie/BookieStateManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java index c50d51a96aa..070897b9473 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java @@ -297,6 +297,10 @@ private void doRegisterBookie(boolean isReadOnly) throws IOException { } } + public void doTransitionToWritableMode() { + doTransitionToWritableMode(false); + } + @VisibleForTesting public void doTransitionToWritableMode(boolean isManuallyModify) { if (shuttingdown || forceReadOnly.get()) { @@ -338,6 +342,10 @@ public void doTransitionToWritableMode(boolean isManuallyModify) { } } + public void doTransitionToReadOnlyMode() { + doTransitionToReadOnlyMode(false); + } + @VisibleForTesting public void doTransitionToReadOnlyMode(boolean isManuallyModify) { if (shuttingdown) { From 979958da59157b7049a44e35bae3ef72e8b15cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=85=88=E5=86=9B75560?= <75560@sangfor.com> Date: Thu, 30 Jul 2026 17:54:06 +0800 Subject: [PATCH 230/233] Add BufferedChannel partial flush corruption reproducer --- .../bookie/BufferedChannelTest.java | 197 ++++++++++++++++++ 1 file changed, 197 insertions(+) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BufferedChannelTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BufferedChannelTest.java index cd3e34d35e3..7d8af79be2b 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BufferedChannelTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BufferedChannelTest.java @@ -25,8 +25,14 @@ import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledByteBufAllocator; import java.io.File; +import java.io.IOException; import java.io.RandomAccessFile; +import java.nio.ByteBuffer; +import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; +import java.nio.channels.FileLock; +import java.nio.channels.ReadableByteChannel; +import java.nio.channels.WritableByteChannel; import java.util.Random; import org.junit.Assert; import org.junit.Test; @@ -70,6 +76,87 @@ public void testBufferedChannelFlushForceWrite() throws Exception { testBufferedChannel(5000, 30, 0, true, true); } + @Test + public void testPositionCanLagFileChannelAfterPartialFlushFailure() throws Exception { + File newLogFile = File.createTempFile("test", "log"); + newLogFile.deleteOnExit(); + FileChannel delegate = new RandomAccessFile(newLogFile, "rw").getChannel(); + PartialFailingFileChannel fileChannel = new PartialFailingFileChannel(delegate, 8); + + BufferedChannel logChannel = new BufferedChannel(UnpooledByteBufAllocator.DEFAULT, fileChannel, + 16, INTERNAL_BUFFER_READ_CAPACITY, 0); + + try { + logChannel.write(Unpooled.wrappedBuffer(new byte[16])); + Assert.fail("Expected the internal flush to fail"); + } catch (IOException expected) { + // Expected. + } + + Assert.assertEquals(0, logChannel.position()); + Assert.assertEquals(8, fileChannel.position()); + + logChannel.write(Unpooled.wrappedBuffer(new byte[1])); + + Assert.assertEquals(1, logChannel.position()); + Assert.assertEquals(24, fileChannel.position()); + Assert.assertEquals(23, fileChannel.position() - logChannel.position()); + + logChannel.close(); + } + + @Test + public void testLedgersMapHeaderUsesStalePositionAfterPartialFlushFailure() throws Exception { + File newLogFile = File.createTempFile("test", "log"); + newLogFile.deleteOnExit(); + FileChannel delegate = new RandomAccessFile(newLogFile, "rw").getChannel(); + delegate.position(DefaultEntryLogger.LOGFILE_HEADER_SIZE); + PartialFailingFileChannel fileChannel = new PartialFailingFileChannel(delegate, 8); + + DefaultEntryLogger.BufferedLogChannel logChannel = new DefaultEntryLogger.BufferedLogChannel( + UnpooledByteBufAllocator.DEFAULT, fileChannel, 16, INTERNAL_BUFFER_READ_CAPACITY, 1L, newLogFile, 0); + + try { + logChannel.write(Unpooled.wrappedBuffer(new byte[16])); + Assert.fail("Expected the internal flush to fail"); + } catch (IOException expected) { + // Expected. + } + + logChannel.write(Unpooled.wrappedBuffer(new byte[] { 1 })); + logChannel.flush(); + + long staleMapOffset = logChannel.position(); + long actualMapOffset = fileChannel.position(); + Assert.assertTrue(actualMapOffset > staleMapOffset); + + logChannel.registerWrittenEntry(1234L, 99L); + logChannel.appendLedgersMap(); + + ByteBuffer mapInfo = ByteBuffer.allocate(Long.BYTES + Integer.BYTES); + Assert.assertEquals(mapInfo.capacity(), + fileChannel.read(mapInfo, DefaultEntryLogger.LEDGERS_MAP_OFFSET_POSITION)); + mapInfo.flip(); + Assert.assertEquals(staleMapOffset, mapInfo.getLong()); + Assert.assertEquals(1, mapInfo.getInt()); + + ByteBuffer actualMap = ByteBuffer.allocate(DefaultEntryLogger.LEDGERS_MAP_HEADER_SIZE); + Assert.assertEquals(actualMap.capacity(), fileChannel.read(actualMap, actualMapOffset)); + actualMap.flip(); + Assert.assertEquals(DefaultEntryLogger.LEDGERS_MAP_HEADER_SIZE + DefaultEntryLogger.LEDGERS_MAP_ENTRY_SIZE + - Integer.BYTES, actualMap.getInt()); + Assert.assertEquals(DefaultEntryLogger.INVALID_LID, actualMap.getLong()); + Assert.assertEquals(DefaultEntryLogger.LEDGERS_MAP_ENTRY_ID, actualMap.getLong()); + Assert.assertEquals(1, actualMap.getInt()); + + ByteBuffer staleBytes = ByteBuffer.allocate(DefaultEntryLogger.LEDGERS_MAP_HEADER_SIZE); + Assert.assertEquals(staleBytes.capacity(), fileChannel.read(staleBytes, staleMapOffset)); + staleBytes.flip(); + Assert.assertNotEquals(DefaultEntryLogger.INVALID_LID, staleBytes.getLong(Integer.BYTES)); + + logChannel.close(); + } + public void testBufferedChannel(int byteBufLength, int numOfWrites, int unpersistedBytesBound, boolean flush, boolean shouldForceWrite) throws Exception { File newLogFile = File.createTempFile("test", "log"); @@ -133,4 +220,114 @@ private static ByteBuf generateEntry(int length) { bb.writeBytes(data); return bb; } + + private static final class PartialFailingFileChannel extends FileChannel { + private final FileChannel delegate; + private final int bytesBeforeFailure; + private boolean partialWriteDone; + private boolean failureInjected; + + private PartialFailingFileChannel(FileChannel delegate, int bytesBeforeFailure) { + this.delegate = delegate; + this.bytesBeforeFailure = bytesBeforeFailure; + } + + @Override + public int write(ByteBuffer src) throws IOException { + if (!partialWriteDone) { + int oldLimit = src.limit(); + src.limit(src.position() + bytesBeforeFailure); + int written = delegate.write(src); + src.limit(oldLimit); + partialWriteDone = true; + return written; + } else if (!failureInjected) { + failureInjected = true; + throw new IOException("simulated write failure after partial write"); + } + return delegate.write(src); + } + + @Override + public long position() throws IOException { + return delegate.position(); + } + + @Override + public FileChannel position(long newPosition) throws IOException { + delegate.position(newPosition); + return this; + } + + @Override + public int read(ByteBuffer dst) throws IOException { + return delegate.read(dst); + } + + @Override + public long read(ByteBuffer[] dsts, int offset, int length) throws IOException { + return delegate.read(dsts, offset, length); + } + + @Override + public long write(ByteBuffer[] srcs, int offset, int length) throws IOException { + return delegate.write(srcs, offset, length); + } + + @Override + public long size() throws IOException { + return delegate.size(); + } + + @Override + public FileChannel truncate(long size) throws IOException { + delegate.truncate(size); + return this; + } + + @Override + public void force(boolean metaData) throws IOException { + delegate.force(metaData); + } + + @Override + public long transferTo(long position, long count, WritableByteChannel target) throws IOException { + return delegate.transferTo(position, count, target); + } + + @Override + public long transferFrom(ReadableByteChannel src, long position, long count) throws IOException { + return delegate.transferFrom(src, position, count); + } + + @Override + public int read(ByteBuffer dst, long position) throws IOException { + return delegate.read(dst, position); + } + + @Override + public int write(ByteBuffer src, long position) throws IOException { + return delegate.write(src, position); + } + + @Override + public MappedByteBuffer map(MapMode mode, long position, long size) throws IOException { + return delegate.map(mode, position, size); + } + + @Override + public FileLock lock(long position, long size, boolean shared) throws IOException { + return delegate.lock(position, size, shared); + } + + @Override + public FileLock tryLock(long position, long size, boolean shared) throws IOException { + return delegate.tryLock(position, size, shared); + } + + @Override + protected void implCloseChannel() throws IOException { + delegate.close(); + } + } } From 200818fe18cf496d17b4083a5b4606fdc4c02c2f Mon Sep 17 00:00:00 2001 From: root Date: Tue, 4 Aug 2026 10:29:02 +0800 Subject: [PATCH 231/233] fix: fail closed after buffered entrylog write failure --- .../bookkeeper/bookie/BufferedChannel.java | 77 +++++-- .../bookkeeper/bookie/DefaultEntryLogger.java | 19 +- .../bookie/BufferedChannelTest.java | 212 +++++++++++++++--- 3 files changed, 262 insertions(+), 46 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java index 3197165827a..2114293c3a2 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java @@ -71,6 +71,7 @@ public class BufferedChannel extends BufferedReadChannel implements Closeable { protected final AtomicLong unpersistedBytes; private boolean closed = false; + private volatile IOException writeFailure; // make constructor to be public for unit test public BufferedChannel(ByteBufAllocator allocator, FileChannel fc, int capacity) throws IOException { @@ -118,25 +119,31 @@ public void write(ByteBuf src) throws IOException { int copied = 0; boolean shouldForceWrite = false; synchronized (this) { + checkWritable(); int len = src.readableBytes(); - while (copied < len) { - int bytesToCopy = Math.min(src.readableBytes() - copied, writeBuffer.writableBytes()); - writeBuffer.writeBytes(src, src.readerIndex() + copied, bytesToCopy); - copied += bytesToCopy; + try { + while (copied < len) { + int bytesToCopy = Math.min(src.readableBytes() - copied, writeBuffer.writableBytes()); + writeBuffer.writeBytes(src, src.readerIndex() + copied, bytesToCopy); + copied += bytesToCopy; - // if we have run out of buffer space, we should flush to the - // file - if (!writeBuffer.isWritable()) { - flush(); + // if we have run out of buffer space, we should flush to the + // file + if (!writeBuffer.isWritable()) { + flush(); + } } - } - position += copied; - if (doRegularFlushes) { - unpersistedBytes.addAndGet(copied); - if (unpersistedBytes.get() >= unpersistedBytesBound) { - flush(); - shouldForceWrite = true; + position += copied; + if (doRegularFlushes) { + unpersistedBytes.addAndGet(copied); + if (unpersistedBytes.get() >= unpersistedBytesBound) { + flush(); + shouldForceWrite = true; + } } + } catch (IOException e) { + markWriteFailure(e); + throw e; } } if (shouldForceWrite) { @@ -170,6 +177,7 @@ public long getFileChannelPosition() { * @throws IOException */ public void flushAndForceWrite(boolean forceMetadata) throws IOException { + checkWritable(); flush(); forceWrite(forceMetadata); } @@ -184,6 +192,7 @@ public void flushAndForceWrite(boolean forceMetadata) throws IOException { * @throws IOException */ public void flushAndForceWriteIfRegularFlush(boolean forceMetadata) throws IOException { + checkWritable(); if (doRegularFlushes) { flushAndForceWrite(forceMetadata); } @@ -196,10 +205,19 @@ public void flushAndForceWriteIfRegularFlush(boolean forceMetadata) throws IOExc * @throws IOException if the write fails. */ public synchronized void flush() throws IOException { + checkWritable(); ByteBuffer toWrite = writeBuffer.internalNioBuffer(0, writeBuffer.writerIndex()); - do { - fileChannel.write(toWrite); - } while (toWrite.hasRemaining()); + try { + while (toWrite.hasRemaining()) { + int written = fileChannel.write(toWrite); + if (written <= 0) { + throw new IOException("Unable to make progress while flushing buffered channel"); + } + } + } catch (IOException e) { + markWriteFailure(e); + throw e; + } writeBuffer.clear(); writeBufferStartPosition.set(fileChannel.position()); } @@ -211,6 +229,7 @@ public synchronized void flush() throws IOException { * @throws IOException */ public long forceWrite(boolean forceMetadata) throws IOException { + checkWritable(); // This is the point up to which we had flushed to the file system page cache // before issuing this force write hence is guaranteed to be made durable by // the force write, any flush that happens after this may or may @@ -237,7 +256,12 @@ public long forceWrite(boolean forceMetadata) throws IOException { } } - fileChannel.force(forceMetadata); + try { + fileChannel.force(forceMetadata); + } catch (IOException e) { + markWriteFailure(e); + throw e; + } return positionForceWrite; } @@ -295,4 +319,17 @@ public synchronized int getNumOfBytesInWriteBuffer() { long getUnpersistedBytes() { return unpersistedBytes.get(); } -} \ No newline at end of file + + final void checkWritable() throws IOException { + IOException failure = writeFailure; + if (failure != null) { + throw new IOException("BufferedChannel is in failed state", failure); + } + } + + final void markWriteFailure(IOException e) { + if (writeFailure == null) { + writeFailure = e; + } + } +} diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java index a8065411eed..831f24a344f 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java @@ -137,6 +137,7 @@ public String toString() { * Updates the entry log file header with the offset and size of the map. */ void appendLedgersMap() throws IOException { + checkWritable(); long ledgerMapOffset = this.position(); @@ -205,7 +206,23 @@ public void accept(long ledgerId, long size) { mapInfo.putLong(ledgerMapOffset); mapInfo.putInt(numberOfLedgers); mapInfo.flip(); - this.fileChannel.write(mapInfo, LEDGERS_MAP_OFFSET_POSITION); + try { + writeFully(this.fileChannel, mapInfo, LEDGERS_MAP_OFFSET_POSITION); + } catch (IOException e) { + markWriteFailure(e); + throw e; + } + } + + private static void writeFully(FileChannel fileChannel, ByteBuffer buffer, long position) throws IOException { + long writePosition = position; + while (buffer.hasRemaining()) { + int written = fileChannel.write(buffer, writePosition); + if (written <= 0) { + throw new IOException("Unable to make progress while updating entry log header"); + } + writePosition += written; + } } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BufferedChannelTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BufferedChannelTest.java index 7d8af79be2b..daf2e904876 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BufferedChannelTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BufferedChannelTest.java @@ -77,7 +77,7 @@ public void testBufferedChannelFlushForceWrite() throws Exception { } @Test - public void testPositionCanLagFileChannelAfterPartialFlushFailure() throws Exception { + public void testPartialFlushFailurePoisonsBufferedChannel() throws Exception { File newLogFile = File.createTempFile("test", "log"); newLogFile.deleteOnExit(); FileChannel delegate = new RandomAccessFile(newLogFile, "rw").getChannel(); @@ -96,17 +96,33 @@ public void testPositionCanLagFileChannelAfterPartialFlushFailure() throws Excep Assert.assertEquals(0, logChannel.position()); Assert.assertEquals(8, fileChannel.position()); - logChannel.write(Unpooled.wrappedBuffer(new byte[1])); + try { + logChannel.write(Unpooled.wrappedBuffer(new byte[1])); + Assert.fail("Expected writes after a partial flush failure to fail"); + } catch (IOException expected) { + // Expected. + } + try { + logChannel.flush(); + Assert.fail("Expected flush after a partial flush failure to fail"); + } catch (IOException expected) { + // Expected. + } + try { + logChannel.forceWrite(false); + Assert.fail("Expected forceWrite after a partial flush failure to fail"); + } catch (IOException expected) { + // Expected. + } - Assert.assertEquals(1, logChannel.position()); - Assert.assertEquals(24, fileChannel.position()); - Assert.assertEquals(23, fileChannel.position() - logChannel.position()); + Assert.assertEquals(0, logChannel.position()); + Assert.assertEquals(8, fileChannel.position()); logChannel.close(); } @Test - public void testLedgersMapHeaderUsesStalePositionAfterPartialFlushFailure() throws Exception { + public void testPartialFlushFailurePreventsLedgersMapHeaderUpdate() throws Exception { File newLogFile = File.createTempFile("test", "log"); newLogFile.deleteOnExit(); FileChannel delegate = new RandomAccessFile(newLogFile, "rw").getChannel(); @@ -123,36 +139,124 @@ public void testLedgersMapHeaderUsesStalePositionAfterPartialFlushFailure() thro // Expected. } + logChannel.registerWrittenEntry(1234L, 99L); + try { + logChannel.appendLedgersMap(); + Assert.fail("Expected appendLedgersMap after a partial flush failure to fail"); + } catch (IOException expected) { + // Expected. + } + + ByteBuffer mapInfo = ByteBuffer.allocate(Long.BYTES + Integer.BYTES); + Assert.assertEquals(mapInfo.capacity(), + fileChannel.read(mapInfo, DefaultEntryLogger.LEDGERS_MAP_OFFSET_POSITION)); + mapInfo.flip(); + Assert.assertEquals(0L, mapInfo.getLong()); + Assert.assertEquals(0, mapInfo.getInt()); + + logChannel.close(); + } + + @Test + public void testForceWriteFailurePoisonsBufferedChannel() throws Exception { + File newLogFile = File.createTempFile("test", "log"); + newLogFile.deleteOnExit(); + FileChannel delegate = new RandomAccessFile(newLogFile, "rw").getChannel(); + PartialFailingFileChannel fileChannel = PartialFailingFileChannel.failingForce(delegate); + + BufferedChannel logChannel = new BufferedChannel(UnpooledByteBufAllocator.DEFAULT, fileChannel, + 16, INTERNAL_BUFFER_READ_CAPACITY, 0); + logChannel.write(Unpooled.wrappedBuffer(new byte[] { 1 })); logChannel.flush(); - long staleMapOffset = logChannel.position(); - long actualMapOffset = fileChannel.position(); - Assert.assertTrue(actualMapOffset > staleMapOffset); + try { + logChannel.forceWrite(false); + Assert.fail("Expected forceWrite failure"); + } catch (IOException expected) { + // Expected. + } + try { + logChannel.write(Unpooled.wrappedBuffer(new byte[] { 2 })); + Assert.fail("Expected writes after forceWrite failure to fail"); + } catch (IOException expected) { + // Expected. + } - logChannel.registerWrittenEntry(1234L, 99L); + Assert.assertEquals(1, logChannel.position()); + + logChannel.close(); + } + + @Test + public void testLedgersMapHeaderPositionedWriteIsFullyWritten() throws Exception { + File newLogFile = File.createTempFile("test", "log"); + newLogFile.deleteOnExit(); + FileChannel delegate = new RandomAccessFile(newLogFile, "rw").getChannel(); + writeEntryLogHeader(delegate); + PartialFailingFileChannel fileChannel = PartialFailingFileChannel.shortPositionedWrite( + delegate, DefaultEntryLogger.LEDGERS_MAP_OFFSET_POSITION, Long.BYTES); + + DefaultEntryLogger.BufferedLogChannel logChannel = new DefaultEntryLogger.BufferedLogChannel( + UnpooledByteBufAllocator.DEFAULT, fileChannel, 64, INTERNAL_BUFFER_READ_CAPACITY, 1L, newLogFile, 0); + + logChannel.write(Unpooled.wrappedBuffer(new byte[] { 1 })); + logChannel.flush(); + + long actualMapOffset = logChannel.position(); + logChannel.registerWrittenEntry(1234L, 1L); logChannel.appendLedgersMap(); ByteBuffer mapInfo = ByteBuffer.allocate(Long.BYTES + Integer.BYTES); Assert.assertEquals(mapInfo.capacity(), fileChannel.read(mapInfo, DefaultEntryLogger.LEDGERS_MAP_OFFSET_POSITION)); mapInfo.flip(); - Assert.assertEquals(staleMapOffset, mapInfo.getLong()); + Assert.assertEquals(actualMapOffset, mapInfo.getLong()); Assert.assertEquals(1, mapInfo.getInt()); + Assert.assertTrue(fileChannel.shortPositionedWriteDone); - ByteBuffer actualMap = ByteBuffer.allocate(DefaultEntryLogger.LEDGERS_MAP_HEADER_SIZE); - Assert.assertEquals(actualMap.capacity(), fileChannel.read(actualMap, actualMapOffset)); - actualMap.flip(); - Assert.assertEquals(DefaultEntryLogger.LEDGERS_MAP_HEADER_SIZE + DefaultEntryLogger.LEDGERS_MAP_ENTRY_SIZE - - Integer.BYTES, actualMap.getInt()); - Assert.assertEquals(DefaultEntryLogger.INVALID_LID, actualMap.getLong()); - Assert.assertEquals(DefaultEntryLogger.LEDGERS_MAP_ENTRY_ID, actualMap.getLong()); - Assert.assertEquals(1, actualMap.getInt()); + logChannel.close(); + } - ByteBuffer staleBytes = ByteBuffer.allocate(DefaultEntryLogger.LEDGERS_MAP_HEADER_SIZE); - Assert.assertEquals(staleBytes.capacity(), fileChannel.read(staleBytes, staleMapOffset)); - staleBytes.flip(); - Assert.assertNotEquals(DefaultEntryLogger.INVALID_LID, staleBytes.getLong(Integer.BYTES)); + @Test + public void testLedgersMapHeaderWriteFailurePoisonsBufferedChannel() throws Exception { + File newLogFile = File.createTempFile("test", "log"); + newLogFile.deleteOnExit(); + FileChannel delegate = new RandomAccessFile(newLogFile, "rw").getChannel(); + writeEntryLogHeader(delegate); + PartialFailingFileChannel fileChannel = PartialFailingFileChannel.failingPositionedWrite( + delegate, DefaultEntryLogger.LEDGERS_MAP_OFFSET_POSITION); + + DefaultEntryLogger.BufferedLogChannel logChannel = new DefaultEntryLogger.BufferedLogChannel( + UnpooledByteBufAllocator.DEFAULT, fileChannel, 64, INTERNAL_BUFFER_READ_CAPACITY, 1L, newLogFile, 0); + + logChannel.write(Unpooled.wrappedBuffer(new byte[] { 1 })); + logChannel.flush(); + long mapOffset = logChannel.position(); + logChannel.registerWrittenEntry(1234L, 1L); + + try { + logChannel.appendLedgersMap(); + Assert.fail("Expected header write failure"); + } catch (IOException expected) { + // Expected. + } + try { + logChannel.write(Unpooled.wrappedBuffer(new byte[] { 2 })); + Assert.fail("Expected writes after header write failure to fail"); + } catch (IOException expected) { + // Expected. + } + + ByteBuffer mapInfo = ByteBuffer.allocate(Long.BYTES + Integer.BYTES); + Assert.assertEquals(mapInfo.capacity(), + fileChannel.read(mapInfo, DefaultEntryLogger.LEDGERS_MAP_OFFSET_POSITION)); + mapInfo.flip(); + Assert.assertEquals(0L, mapInfo.getLong()); + Assert.assertEquals(0, mapInfo.getInt()); + + Assert.assertEquals(mapOffset + DefaultEntryLogger.LEDGERS_MAP_HEADER_SIZE + + DefaultEntryLogger.LEDGERS_MAP_ENTRY_SIZE, logChannel.position()); logChannel.close(); } @@ -221,27 +325,70 @@ private static ByteBuf generateEntry(int length) { return bb; } + private static void writeEntryLogHeader(FileChannel fileChannel) throws IOException { + ByteBuffer header = ByteBuffer.allocate(DefaultEntryLogger.LOGFILE_HEADER_SIZE); + header.put("BKLO".getBytes("UTF-8")); + header.putInt(DefaultEntryLogger.HEADER_CURRENT_VERSION); + header.position(DefaultEntryLogger.LOGFILE_HEADER_SIZE); + header.flip(); + while (header.hasRemaining()) { + fileChannel.write(header); + } + fileChannel.position(DefaultEntryLogger.LOGFILE_HEADER_SIZE); + } + private static final class PartialFailingFileChannel extends FileChannel { private final FileChannel delegate; private final int bytesBeforeFailure; + private final boolean failRegularWrite; + private final long shortPositionedWritePosition; + private final int shortPositionedWriteBytes; + private final long failingPositionedWritePosition; + private final boolean failForce; private boolean partialWriteDone; private boolean failureInjected; + private boolean shortPositionedWriteDone; + private boolean positionedWriteFailureInjected; private PartialFailingFileChannel(FileChannel delegate, int bytesBeforeFailure) { + this(delegate, bytesBeforeFailure, true, -1L, -1, -1L, false); + } + + private PartialFailingFileChannel(FileChannel delegate, int bytesBeforeFailure, + boolean failRegularWrite, long shortPositionedWritePosition, + int shortPositionedWriteBytes, long failingPositionedWritePosition, + boolean failForce) { this.delegate = delegate; this.bytesBeforeFailure = bytesBeforeFailure; + this.failRegularWrite = failRegularWrite; + this.shortPositionedWritePosition = shortPositionedWritePosition; + this.shortPositionedWriteBytes = shortPositionedWriteBytes; + this.failingPositionedWritePosition = failingPositionedWritePosition; + this.failForce = failForce; + } + + private static PartialFailingFileChannel shortPositionedWrite(FileChannel delegate, long position, int bytes) { + return new PartialFailingFileChannel(delegate, 0, false, position, bytes, -1L, false); + } + + private static PartialFailingFileChannel failingPositionedWrite(FileChannel delegate, long position) { + return new PartialFailingFileChannel(delegate, 0, false, -1L, -1, position, false); + } + + private static PartialFailingFileChannel failingForce(FileChannel delegate) { + return new PartialFailingFileChannel(delegate, 0, false, -1L, -1, -1L, true); } @Override public int write(ByteBuffer src) throws IOException { - if (!partialWriteDone) { + if (failRegularWrite && !partialWriteDone) { int oldLimit = src.limit(); src.limit(src.position() + bytesBeforeFailure); int written = delegate.write(src); src.limit(oldLimit); partialWriteDone = true; return written; - } else if (!failureInjected) { + } else if (failRegularWrite && !failureInjected) { failureInjected = true; throw new IOException("simulated write failure after partial write"); } @@ -287,6 +434,9 @@ public FileChannel truncate(long size) throws IOException { @Override public void force(boolean metaData) throws IOException { + if (failForce) { + throw new IOException("simulated force failure"); + } delegate.force(metaData); } @@ -307,6 +457,18 @@ public int read(ByteBuffer dst, long position) throws IOException { @Override public int write(ByteBuffer src, long position) throws IOException { + if (!positionedWriteFailureInjected && position == failingPositionedWritePosition) { + positionedWriteFailureInjected = true; + throw new IOException("simulated positioned write failure"); + } + if (!shortPositionedWriteDone && position == shortPositionedWritePosition) { + int oldLimit = src.limit(); + src.limit(src.position() + Math.min(shortPositionedWriteBytes, src.remaining())); + int written = delegate.write(src, position); + src.limit(oldLimit); + shortPositionedWriteDone = true; + return written; + } return delegate.write(src, position); } From 17042aa9f50ae62e87036a57c14e39dd1d279cbb Mon Sep 17 00:00:00 2001 From: root Date: Tue, 4 Aug 2026 11:43:16 +0800 Subject: [PATCH 232/233] fix: fail closed on entry log flush failure --- .../apache/bookkeeper/bookie/BookieImpl.java | 9 ++ .../bookie/EntryLogManagerBase.java | 80 +++++++++++--- .../EntryLogManagerForEntryLogPerLedger.java | 6 +- .../EntryLogManagerForSingleEntryLog.java | 4 +- .../bookie/EntryLogWriteException.java | 35 ++++++ .../bookie/EntryLoggerAllocator.java | 32 ++++-- .../bookie/InterleavedLedgerStorage.java | 2 + .../bookie/SortedLedgerStorage.java | 14 +++ .../apache/bookkeeper/bookie/SyncThread.java | 8 ++ .../bookie/storage/ldb/DbLedgerStorage.java | 7 ++ .../ldb/SingleDirectoryDbLedgerStorage.java | 15 +++ .../bookkeeper/bookie/BookieImplTest.java | 101 ++++++++++++++++++ .../bookkeeper/bookie/SyncThreadTest.java | 55 ++++++++++ .../ldb/DbLedgerStorageWriteCacheTest.java | 91 ++++++++++++---- 14 files changed, 406 insertions(+), 53 deletions(-) create mode 100644 bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogWriteException.java diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java index 968977ecdc3..13a8d58f957 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java @@ -489,6 +489,9 @@ public void ledgerDeleted(long ledgerId) { ledgerStorage.setStateManager(stateManager); ledgerStorage.setCheckpointSource(checkpointSource); ledgerStorage.setCheckpointer(syncThread); + if (isDbLedgerStorage) { + ((DbLedgerStorage) ledgerStorage).setFatalErrorListener(getLedgerDirsListener()); + } ledgerStorage.registerLedgerDeletionListener(ledgerDeletionListener); handles = new HandleFactoryImpl(ledgerStorage); @@ -979,6 +982,9 @@ public void recoveryAddEntry(ByteBuf entry, WriteCallback cb, Object ctx, byte[] addEntryInternal(handle, entry, false /* ackBeforeSync */, cb, ctx, masterKey); } success = true; + } catch (EntryLogWriteException e) { + triggerBookieShutdown(ExitCode.BOOKIE_EXCEPTION); + throw e; } catch (NoWritableLedgerDirException e) { stateManager.transitionToReadOnlyMode(); throw new IOException(e); @@ -1073,6 +1079,9 @@ public void addEntry(ByteBuf entry, boolean ackBeforeSync, WriteCallback cb, Obj addEntryInternal(handle, entry, ackBeforeSync, cb, ctx, masterKey); } success = true; + } catch (EntryLogWriteException e) { + triggerBookieShutdown(ExitCode.BOOKIE_EXCEPTION); + throw e; } catch (NoWritableLedgerDirException e) { stateManager.transitionToReadOnlyMode(); throw new IOException(e); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerBase.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerBase.java index 36ce928a089..b8312bf4503 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerBase.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerBase.java @@ -73,13 +73,20 @@ public long addEntry(long ledger, ByteBuf entry, boolean rollLog) throws IOExcep ByteBuf sizeBuffer = sizeBufferForAdd.get(); sizeBuffer.clear(); sizeBuffer.writeInt(entry.readableBytes()); - logChannel.write(sizeBuffer); - - long pos = logChannel.position(); - logChannel.write(entry); - logChannel.registerWrittenEntry(ledger, entrySize); - - return (logChannel.getLogId() << 32L) | pos; + try { + logChannel.write(sizeBuffer); + + long pos = logChannel.position(); + logChannel.write(entry); + logChannel.registerWrittenEntry(ledger, entrySize); + + return (logChannel.getLogId() << 32L) | pos; + } catch (EntryLogWriteException e) { + throw e; + } catch (IOException e) { + throw new EntryLogWriteException( + "Failed to write entry to entry log " + logChannel.getLogId() + " for ledger " + ledger, e); + } } boolean reachEntryLogLimit(BufferedLogChannel logChannel, long size) { @@ -125,13 +132,33 @@ public void flush() throws IOException { void flushLogChannel(BufferedLogChannel logChannel, boolean forceMetadata) throws IOException { if (logChannel != null) { - logChannel.flushAndForceWrite(forceMetadata); + flushAndForceWrite(logChannel, forceMetadata); if (log.isDebugEnabled()) { log.debug("Flush and sync current entry logger {}", logChannel.getLogId()); } } } + void flushAndForceWrite(BufferedLogChannel logChannel, boolean forceMetadata) throws IOException { + try { + logChannel.flushAndForceWrite(forceMetadata); + } catch (EntryLogWriteException e) { + throw e; + } catch (IOException e) { + throw new EntryLogWriteException("Failed to flush entry log " + logChannel.getLogId(), e); + } + } + + void flushAndForceWriteIfRegularFlush(BufferedLogChannel logChannel, boolean forceMetadata) throws IOException { + try { + logChannel.flushAndForceWriteIfRegularFlush(forceMetadata); + } catch (EntryLogWriteException e) { + throw e; + } catch (IOException e) { + throw new EntryLogWriteException("Failed to flush entry log " + logChannel.getLogId(), e); + } + } + /* * Creates a new log file. This method should be guarded by a lock, * so callers of this method should be in right scope of the lock. @@ -155,12 +182,27 @@ void createNewLog(long ledgerId, String reason) throws IOException { if (null != logChannel) { // flush the internal buffer back to filesystem but not sync disk - logChannel.flush(); - - // Append ledgers map at the end of entry log - logChannel.appendLedgersMap(); + try { + logChannel.flush(); + + // Append ledgers map at the end of entry log + logChannel.appendLedgersMap(); + } catch (EntryLogWriteException e) { + throw e; + } catch (IOException e) { + throw new EntryLogWriteException( + "Failed to rotate entry log " + logChannel.getLogId() + " for ledger " + ledgerId, e); + } - BufferedLogChannel newLogChannel = entryLoggerAllocator.createNewLog(selectDirForNextEntryLog()); + File dirForNextEntryLog = selectDirForNextEntryLog(); + BufferedLogChannel newLogChannel; + try { + newLogChannel = entryLoggerAllocator.createNewLog(dirForNextEntryLog); + } catch (EntryLogWriteException e) { + throw e; + } catch (IOException e) { + throw new EntryLogWriteException("Failed to create a new entry log for ledger " + ledgerId, e); + } setCurrentLogForLedgerAndAddToRotate(ledgerId, newLogChannel); log.info("Flushing entry logger {} back to filesystem, pending for syncing entry loggers : {}.", logChannel.getLogId(), rotatedLogChannels); @@ -168,8 +210,16 @@ void createNewLog(long ledgerId, String reason) throws IOException { listener.onRotateEntryLog(); } } else { - setCurrentLogForLedgerAndAddToRotate(ledgerId, - entryLoggerAllocator.createNewLog(selectDirForNextEntryLog())); + File dirForNextEntryLog = selectDirForNextEntryLog(); + BufferedLogChannel newLogChannel; + try { + newLogChannel = entryLoggerAllocator.createNewLog(dirForNextEntryLog); + } catch (EntryLogWriteException e) { + throw e; + } catch (IOException e) { + throw new EntryLogWriteException("Failed to create a new entry log for ledger " + ledgerId, e); + } + setCurrentLogForLedgerAndAddToRotate(ledgerId, newLogChannel); } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForEntryLogPerLedger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForEntryLogPerLedger.java index 60da9e60335..c71a54ace25 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForEntryLogPerLedger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForEntryLogPerLedger.java @@ -664,10 +664,10 @@ BufferedLogChannel getCurrentLogForLedgerForAddEntry(long ledgerId, int entrySiz * logChannel, since Bookie must have turned to readonly mode and * the addEntry traffic would be from GC and it is ok to proceed in * this case. - */ + */ if ((diskFull && (!allDisksFull)) || reachEntryLogLimit || (logChannel == null)) { if (logChannel != null) { - logChannel.flushAndForceWriteIfRegularFlush(false); + flushAndForceWriteIfRegularFlush(logChannel, false); } createNewLog(ledgerId, ": diskFull = " + diskFull + ", allDisksFull = " + allDisksFull @@ -683,7 +683,7 @@ BufferedLogChannel getCurrentLogForLedgerForAddEntry(long ledgerId, int entrySiz @Override public void flushRotatedLogs() throws IOException { for (BufferedLogChannel channel : rotatedLogChannels) { - channel.flushAndForceWrite(true); + flushAndForceWrite(channel, true); // since this channel is only used for writing, after flushing the channel, // we had to close the underlying file channel. Otherwise, we might end up // leaking fds which cause the disk spaces could not be reclaimed. diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java index 59bcc02a577..364b6c73fac 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java @@ -102,7 +102,7 @@ synchronized BufferedLogChannel getCurrentLogForLedgerForAddEntry(long ledgerId, boolean createNewLog = shouldCreateNewEntryLog.get(); if (createNewLog || reachEntryLogLimit) { if (activeLogChannel != null) { - activeLogChannel.flushAndForceWriteIfRegularFlush(false); + flushAndForceWriteIfRegularFlush(activeLogChannel, false); } createNewLog(UNASSIGNED_LEDGERID, ": createNewLog = " + createNewLog + ", reachEntryLogLimit = " + reachEntryLogLimit); @@ -188,7 +188,7 @@ void flushRotatedLogs() throws IOException { while (chIter.hasNext()) { BufferedLogChannel channel = chIter.next(); try { - channel.flushAndForceWrite(true); + flushAndForceWrite(channel, true); } catch (IOException ioe) { // rescue from flush exception, add unflushed channels back synchronized (this) { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogWriteException.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogWriteException.java new file mode 100644 index 00000000000..11d5ad32d14 --- /dev/null +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogWriteException.java @@ -0,0 +1,35 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.apache.bookkeeper.bookie; + +import java.io.IOException; + +/** + * Indicates an entry log write, flush, or fsync failure that leaves the writer state uncertain. + */ +public class EntryLogWriteException extends IOException { + private static final long serialVersionUID = -6456783806451195011L; + + public EntryLogWriteException(String message, IOException cause) { + super(message, cause); + } +} diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java index e9ff5030d18..832539dcc29 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java @@ -168,19 +168,31 @@ private synchronized BufferedLogChannel allocateNewLog(File dirForNextEntryLog, BufferedLogChannel logChannel = new BufferedLogChannel(byteBufAllocator, channel, conf.getWriteBufferBytes(), conf.getReadBufferBytes(), preallocatedLogId, newLogFile, conf.getFlushIntervalInBytes()); - logfileHeader.readerIndex(0); - logChannel.write(logfileHeader); + boolean success = false; + try { + logfileHeader.readerIndex(0); + logChannel.write(logfileHeader); - for (File f : ledgersDirs) { - setLastLogId(f, preallocatedLogId); - } + for (File f : ledgersDirs) { + setLastLogId(f, preallocatedLogId); + } - if (suffix.equals(DefaultEntryLogger.LOG_FILE_SUFFIX)) { - recentlyCreatedEntryLogsStatus.createdEntryLog(preallocatedLogId); - } + if (suffix.equals(DefaultEntryLogger.LOG_FILE_SUFFIX)) { + recentlyCreatedEntryLogsStatus.createdEntryLog(preallocatedLogId); + } - log.info("Created new entry log file {} for logId {}.", newLogFile, preallocatedLogId); - return logChannel; + log.info("Created new entry log file {} for logId {}.", newLogFile, preallocatedLogId); + success = true; + return logChannel; + } finally { + if (!success) { + try { + logChannel.close(); + } catch (IOException closeError) { + log.warn("Failed to close entry log file {} after allocation failure", newLogFile, closeError); + } + } + } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java index 2b90e3b0081..cf5e793aaa2 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java @@ -467,6 +467,8 @@ private void flushOrCheckpoint(boolean isCheckpointFlush) } else { entryLogger.flush(); } + } catch (EntryLogWriteException e) { + throw e; } catch (LedgerDirsManager.NoWritableLedgerDirException e) { throw e; } catch (IOException ioe) { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java index c3c9e972138..bca51044ba3 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java @@ -317,6 +317,8 @@ public void run() { if (interleavedLedgerStorage.getEntryLogger().commitEntryMemTableFlush()) { interleavedLedgerStorage.checkpointer.startCheckpoint(cp); } + } catch (EntryLogWriteException e) { + fatalEntryLogWriteFailure(e); } catch (Exception e) { stateManager.transitionToReadOnlyMode(); LOG.error("Exception thrown while flushing skip list cache.", e); @@ -333,6 +335,18 @@ public void onRotateEntryLog() { // flushed to the entry log file. } + private void fatalEntryLogWriteFailure(EntryLogWriteException e) { + LOG.error("Fatal entry log write failure while flushing skip list cache.", e); + if (stateManager instanceof BookieStateManager) { + StateManager.ShutdownHandler shutdownHandler = ((BookieStateManager) stateManager).getShutdownHandler(); + if (shutdownHandler != null) { + shutdownHandler.shutdown(ExitCode.BOOKIE_EXCEPTION); + return; + } + } + stateManager.transitionToReadOnlyMode(); + } + BookieStateManager getStateManager(){ return (BookieStateManager) stateManager; } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java index 7c5ad7c4991..4a8a205128c 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java @@ -146,6 +146,10 @@ private void flush() { log.error("No writeable ledger directories", e); dirsListener.allDisksFull(true); return; + } catch (EntryLogWriteException e) { + log.error("Fatal entry log write failure while flushing ledgers", e); + dirsListener.fatalError(); + return; } catch (IOException e) { log.error("Exception flushing ledgers", e); return; @@ -177,6 +181,10 @@ public void checkpoint(Checkpoint checkpoint) { log.error("No writeable ledger directories", e); dirsListener.allDisksFull(true); return; + } catch (EntryLogWriteException e) { + log.error("Fatal entry log write failure while checkpointing ledgers", e); + dirsListener.fatalError(); + return; } catch (IOException e) { log.error("Exception flushing ledgers", e); return; diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java index 60f752e2264..d631e59471d 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java @@ -52,6 +52,7 @@ import org.apache.bookkeeper.bookie.LastAddConfirmedUpdateNotification; import org.apache.bookkeeper.bookie.LedgerCache; import org.apache.bookkeeper.bookie.LedgerDirsManager; +import org.apache.bookkeeper.bookie.LedgerDirsManager.LedgerDirsListener; import org.apache.bookkeeper.bookie.LedgerStorage; import org.apache.bookkeeper.bookie.StateManager; import org.apache.bookkeeper.bookie.storage.EntryLogger; @@ -301,6 +302,12 @@ public void setCheckpointer(Checkpointer checkpointer) { ledgerStorageList.forEach(s -> s.setCheckpointer(checkpointer)); } + public void setFatalErrorListener(LedgerDirsListener fatalErrorListener) { + if (fatalErrorListener != null) { + ledgerStorageList.forEach(s -> s.setFatalErrorListener(fatalErrorListener)); + } + } + @Override public void start() { ledgerStorageList.forEach(LedgerStorage::start); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java index 867ba905ffe..7ec0e309368 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java @@ -56,6 +56,7 @@ import org.apache.bookkeeper.bookie.CheckpointSource.Checkpoint; import org.apache.bookkeeper.bookie.Checkpointer; import org.apache.bookkeeper.bookie.CompactableLedgerStorage; +import org.apache.bookkeeper.bookie.EntryLogWriteException; import org.apache.bookkeeper.bookie.EntryLocation; import org.apache.bookkeeper.bookie.GarbageCollectionStatus; import org.apache.bookkeeper.bookie.GarbageCollectorThread; @@ -133,6 +134,7 @@ protected Thread newThread(Runnable r, String name) { private CheckpointSource checkpointSource = CheckpointSource.DEFAULT; private Checkpoint lastCheckpoint = Checkpoint.MIN; + private volatile LedgerDirsListener fatalErrorListener = new LedgerDirsListener() { }; private final long writeCacheMaxSize; private final long readCacheMaxSize; @@ -251,6 +253,12 @@ public void setCheckpointSource(CheckpointSource checkpointSource) { @Override public void setCheckpointer(Checkpointer checkpointer) { } + void setFatalErrorListener(LedgerDirsListener fatalErrorListener) { + if (fatalErrorListener != null) { + this.fatalErrorListener = fatalErrorListener; + } + } + /** * Evict all the ledger info object that were not used recently. */ @@ -527,6 +535,8 @@ private void triggerFlushAndAddEntry(long ledgerId, long entryId, ByteBuf entry) long startTime = System.nanoTime(); try { flush(); + } catch (EntryLogWriteException e) { + notifyFatalEntryLogWriteFailure(e); } catch (IOException e) { log.error("Error during flush", e); } finally { @@ -561,6 +571,11 @@ private void triggerFlushAndAddEntry(long ledgerId, long entryId, ByteBuf entry) throw new OperationRejectedException(); } + private void notifyFatalEntryLogWriteFailure(EntryLogWriteException e) { + log.error("Fatal entry log write failure during background flush", e); + fatalErrorListener.fatalError(); + } + @Override public ByteBuf getEntry(long ledgerId, long entryId) throws IOException, BookieException { long startTime = MathUtils.nowInNano(); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieImplTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieImplTest.java index 4787ae8d36f..562ceb94d8f 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieImplTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieImplTest.java @@ -29,19 +29,28 @@ import com.google.protobuf.ByteString; import com.google.protobuf.UnsafeByteOperations; import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledByteBufAllocator; +import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.bookkeeper.bookie.storage.EntryLogger; +import org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage; +import org.apache.bookkeeper.bookie.storage.ldb.SingleDirectoryDbLedgerStorage; import org.apache.bookkeeper.client.BookKeeper; import org.apache.bookkeeper.conf.ServerConfiguration; import org.apache.bookkeeper.conf.TestBKConfiguration; import org.apache.bookkeeper.discover.RegistrationManager; +import org.apache.bookkeeper.meta.LedgerManager; import org.apache.bookkeeper.meta.MetadataBookieDriver; import org.apache.bookkeeper.net.BookieId; import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks; import org.apache.bookkeeper.proto.checksum.DigestManager; import org.apache.bookkeeper.stats.NullStatsLogger; +import org.apache.bookkeeper.stats.StatsLogger; import org.apache.bookkeeper.test.BookKeeperClusterTestCase; import org.apache.bookkeeper.util.ByteBufList; import org.apache.bookkeeper.util.PortManager; @@ -128,6 +137,43 @@ public void testRecoveryAddEntry() throws Exception { mockAddEntryReleased(RECOVERY_ADD); } + @Test + public void testBackgroundEntryLogFlushFailureShutsDownBookie() throws Exception { + ServerConfiguration conf = newServerConfiguration(); + conf.setLedgerStorageClass(FailOnFlushDbLedgerStorage.class.getName()); + conf.setJournalWriteData(false); + conf.setProperty(DbLedgerStorage.WRITE_CACHE_MAX_SIZE_MB, 1); + conf.setProperty("dbStorage_maxThrottleTimeMs", 1000); + FailOnFlushDbLedgerStorage.failNextFlushWithEntryLogWriteException.set(false); + + CountDownLatch shutdownLatch = new CountDownLatch(1); + TestBookieImpl.Resources resources = new TestBookieImpl.ResourceBuilder(conf).build(); + BookieImpl bookie = new TestBookieImpl(resources) { + @Override + int shutdown(int exitCode) { + int result = super.shutdown(exitCode); + if (exitCode == ExitCode.BOOKIE_EXCEPTION) { + shutdownLatch.countDown(); + } + return result; + } + }; + + try { + bookie.start(); + FailOnFlushDbLedgerStorage.failNextFlushWithEntryLogWriteException.set(true); + writeUntilCacheFlushIsTriggered(bookie, 10L, "masterKey".getBytes(StandardCharsets.UTF_8)); + + assertTrue("Entry log flush failure should shut down the bookie", + shutdownLatch.await(10, TimeUnit.SECONDS)); + } finally { + FailOnFlushDbLedgerStorage.failNextFlushWithEntryLogWriteException.set(false); + if (bookie.isRunning()) { + bookie.shutdown(); + } + } + } + public void mockAddEntryReleased(int flag) throws Exception { final String metadataServiceUri = zkUtil.getMetadataServiceUri(); ServerConfiguration conf = TestBKConfiguration.newServerConfiguration(); @@ -192,4 +238,59 @@ private ByteBuf generateEntry(long ledger, long entry) { bb.writeBytes(data); return bb; } + + private void writeUntilCacheFlushIsTriggered(BookieImpl bookie, long ledgerId, byte[] masterKey) + throws Exception { + for (int i = 0; i < 20; i++) { + try { + bookie.addEntry(generateLargeEntry(ledgerId, i), false, + (rc, lid, eid, addr, ctx) -> { }, null, masterKey); + } catch (BookieException.OperationRejectedException e) { + return; + } + } + } + + private ByteBuf generateLargeEntry(long ledger, long entry) { + ByteBuf bb = Unpooled.buffer(100 * 1024 + 3 * Long.BYTES); + bb.writeLong(ledger); + bb.writeLong(entry); + bb.writeLong(entry - 1); + bb.writeZero(100 * 1024); + return bb; + } + + public static class FailOnFlushDbLedgerStorage extends DbLedgerStorage { + private static final AtomicBoolean failNextFlushWithEntryLogWriteException = new AtomicBoolean(false); + + @Override + protected SingleDirectoryDbLedgerStorage newSingleDirectoryDbLedgerStorage(ServerConfiguration conf, + LedgerManager ledgerManager, LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, + EntryLogger entryLogger, StatsLogger statsLogger, long writeCacheSize, long readCacheSize, + int readAheadCacheBatchSize, long readAheadCacheBatchBytesSize) + throws IOException { + return new FailOnFlushSingleDirectoryDbLedgerStorage(conf, ledgerManager, ledgerDirsManager, + indexDirsManager, entryLogger, statsLogger, allocator, writeCacheSize, readCacheSize, + readAheadCacheBatchSize, readAheadCacheBatchBytesSize); + } + } + + private static class FailOnFlushSingleDirectoryDbLedgerStorage extends SingleDirectoryDbLedgerStorage { + FailOnFlushSingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager ledgerManager, + LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, EntryLogger entryLogger, + StatsLogger statsLogger, ByteBufAllocator allocator, long writeCacheSize, long readCacheSize, + int readAheadCacheBatchSize, long readAheadCacheBatchBytesSize) + throws IOException { + super(conf, ledgerManager, ledgerDirsManager, indexDirsManager, entryLogger, statsLogger, allocator, + writeCacheSize, readCacheSize, readAheadCacheBatchSize, readAheadCacheBatchBytesSize); + } + + @Override + public void flush() throws IOException { + if (FailOnFlushDbLedgerStorage.failNextFlushWithEntryLogWriteException.compareAndSet(true, false)) { + throw new EntryLogWriteException("entry log flush failed", new IOException("injected")); + } + super.flush(); + } + } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SyncThreadTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SyncThreadTest.java index 6df1bacb80d..c5548d112b2 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SyncThreadTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SyncThreadTest.java @@ -223,6 +223,61 @@ public void checkpoint(Checkpoint checkpoint) t.shutdown(); } + @Test + public void testSyncThreadShutdownOnEntryLogWriteFailureDuringCheckpoint() throws Exception { + int flushInterval = 100; + ServerConfiguration conf = TestBKConfiguration.newServerConfiguration(); + conf.setFlushInterval(flushInterval); + CheckpointSource checkpointSource = new DummyCheckpointSource(); + final CountDownLatch fatalLatch = new CountDownLatch(1); + LedgerDirsListener listener = new LedgerDirsListener() { + @Override + public void fatalError() { + fatalLatch.countDown(); + } + }; + + LedgerStorage storage = new DummyLedgerStorage() { + @Override + public void checkpoint(Checkpoint checkpoint) + throws IOException { + throw new EntryLogWriteException( + "entry log flush failed", new IOException("injected")); + } + }; + final SyncThread t = new SyncThread(conf, listener, storage, checkpointSource, NullStatsLogger.INSTANCE); + t.startCheckpoint(Checkpoint.MAX); + assertTrue("Should have called fatal error", fatalLatch.await(10, TimeUnit.SECONDS)); + t.shutdown(); + } + + @Test + public void testSyncThreadShutdownOnEntryLogWriteFailureDuringFlush() throws Exception { + int flushInterval = 100; + ServerConfiguration conf = TestBKConfiguration.newServerConfiguration(); + conf.setFlushInterval(flushInterval); + CheckpointSource checkpointSource = new DummyCheckpointSource(); + final CountDownLatch fatalLatch = new CountDownLatch(1); + LedgerDirsListener listener = new LedgerDirsListener() { + @Override + public void fatalError() { + fatalLatch.countDown(); + } + }; + + LedgerStorage storage = new DummyLedgerStorage() { + @Override + public void flush() throws IOException { + throw new EntryLogWriteException( + "entry log flush failed", new IOException("injected")); + } + }; + final SyncThread t = new SyncThread(conf, listener, storage, checkpointSource, NullStatsLogger.INSTANCE); + t.requestFlush().get(10, TimeUnit.SECONDS); + assertTrue("Should have called fatal error", fatalLatch.await(10, TimeUnit.SECONDS)); + t.shutdown(); + } + /** * Test that if the ledger storage throws * a disk full exception, the owner of the sync diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java index 102f7f5addc..0ddb3fe59e4 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java @@ -21,6 +21,7 @@ package org.apache.bookkeeper.bookie.storage.ldb; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import io.netty.buffer.ByteBuf; @@ -28,10 +29,15 @@ import io.netty.buffer.Unpooled; import java.io.File; import java.io.IOException; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import org.apache.bookkeeper.bookie.Bookie; import org.apache.bookkeeper.bookie.BookieException.OperationRejectedException; import org.apache.bookkeeper.bookie.BookieImpl; +import org.apache.bookkeeper.bookie.EntryLogWriteException; import org.apache.bookkeeper.bookie.LedgerDirsManager; +import org.apache.bookkeeper.bookie.LedgerDirsManager.LedgerDirsListener; import org.apache.bookkeeper.bookie.TestBookieImpl; import org.apache.bookkeeper.bookie.storage.EntryLogger; import org.apache.bookkeeper.conf.ServerConfiguration; @@ -64,6 +70,8 @@ protected SingleDirectoryDbLedgerStorage newSingleDirectoryDbLedgerStorage(Serve } private static class MockedSingleDirectoryDbLedgerStorage extends SingleDirectoryDbLedgerStorage { + private static final AtomicBoolean failNextFlushWithEntryLogWriteException = new AtomicBoolean(false); + public MockedSingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager ledgerManager, LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, EntryLogger entryLogger, StatsLogger statsLogger, @@ -75,29 +83,33 @@ public MockedSingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerMana readAheadCacheBatchBytesSize); } - @Override - public void flush() throws IOException { - flushMutex.lock(); - try { - // Swap the write caches and block indefinitely to simulate a slow disk - WriteCache tmp = writeCacheBeingFlushed; - writeCacheBeingFlushed = writeCache; - writeCache = tmp; - - // since the cache is switched, we can allow flush to be triggered - hasFlushBeenTriggered.set(false); - - // Block the flushing thread - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - return; - } - } finally { - flushMutex.unlock(); - } - } + @Override + public void flush() throws IOException { + if (failNextFlushWithEntryLogWriteException.compareAndSet(true, false)) { + throw new EntryLogWriteException("entry log flush failed", new IOException("injected")); + } + + flushMutex.lock(); + try { + // Swap the write caches and block indefinitely to simulate a slow disk + WriteCache tmp = writeCacheBeingFlushed; + writeCacheBeingFlushed = writeCache; + writeCache = tmp; + + // since the cache is switched, we can allow flush to be triggered + hasFlushBeenTriggered.set(false); + + // Block the flushing thread + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return; + } + } finally { + flushMutex.unlock(); + } + } } } @@ -116,6 +128,7 @@ public void setup() throws Exception { conf.setProperty(DbLedgerStorage.WRITE_CACHE_MAX_SIZE_MB, 1); conf.setProperty(DbLedgerStorage.MAX_THROTTLE_TIME_MILLIS, 1000); conf.setLedgerDirNames(new String[] { tmpDir.toString() }); + MockedDbLedgerStorage.MockedSingleDirectoryDbLedgerStorage.failNextFlushWithEntryLogWriteException.set(false); Bookie bookie = new TestBookieImpl(conf); storage = (DbLedgerStorage) bookie.getLedgerStorage(); @@ -165,4 +178,36 @@ public void writeCacheFull() throws Exception { // Expected } } + + @Test + public void writeCacheFullEntryLogWriteFailureTriggersFatalError() throws Exception { + storage.setMasterKey(4, "key".getBytes()); + CountDownLatch fatalLatch = new CountDownLatch(1); + storage.setFatalErrorListener(new LedgerDirsListener() { + @Override + public void fatalError() { + fatalLatch.countDown(); + } + }); + MockedDbLedgerStorage.MockedSingleDirectoryDbLedgerStorage.failNextFlushWithEntryLogWriteException.set(true); + + try { + for (int i = 0; i < 10; i++) { + storage.addEntry(newEntry(4, i)); + } + fail("Should have thrown exception"); + } catch (OperationRejectedException e) { + // Expected because the background flush failed before rotating the write cache. + } + + assertTrue("Should have called fatal error", fatalLatch.await(10, TimeUnit.SECONDS)); + } + + private static ByteBuf newEntry(long ledgerId, long entryId) { + ByteBuf entry = Unpooled.buffer(100 * 1024 + 2 * 8); + entry.writeLong(ledgerId); + entry.writeLong(entryId); + entry.writeZero(100 * 1024); + return entry; + } } From 4058ab58b53a7ab7c6e483669419c5b09b2085e5 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 4 Aug 2026 12:04:33 +0800 Subject: [PATCH 233/233] test: add e2e coverage for entry log flush failure --- .../bookkeeper/bookie/BookieImplTest.java | 46 +----------- ...gerStorageEntryLogFlushFailureE2ETest.java | 74 +++++++++++++++++++ .../ldb/FailOnFlushDbLedgerStorage.java | 73 ++++++++++++++++++ 3 files changed, 151 insertions(+), 42 deletions(-) create mode 100644 bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageEntryLogFlushFailureE2ETest.java create mode 100644 bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/FailOnFlushDbLedgerStorage.java diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieImplTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieImplTest.java index 562ceb94d8f..77a206ae145 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieImplTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieImplTest.java @@ -29,28 +29,23 @@ import com.google.protobuf.ByteString; import com.google.protobuf.UnsafeByteOperations; import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledByteBufAllocator; -import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.bookkeeper.bookie.storage.EntryLogger; import org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage; -import org.apache.bookkeeper.bookie.storage.ldb.SingleDirectoryDbLedgerStorage; +import org.apache.bookkeeper.bookie.storage.ldb.FailOnFlushDbLedgerStorage; import org.apache.bookkeeper.client.BookKeeper; import org.apache.bookkeeper.conf.ServerConfiguration; import org.apache.bookkeeper.conf.TestBKConfiguration; import org.apache.bookkeeper.discover.RegistrationManager; -import org.apache.bookkeeper.meta.LedgerManager; import org.apache.bookkeeper.meta.MetadataBookieDriver; import org.apache.bookkeeper.net.BookieId; import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks; import org.apache.bookkeeper.proto.checksum.DigestManager; import org.apache.bookkeeper.stats.NullStatsLogger; -import org.apache.bookkeeper.stats.StatsLogger; import org.apache.bookkeeper.test.BookKeeperClusterTestCase; import org.apache.bookkeeper.util.ByteBufList; import org.apache.bookkeeper.util.PortManager; @@ -144,7 +139,7 @@ public void testBackgroundEntryLogFlushFailureShutsDownBookie() throws Exception conf.setJournalWriteData(false); conf.setProperty(DbLedgerStorage.WRITE_CACHE_MAX_SIZE_MB, 1); conf.setProperty("dbStorage_maxThrottleTimeMs", 1000); - FailOnFlushDbLedgerStorage.failNextFlushWithEntryLogWriteException.set(false); + FailOnFlushDbLedgerStorage.resetFailure(); CountDownLatch shutdownLatch = new CountDownLatch(1); TestBookieImpl.Resources resources = new TestBookieImpl.ResourceBuilder(conf).build(); @@ -161,13 +156,13 @@ int shutdown(int exitCode) { try { bookie.start(); - FailOnFlushDbLedgerStorage.failNextFlushWithEntryLogWriteException.set(true); + FailOnFlushDbLedgerStorage.injectFailureOnNextFlush(); writeUntilCacheFlushIsTriggered(bookie, 10L, "masterKey".getBytes(StandardCharsets.UTF_8)); assertTrue("Entry log flush failure should shut down the bookie", shutdownLatch.await(10, TimeUnit.SECONDS)); } finally { - FailOnFlushDbLedgerStorage.failNextFlushWithEntryLogWriteException.set(false); + FailOnFlushDbLedgerStorage.resetFailure(); if (bookie.isRunning()) { bookie.shutdown(); } @@ -260,37 +255,4 @@ private ByteBuf generateLargeEntry(long ledger, long entry) { return bb; } - public static class FailOnFlushDbLedgerStorage extends DbLedgerStorage { - private static final AtomicBoolean failNextFlushWithEntryLogWriteException = new AtomicBoolean(false); - - @Override - protected SingleDirectoryDbLedgerStorage newSingleDirectoryDbLedgerStorage(ServerConfiguration conf, - LedgerManager ledgerManager, LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, - EntryLogger entryLogger, StatsLogger statsLogger, long writeCacheSize, long readCacheSize, - int readAheadCacheBatchSize, long readAheadCacheBatchBytesSize) - throws IOException { - return new FailOnFlushSingleDirectoryDbLedgerStorage(conf, ledgerManager, ledgerDirsManager, - indexDirsManager, entryLogger, statsLogger, allocator, writeCacheSize, readCacheSize, - readAheadCacheBatchSize, readAheadCacheBatchBytesSize); - } - } - - private static class FailOnFlushSingleDirectoryDbLedgerStorage extends SingleDirectoryDbLedgerStorage { - FailOnFlushSingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager ledgerManager, - LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, EntryLogger entryLogger, - StatsLogger statsLogger, ByteBufAllocator allocator, long writeCacheSize, long readCacheSize, - int readAheadCacheBatchSize, long readAheadCacheBatchBytesSize) - throws IOException { - super(conf, ledgerManager, ledgerDirsManager, indexDirsManager, entryLogger, statsLogger, allocator, - writeCacheSize, readCacheSize, readAheadCacheBatchSize, readAheadCacheBatchBytesSize); - } - - @Override - public void flush() throws IOException { - if (FailOnFlushDbLedgerStorage.failNextFlushWithEntryLogWriteException.compareAndSet(true, false)) { - throw new EntryLogWriteException("entry log flush failed", new IOException("injected")); - } - super.flush(); - } - } } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageEntryLogFlushFailureE2ETest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageEntryLogFlushFailureE2ETest.java new file mode 100644 index 00000000000..ce093ecd367 --- /dev/null +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageEntryLogFlushFailureE2ETest.java @@ -0,0 +1,74 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.bookkeeper.bookie.storage.ldb; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + +import java.util.concurrent.TimeUnit; +import org.apache.bookkeeper.bookie.BookieImpl; +import org.apache.bookkeeper.client.BKException; +import org.apache.bookkeeper.client.BookKeeper.DigestType; +import org.apache.bookkeeper.client.LedgerHandle; +import org.apache.bookkeeper.test.BookKeeperClusterTestCase; +import org.awaitility.Awaitility; +import org.junit.Test; + +public class DbLedgerStorageEntryLogFlushFailureE2ETest extends BookKeeperClusterTestCase { + private static final byte[] PASSWD = "passwd".getBytes(UTF_8); + + public DbLedgerStorageEntryLogFlushFailureE2ETest() { + super(1); + baseConf.setLedgerStorageClass(FailOnFlushDbLedgerStorage.class.getName()); + baseConf.setFlushInterval(60000); + baseConf.setGcWaitTime(60000); + baseConf.setProperty(DbLedgerStorage.WRITE_CACHE_MAX_SIZE_MB, 1); + baseConf.setProperty(DbLedgerStorage.MAX_THROTTLE_TIME_MILLIS, 1000); + baseClientConf.setAddEntryTimeout(5); + } + + @Test + public void testClientWriteFailsAndBookieShutsDownAfterEntryLogFlushFailure() throws Exception { + BookieImpl bookie = (BookieImpl) serverByIndex(0).getBookie(); + LedgerHandle lh = bkc.createLedger(1, 1, 1, DigestType.CRC32, PASSWD); + byte[] payload = new byte[100 * 1024]; + BKException clientFailure = null; + + FailOnFlushDbLedgerStorage.injectFailureOnNextFlush(); + try { + for (int i = 0; i < 20; i++) { + try { + lh.addEntry(payload); + } catch (BKException e) { + clientFailure = e; + break; + } + } + + assertNotNull("Client should observe a write failure after the entry log flush failure", clientFailure); + Awaitility.await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> + assertFalse("Bookie should be shut down after entry log flush failure", bookie.isRunning())); + } finally { + FailOnFlushDbLedgerStorage.resetFailure(); + } + } +} diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/FailOnFlushDbLedgerStorage.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/FailOnFlushDbLedgerStorage.java new file mode 100644 index 00000000000..cc6286de042 --- /dev/null +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/FailOnFlushDbLedgerStorage.java @@ -0,0 +1,73 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.bookkeeper.bookie.storage.ldb; + +import io.netty.buffer.ByteBufAllocator; +import java.io.IOException; +import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.bookkeeper.bookie.EntryLogWriteException; +import org.apache.bookkeeper.bookie.LedgerDirsManager; +import org.apache.bookkeeper.bookie.storage.EntryLogger; +import org.apache.bookkeeper.conf.ServerConfiguration; +import org.apache.bookkeeper.meta.LedgerManager; +import org.apache.bookkeeper.stats.StatsLogger; + +public class FailOnFlushDbLedgerStorage extends DbLedgerStorage { + private static final AtomicBoolean failNextFlushWithEntryLogWriteException = new AtomicBoolean(false); + + public static void injectFailureOnNextFlush() { + failNextFlushWithEntryLogWriteException.set(true); + } + + public static void resetFailure() { + failNextFlushWithEntryLogWriteException.set(false); + } + + @Override + protected SingleDirectoryDbLedgerStorage newSingleDirectoryDbLedgerStorage(ServerConfiguration conf, + LedgerManager ledgerManager, LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, + EntryLogger entryLogger, StatsLogger statsLogger, long writeCacheSize, long readCacheSize, + int readAheadCacheBatchSize, long readAheadCacheBatchBytesSize) + throws IOException { + return new FailOnFlushSingleDirectoryDbLedgerStorage(conf, ledgerManager, ledgerDirsManager, + indexDirsManager, entryLogger, statsLogger, allocator, writeCacheSize, readCacheSize, + readAheadCacheBatchSize, readAheadCacheBatchBytesSize); + } + + private static class FailOnFlushSingleDirectoryDbLedgerStorage extends SingleDirectoryDbLedgerStorage { + FailOnFlushSingleDirectoryDbLedgerStorage(ServerConfiguration conf, LedgerManager ledgerManager, + LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager, EntryLogger entryLogger, + StatsLogger statsLogger, ByteBufAllocator allocator, long writeCacheSize, long readCacheSize, + int readAheadCacheBatchSize, long readAheadCacheBatchBytesSize) + throws IOException { + super(conf, ledgerManager, ledgerDirsManager, indexDirsManager, entryLogger, statsLogger, allocator, + writeCacheSize, readCacheSize, readAheadCacheBatchSize, readAheadCacheBatchBytesSize); + } + + @Override + public void flush() throws IOException { + if (failNextFlushWithEntryLogWriteException.compareAndSet(true, false)) { + throw new EntryLogWriteException("entry log flush failed", new IOException("injected")); + } + super.flush(); + } + } +}