Upgrade Apache BookKeeper Client to 4.11.1 (#8270)
Motivation
Upgrade Apache BookKeeper client to version 4.11.1 and RocksDB to 6.10.2 (needed by Bookie)
Modifications
Upgrade Apache BookKeeper client, fix a few build errors, due to the introduction of BookieServiceInfo structure (see BP-38).
Verifying this change
This change is already covered by existing tests
* Upgrade Apache BookKeeper to 4.11.1
* fix build
* fix LICENSE files
* Use BK 4.11.1
* Upgrade RocksDB to 6.10.2
* Fix license and upgrade maven assembly plugin
* update license
* restore bouncy castle license
* fix licenses
* Exclude BouncyCastle inherited from BK
Co-authored-by: Enrico Olivelli <enrico.olivelli@diennea.com>
Co-authored-by: Enrico Olivelli <eolivelli@apache.org>
diff --git a/distribution/io/pom.xml b/distribution/io/pom.xml
index 13b96d2..8e061ad 100644
--- a/distribution/io/pom.xml
+++ b/distribution/io/pom.xml
@@ -51,6 +51,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
<executions>
<execution>
<id>distro-assembly</id>
diff --git a/distribution/offloaders/pom.xml b/distribution/offloaders/pom.xml
index 1a12683..4aed9c1 100644
--- a/distribution/offloaders/pom.xml
+++ b/distribution/offloaders/pom.xml
@@ -45,6 +45,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
<executions>
<execution>
<id>distro-assembly</id>
diff --git a/distribution/server/licenses/LICENSE-bouncycastle.txt b/distribution/server/licenses/LICENSE-bouncycastle.txt
index 6f1dedf..10a3dd4 100644
--- a/distribution/server/licenses/LICENSE-bouncycastle.txt
+++ b/distribution/server/licenses/LICENSE-bouncycastle.txt
@@ -1,19 +1,7 @@
-The Bouncy Castle License
+Copyright (c) 2000 - 2020 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
-Copyright (c) 2000-2015 The Legion Of The Bouncy Castle Inc. (http://www.bouncycastle.org)
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
index 66af231..71c0e27 100644
--- a/distribution/server/pom.xml
+++ b/distribution/server/pom.xml
@@ -241,6 +241,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
<executions>
<execution>
<id>distro-assembly</id>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index fa6946e..b92caff 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -392,32 +392,35 @@
- org.apache.logging.log4j-log4j-web-2.10.0.jar
* Java Native Access JNA -- net.java.dev.jna-jna-4.2.0.jar
* BookKeeper
- - org.apache.bookkeeper-bookkeeper-common-4.10.0.jar
- - org.apache.bookkeeper-bookkeeper-common-allocator-4.10.0.jar
- - org.apache.bookkeeper-bookkeeper-proto-4.10.0.jar
- - org.apache.bookkeeper-bookkeeper-server-4.10.0.jar
- - org.apache.bookkeeper-bookkeeper-tools-framework-4.10.0.jar
- - org.apache.bookkeeper-circe-checksum-4.10.0.jar
- - org.apache.bookkeeper-cpu-affinity-4.10.0.jar
- - org.apache.bookkeeper-statelib-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-api-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-common-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-java-client-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-java-client-base-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-proto-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-server-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-service-api-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-service-impl-4.10.0.jar
- - org.apache.bookkeeper.http-http-server-4.10.0.jar
- - org.apache.bookkeeper.http-vertx-http-server-4.10.0.jar
- - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.10.0.jar
- - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.10.0.jar
- - org.apache.bookkeeper.tests-stream-storage-tests-common-4.10.0.jar
- - org.apache.distributedlog-distributedlog-common-4.10.0.jar
- - org.apache.distributedlog-distributedlog-core-4.10.0-tests.jar
- - org.apache.distributedlog-distributedlog-core-4.10.0.jar
- - org.apache.distributedlog-distributedlog-protocol-4.10.0.jar
- - org.apache.bookkeeper.stats-codahale-metrics-provider-4.10.0.jar
+ - org.apache.bookkeeper-bookkeeper-common-4.11.1.jar
+ - org.apache.bookkeeper-bookkeeper-common-allocator-4.11.1.jar
+ - org.apache.bookkeeper-bookkeeper-proto-4.11.1.jar
+ - org.apache.bookkeeper-bookkeeper-server-4.11.1.jar
+ - org.apache.bookkeeper-bookkeeper-tools-framework-4.11.1.jar
+ - org.apache.bookkeeper-circe-checksum-4.11.1.jar
+ - org.apache.bookkeeper-cpu-affinity-4.11.1.jar
+ - org.apache.bookkeeper-statelib-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-api-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-common-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-java-client-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-java-client-base-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-proto-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-server-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-service-api-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-service-impl-4.11.1.jar
+ - org.apache.bookkeeper.http-http-server-4.11.1.jar
+ - org.apache.bookkeeper.http-vertx-http-server-4.11.1.jar
+ - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.11.1.jar
+ - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.11.1.jar
+ - org.apache.bookkeeper.tests-stream-storage-tests-common-4.11.1.jar
+ - org.apache.distributedlog-distributedlog-common-4.11.1.jar
+ - org.apache.distributedlog-distributedlog-core-4.11.1-tests.jar
+ - org.apache.distributedlog-distributedlog-core-4.11.1.jar
+ - org.apache.distributedlog-distributedlog-protocol-4.11.1.jar
+ - org.apache.bookkeeper.stats-codahale-metrics-provider-4.11.1.jar
+ * Apache HTTP Client
+ - org.apache.httpcomponents-httpclient-4.5.5.jar
+ - org.apache.httpcomponents-httpcore-4.4.9.jar
* AirCompressor
- io.airlift-aircompressor-0.16.jar
* AsyncHttpClient
@@ -442,8 +445,9 @@
- org.eclipse.jetty.websocket-websocket-server-9.4.31.v20200723.jar
- org.eclipse.jetty.websocket-websocket-servlet-9.4.31.v20200723.jar
* SnakeYaml -- org.yaml-snakeyaml-1.26.jar
- * RocksDB - org.rocksdb-rocksdbjni-5.13.3.jar
+ * RocksDB - org.rocksdb-rocksdbjni-6.10.2.jar
* Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.1.3.jar
+ * Apache Thrifth - org.apache.thrift-libthrift-0.12.0.jar
* OkHttp
- com.squareup.okhttp-okhttp-2.5.0.jar
* Okio - com.squareup.okio-okio-1.13.0.jar
