From 97b0827a32f72e76a7a4796839c22591a18bd12c Mon Sep 17 00:00:00 2001 From: Andrey Yegorov <8622884+dlg99@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:13:24 -0700 Subject: [PATCH] Upgrade RocksDB to version 7.10.2 (#4413) Main Issue: #4409 ### Motivation Upgrade RocksDB to version 7.10.2 ### Changes Upgrade RocksDB to version 7.10.2 (cherry picked from commit f67e370a993f49a42ab60119a128711f82ff0ad8) --- bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 6 +++--- bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 6 +++--- pom.xml | 2 +- 3 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 0faa0e0712e..c5f8dd4b9f5 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.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.rocksdb-rocksdbjni-7.10.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] @@ -371,7 +371,7 @@ Apache Software License, Version 2. [20] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6 [21] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0 [22] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.48.v20220622 -[23] Source available at https://github.com/facebook/rocksdb/tree/v6.29.4.1 +[23] Source available at https://github.com/facebook/rocksdb/tree/v7.10.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 @@ -630,7 +630,7 @@ This private header is also used by Apple's open source * http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h ------------------------------------------------------------------------------------ -lib/org.rocksdb-rocksdbjni-7.9.2.jar is derived from leveldb, which is under the following license. +lib/org.rocksdb-rocksdbjni-7.10.2.jar is derived from leveldb, which is under the following license. Copyright (c) 2011 The LevelDB Authors. All rights reserved. diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index 2a9584cf5f1..7e1dc9f021b 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.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.rocksdb-rocksdbjni-7.10.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] @@ -367,7 +367,7 @@ Apache Software License, Version 2. [20] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6 [21] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0 [22] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.48.v20220622 -[23] Source available at https://github.com/facebook/rocksdb/tree/v6.29.4.1 +[23] Source available at https://github.com/facebook/rocksdb/tree/v7.10.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 @@ -625,7 +625,7 @@ This private header is also used by Apple's open source * http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h ------------------------------------------------------------------------------------ -lib/org.rocksdb-rocksdbjni-7.9.2.jar is derived from leveldb, which is under the following license. +lib/org.rocksdb-rocksdbjni-7.10.2.jar is derived from leveldb, which is under the following license. Copyright (c) 2011 The LevelDB Authors. All rights reserved. diff --git a/pom.xml b/pom.xml index 7ecce464493..dbe7ec17270 100644 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,7 @@ 3.22.3 ${grpc.version} 0.9.11 - 7.9.2 + 7.10.2 3.3.0 1.7.32 2.0