This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a change to branch branch-4.17
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
from e8a550ac37 Upgrade to grpc 1.72.0 (#4591)
new dd8eecccaf Upgrade Netty to 4.1.121.Final (#4597)
new 542ea098a6 Migrate deprecated commons-configuration 1.x to
commons-configuration 2.x (#4604)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/bookkeeper/benchmark/BenchBookie.java | 2 +-
bookkeeper-common/pom.xml | 9 +-
.../common/conf/ComponentConfiguration.java | 139 ++++++++++++++++++++-
.../common/conf/ConcurrentConfiguration.java | 17 ++-
.../apache/bookkeeper/common/conf/ConfigDef.java | 4 +-
.../apache/bookkeeper/common/conf/ConfigKey.java | 4 +-
.../bookkeeper/common/conf/ConfigurationUtil.java | 77 ++++++++++++
.../apache/bookkeeper/common/net/ServiceURI.java | 2 +-
.../bookkeeper/common/util/OrderedExecutor.java | 2 +-
.../bookkeeper/common/util/ReflectionUtils.java | 4 +-
.../bookkeeper/common/conf/ConfigKeyTest.java | 11 +-
.../common/testing/util/TimedOutTestsListener.java | 2 +-
.../apache/bookkeeper/test/TestStatsProvider.java | 4 +-
.../src/main/resources/LICENSE-all.bin.txt | 105 ++++++++--------
.../src/main/resources/LICENSE-bkctl.bin.txt | 92 +++++++-------
.../src/main/resources/LICENSE-server.bin.txt | 105 ++++++++--------
.../src/main/resources/NOTICE-all.bin.txt | 32 ++---
.../src/main/resources/NOTICE-bkctl.bin.txt | 20 +--
.../src/main/resources/NOTICE-server.bin.txt | 32 ++---
.../apache/bookkeeper/http/HttpServerLoader.java | 2 +-
.../apache/bookkeeper/bookie/BookieResources.java | 2 +-
.../org/apache/bookkeeper/bookie/BookieShell.java | 10 +-
.../bookkeeper/bookie/FileSystemUpgrade.java | 2 +-
.../InterleavedStorageRegenerateIndexOp.java | 2 +-
.../bookie/ScanAndCompareGarbageCollector.java | 2 +-
.../bookie/storage/ldb/LedgersIndexCheckOp.java | 2 +-
.../storage/ldb/LocationsIndexRebuildOp.java | 2 +-
.../ldb/SingleDirectoryDbLedgerStorage.java | 2 +-
.../org/apache/bookkeeper/client/BookKeeper.java | 2 +-
.../bookkeeper/conf/AbstractConfiguration.java | 18 +--
.../bookkeeper/conf/ClientConfiguration.java | 2 +-
.../org/apache/bookkeeper/conf/Configurable.java | 2 +-
.../bookkeeper/conf/ServerConfiguration.java | 2 +-
.../conf/UncheckedConfigurationException.java | 4 +-
.../feature/CacheableFeatureProvider.java | 2 +-
.../meta/AbstractZkLedgerManagerFactory.java | 2 +-
.../bookkeeper/meta/LongZkLedgerIdGenerator.java | 2 +-
.../bookkeeper/meta/MSLedgerManagerFactory.java | 2 +-
.../apache/bookkeeper/meta/MetadataDrivers.java | 2 +-
.../bookkeeper/meta/ZkLedgerAuditorManager.java | 2 +-
.../bookkeeper/meta/ZkLedgerIdGenerator.java | 2 +-
.../bookkeeper/meta/zk/ZKMetadataDriverBase.java | 2 +-
.../bookkeeper/metastore/InMemoryMetaStore.java | 2 +-
.../org/apache/bookkeeper/metastore/MetaStore.java | 2 +-
.../bookkeeper/net/AbstractDNSToSwitchMapping.java | 4 +-
.../apache/bookkeeper/net/ScriptBasedMapping.java | 4 +-
.../bookkeeper/replication/AutoRecoveryMain.java | 2 +-
.../java/org/apache/bookkeeper/server/Main.java | 2 +-
.../service/ListUnderReplicatedLedgerService.java | 2 +-
.../autorecovery/ListUnderReplicatedCommand.java | 2 +-
.../tools/cli/commands/bookie/LedgerCommand.java | 2 +-
.../cli/commands/bookie/ListLedgersCommand.java | 2 +-
.../tools/cli/commands/bookie/ReadLogCommand.java | 2 +-
.../cli/commands/bookies/DecommissionCommand.java | 2 +-
.../tools/cli/commands/cookie/CookieCommand.java | 2 +-
.../tools/cli/helpers/BookieCommand.java | 2 +-
.../tools/cli/helpers/BookieShellCommand.java | 2 +-
.../tools/cli/helpers/ClientCommand.java | 2 +-
.../org/apache/bookkeeper/util/EventLoopUtil.java | 2 +-
.../main/java/org/apache/bookkeeper/util/Tool.java | 2 +-
.../apache/bookkeeper/bookie/CreateNewLogTest.java | 2 +-
.../bookie/GcOverreplicatedLedgerTest.java | 2 +-
.../bookie/InterleavedLedgerStorageTest.java | 4 +-
.../client/TestWeightedRandomSelection.java | 4 +-
.../bookkeeper/conf/AbstractConfigurationTest.java | 2 +-
.../bookkeeper/conf/TestServerConfiguration.java | 2 +-
.../apache/bookkeeper/metastore/TestMetaStore.java | 4 +-
.../TestLedgerUnderreplicationManager.java | 2 +-
.../apache/bookkeeper/server/TestBookieBoot.java | 7 +-
.../apache/bookkeeper/test/ConfigurationTest.java | 10 +-
.../metadata/etcd/EtcdLedgerManagerFactory.java | 2 +-
.../metadata/etcd/EtcdMetadataDriverBase.java | 2 +-
.../metadata/etcd/Etcd64bitIdGeneratorTest.java | 2 +-
.../bookkeeper/metadata/etcd/EtcdClusterTest.java | 2 +-
.../bookkeeper/metadata/etcd/EtcdCookieTest.java | 2 +-
.../metadata/etcd/EtcdLayoutManagerTest.java | 2 +-
.../metadata/etcd/EtcdLedgerManagerTest.java | 2 +-
.../metadata/etcd/EtcdRegistrationTest.java | 2 +-
.../metadata/etcd/helpers/HelpersTest.java | 2 +-
.../metadata/etcd/testing/EtcdTestBase.java | 2 +-
pom.xml | 25 ++--
.../bookkeeper/stats/CachingStatsProvider.java | 2 +-
.../apache/bookkeeper/stats/NullStatsProvider.java | 2 +-
.../java/org/apache/bookkeeper/stats/Stats.java | 2 +-
.../org/apache/bookkeeper/stats/StatsProvider.java | 4 +-
.../stats/codahale/CodahaleMetricsProvider.java | 2 +-
.../bookkeeper/stats/otel/OtelMetricsProvider.java | 2 +-
.../prometheus/PrometheusMetricsProvider.java | 4 +-
.../prometheus/TestPrometheusMetricsProvider.java | 2 +-
.../apache/bookkeeper/clients/utils/NetUtils.java | 2 +-
.../bookkeeper/clients/utils/TestNetUtils.java | 2 +-
.../config/ConcurrentConstConfiguration.java | 2 +-
.../common/config/ConfigurationSubscription.java | 130 +++++++++++--------
.../common/config/FileConfigurationBuilder.java | 28 -----
.../config/PropertiesConfigurationBuilder.java | 39 ------
.../common/config/PropertiesWriter.java | 11 +-
.../config/TestConfigurationSubscription.java | 54 ++++----
.../apache/distributedlog/BookKeeperClient.java | 2 +-
.../DistributedLogConfiguration.java | 19 +--
.../config/DynamicConfigurationFactory.java | 38 +++---
.../feature/AbstractFeatureProvider.java | 2 +-
.../DynamicConfigurationFeatureProvider.java | 16 +--
.../distributedlog/impl/BKNamespaceDriver.java | 2 +-
.../distributedlog/impl/ZKLogMetadataStore.java | 2 +-
.../impl/metadata/ZkMetadataResolver.java | 2 +-
.../namespace/NamespaceDriverManager.java | 2 +-
.../org/apache/distributedlog/net/DNSResolver.java | 2 +-
.../distributedlog/tools/DistributedLogTool.java | 2 +-
.../org/apache/distributedlog/util/ConfUtils.java | 2 +-
.../org/apache/distributedlog/DLMTestUtil.java | 2 +-
.../TestDistributedLogConfiguration.java | 2 +-
.../TestDynamicConfigurationFeatureProvider.java | 2 +-
.../apache/distributedlog/util/TestConfUtils.java | 4 +-
.../org/apache/distributedlog/fs/DLFileSystem.java | 2 +-
.../stream/cluster/StandaloneStarter.java | 8 +-
.../stream/cluster/StreamClusterSpec.java | 2 +-
.../bookkeeper/stream/server/StorageServer.java | 16 +--
.../stream/server/conf/BookieConfiguration.java | 2 +-
.../stream/server/conf/DLConfiguration.java | 2 +-
.../server/conf/StorageServerConfiguration.java | 2 +-
.../stream/server/grpc/TestGrpcServer.java | 2 +-
.../statelib/impl/mvcc/MVCCStoreImpl.java | 2 +-
.../stream/storage/conf/StorageConfiguration.java | 2 +-
.../storage/conf/TestStorageConfiguration.java | 2 +-
.../impl/TestStorageContainerStoreImpl.java | 2 +-
.../impl/cluster/ClusterControllerImplTest.java | 2 +-
.../impl/sc/ZkStorageContainerManagerTest.java | 2 +-
.../impl/store/MVCCStoreFactoryImplTest.java | 2 +-
.../tests/containers/ChaosContainer.java | 2 +-
.../apache/bookkeeper/tools/common/BKCommand.java | 18 ++-
.../bookkeeper/tools/framework/CommandUtils.java | 2 +-
.../cli/commands/bookie/SanityTestCommandTest.java | 2 +-
.../commands/client/DeleteLedgerCommandTest.java | 2 +-
.../tools/cli/helpers/BookieShellCommandTest.java | 2 +-
.../tools/perf/dlog/PerfSegmentReader.java | 2 +-
.../bookkeeper/tools/perf/dlog/ReadCommand.java | 2 +-
.../tools/perf/dlog/SegmentReadCommand.java | 2 +-
.../bookkeeper/tools/perf/dlog/WriteCommand.java | 2 +-
.../tools/perf/journal/AppendCommand.java | 2 +-
.../tools/perf/journal/JournalWriter.java | 2 +-
.../tools/perf/table/BenchmarkCommand.java | 2 +-
.../stream/cli/commands/AbstractStreamCommand.java | 2 +-
.../stream/cli/commands/AdminCommand.java | 2 +-
.../stream/cli/commands/ClientCommand.java | 2 +-
.../cli/commands/cluster/InitClusterCommand.java | 2 +-
145 files changed, 766 insertions(+), 582 deletions(-)
create mode 100644
bookkeeper-common/src/main/java/org/apache/bookkeeper/common/conf/ConfigurationUtil.java
delete mode 100644
stream/distributedlog/common/src/main/java/org/apache/distributedlog/common/config/FileConfigurationBuilder.java
delete mode 100644
stream/distributedlog/common/src/main/java/org/apache/distributedlog/common/config/PropertiesConfigurationBuilder.java
