From 746714183b8c070814b25a74f61762ff16cb1ad2 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Tue, 24 Aug 2021 11:21:47 +0800 Subject: [PATCH 1/3] Upgrade bk version to resolve the BouncyCatle issue --- Fixes #10937 *Motivation* The previours bk version was introduce an incompatible issue with BouncyCastle FIPS. BookKeeper already fix this and we should upgrade the version to resolve the issue. For more information: #10937 *Modifications* Upgrade bk to 4.14.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39b3943aacb42..ca781598990f8 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ flexible messaging model and an intuitive client API. 1.21 - 4.14.1 + 4.14.2 3.6.3 1.1.7 3.2.5 From 556c234f7155081096ea96cecc82919a92ddcf29 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Tue, 24 Aug 2021 13:46:12 +0800 Subject: [PATCH 2/3] Update the license file --- .../server/src/assemble/LICENSE.bin.txt | 50 +++++++++---------- pulsar-sql/presto-distribution/LICENSE | 24 ++++----- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 25cba87c56c97..4461aff430b31 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -390,31 +390,31 @@ The Apache Software License, Version 2.0 - org.apache.logging.log4j-log4j-1.2-api-2.14.0.jar * Java Native Access JNA -- net.java.dev.jna-jna-4.2.0.jar * BookKeeper - - org.apache.bookkeeper-bookkeeper-common-4.14.1.jar - - org.apache.bookkeeper-bookkeeper-common-allocator-4.14.1.jar - - org.apache.bookkeeper-bookkeeper-proto-4.14.1.jar - - org.apache.bookkeeper-bookkeeper-server-4.14.1.jar - - org.apache.bookkeeper-bookkeeper-tools-framework-4.14.1.jar - - org.apache.bookkeeper-circe-checksum-4.14.1.jar - - org.apache.bookkeeper-cpu-affinity-4.14.1.jar - - org.apache.bookkeeper-statelib-4.14.1.jar - - org.apache.bookkeeper-stream-storage-api-4.14.1.jar - - org.apache.bookkeeper-stream-storage-common-4.14.1.jar - - org.apache.bookkeeper-stream-storage-java-client-4.14.1.jar - - org.apache.bookkeeper-stream-storage-java-client-base-4.14.1.jar - - org.apache.bookkeeper-stream-storage-proto-4.14.1.jar - - org.apache.bookkeeper-stream-storage-server-4.14.1.jar - - org.apache.bookkeeper-stream-storage-service-api-4.14.1.jar - - org.apache.bookkeeper-stream-storage-service-impl-4.14.1.jar - - org.apache.bookkeeper.http-http-server-4.14.1.jar - - org.apache.bookkeeper.http-vertx-http-server-4.14.1.jar - - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.14.1.jar - - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.14.1.jar - - org.apache.distributedlog-distributedlog-common-4.14.1.jar - - org.apache.distributedlog-distributedlog-core-4.14.1-tests.jar - - org.apache.distributedlog-distributedlog-core-4.14.1.jar - - org.apache.distributedlog-distributedlog-protocol-4.14.1.jar - - org.apache.bookkeeper.stats-codahale-metrics-provider-4.14.1.jar + - org.apache.bookkeeper-bookkeeper-common-4.14.2.jar + - org.apache.bookkeeper-bookkeeper-common-allocator-4.14.2.jar + - org.apache.bookkeeper-bookkeeper-proto-4.14.2.jar + - org.apache.bookkeeper-bookkeeper-server-4.14.2.jar + - org.apache.bookkeeper-bookkeeper-tools-framework-4.14.2.jar + - org.apache.bookkeeper-circe-checksum-4.14.2.jar + - org.apache.bookkeeper-cpu-affinity-4.14.2.jar + - org.apache.bookkeeper-statelib-4.14.2.jar + - org.apache.bookkeeper-stream-storage-api-4.14.2.jar + - org.apache.bookkeeper-stream-storage-common-4.14.2.jar + - org.apache.bookkeeper-stream-storage-java-client-4.14.2.jar + - org.apache.bookkeeper-stream-storage-java-client-base-4.14.2.jar + - org.apache.bookkeeper-stream-storage-proto-4.14.2.jar + - org.apache.bookkeeper-stream-storage-server-4.14.2.jar + - org.apache.bookkeeper-stream-storage-service-api-4.14.2.jar + - org.apache.bookkeeper-stream-storage-service-impl-4.14.2.jar + - org.apache.bookkeeper.http-http-server-4.14.2.jar + - org.apache.bookkeeper.http-vertx-http-server-4.14.2.jar + - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.14.2.jar + - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.14.2.jar + - org.apache.distributedlog-distributedlog-common-4.14.2.jar + - org.apache.distributedlog-distributedlog-core-4.14.2-tests.jar + - org.apache.distributedlog-distributedlog-core-4.14.2.jar + - org.apache.distributedlog-distributedlog-protocol-4.14.2.jar + - org.apache.bookkeeper.stats-codahale-metrics-provider-4.14.2.jar * Apache HTTP Client - org.apache.httpcomponents-httpclient-4.5.13.jar - org.apache.httpcomponents-httpcore-4.4.13.jar diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index b22b42529a1f4..12157525cd1e5 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -414,18 +414,18 @@ The Apache Software License, Version 2.0 - async-http-client-2.12.1.jar - async-http-client-netty-utils-2.12.1.jar * Apache Bookkeeper - - bookkeeper-common-4.14.1.jar - - bookkeeper-common-allocator-4.14.1.jar - - bookkeeper-proto-4.14.1.jar - - bookkeeper-server-4.14.1.jar - - bookkeeper-stats-api-4.14.1.jar - - bookkeeper-tools-framework-4.14.1.jar - - circe-checksum-4.14.1.jar - - codahale-metrics-provider-4.14.1.jar - - cpu-affinity-4.14.1.jar - - http-server-4.14.1.jar - - prometheus-metrics-provider-4.14.1.jar - - codahale-metrics-provider-4.14.1.jar + - bookkeeper-common-4.14.2.jar + - bookkeeper-common-allocator-4.14.2.jar + - bookkeeper-proto-4.14.2.jar + - bookkeeper-server-4.14.2.jar + - bookkeeper-stats-api-4.14.2.jar + - bookkeeper-tools-framework-4.14.2.jar + - circe-checksum-4.14.2.jar + - codahale-metrics-provider-4.14.2.jar + - cpu-affinity-4.14.2.jar + - http-server-4.14.2.jar + - prometheus-metrics-provider-4.14.2.jar + - codahale-metrics-provider-4.14.2.jar * Apache Commons - commons-cli-1.2.jar - commons-codec-1.15.jar From 8b1204ca2f16d17df778a806155f97963cec7795 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Tue, 24 Aug 2021 14:47:46 +0800 Subject: [PATCH 3/3] Fix the license check CI --- distribution/server/src/assemble/LICENSE.bin.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 4461aff430b31..c911eab3af483 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -446,7 +446,7 @@ The Apache Software License, Version 2.0 * SnakeYaml -- org.yaml-snakeyaml-1.27.jar * RocksDB - org.rocksdb-rocksdbjni-6.10.2.jar * Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.5.1.jar - * Apache Thrifth - org.apache.thrift-libthrift-0.12.0.jar + * Apache Thrifth - org.apache.thrift-libthrift-0.14.2.jar * OkHttp3 - com.squareup.okhttp3-logging-interceptor-3.14.9.jar - com.squareup.okhttp3-okhttp-3.14.9.jar