Skip to content

Commit

Permalink
Upgrade rocksDB version to 6.29.4.1 (apache#3947)
Browse files Browse the repository at this point in the history
Descriptions of the changes in this PR:

### Motivation
Upgrade the RocksDB version to 6.29.4.1 to make sure BookKeeper 4.16.0 can roll back 4.14.x

Refer to: apache#3734 (comment)

### Changes

(Describe: what changes you have made)

Master Issue: #<master-issue-number>

> ---
> In order to uphold a high standard for quality for code contributions, Apache BookKeeper runs various precommit
> checks for pull requests. A pull request can only be merged when it passes precommit checks.
>
> ---
> Be sure to do all of the following to help us incorporate your contribution
> quickly and easily:
>
> If this PR is a BookKeeper Proposal (BP):
>
> - [ ] Make sure the PR title is formatted like:
>     `<BP-#>: Description of bookkeeper proposal`
>     `e.g. BP-1: 64 bits ledger is support`
> - [ ] Attach the master issue link in the description of this PR.
> - [ ] Attach the google doc link if the BP is written in Google Doc.
>
> Otherwise:
>
> - [ ] Make sure the PR title is formatted like:
>     `<Issue #>: Description of pull request`
>     `e.g. Issue 123: Description ...`
> - [ ] Make sure tests pass via `mvn clean apache-rat:check install spotbugs:check`.
> - [ ] Replace `<Issue #>` in the title with the actual Issue number.
>
> ---

(cherry picked from commit c3a60bb)
  • Loading branch information
hangc0276 authored and dlg99 committed Jun 28, 2024
1 parent 8aa8b3d commit a897e3a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ Apache Software License, Version 2.
- 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.rocksdb-rocksdbjni-6.16.4.jar [23]
- lib/org.rocksdb-rocksdbjni-6.29.4.1.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]
Expand Down Expand Up @@ -330,7 +330,7 @@ Apache Software License, Version 2.
[20] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-lang.git;a=shortlog;h=refs/tags/LANG_3_6
[21] Source available at https://github.com/apache/zookeeper/tree/release-3.6.2
[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.16.4
[23] Source available at https://github.com/facebook/rocksdb/tree/v6.29.4.1
[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
Expand Down Expand Up @@ -586,7 +586,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-6.16.4.jar is derived from leveldb, which is under the following license.
lib/org.rocksdb-rocksdbjni-6.29.4.1.jar is derived from leveldb, which is under the following license.

Copyright (c) 2011 The LevelDB Authors. All rights reserved.

Expand Down
6 changes: 3 additions & 3 deletions bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ Apache Software License, Version 2.
- 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.rocksdb-rocksdbjni-6.16.4.jar [23]
- lib/org.rocksdb-rocksdbjni-6.29.4.1.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]
Expand Down Expand Up @@ -327,7 +327,7 @@ Apache Software License, Version 2.
[20] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-lang.git;a=shortlog;h=refs/tags/LANG_3_6
[21] Source available at https://github.com/apache/zookeeper/tree/release-3.6.2
[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.16.4
[23] Source available at https://github.com/facebook/rocksdb/tree/v6.29.4.1
[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
Expand Down Expand Up @@ -582,7 +582,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-6.16.4.jar is derived from leveldb, which is under the following license.
lib/org.rocksdb-rocksdbjni-6.29.4.1.jar is derived from leveldb, which is under the following license.

Copyright (c) 2011 The LevelDB Authors. All rights reserved.

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<protoc3.version>3.19.6</protoc3.version>
<protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
<reflections.version>0.9.11</reflections.version>
<rocksdb.version>6.16.4</rocksdb.version>
<rocksdb.version>6.29.4.1</rocksdb.version>
<shrinkwrap.version>3.0.1</shrinkwrap.version>
<slf4j.version>1.7.36</slf4j.version>
<snakeyaml.version>1.32</snakeyaml.version>
Expand Down

0 comments on commit a897e3a

Please sign in to comment.