You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/08/24 09:53:45 UTC

[pulsar] branch master updated: Upgrade bk version to resolve the BouncyCatle issue (#11759)

This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new e9292b3  Upgrade bk version to resolve the BouncyCatle issue (#11759)
e9292b3 is described below

commit e9292b31eaad6f9765f518c05c3912501f9a2983
Author: Yong Zhang <zh...@gmail.com>
AuthorDate: Tue Aug 24 17:52:58 2021 +0800

    Upgrade bk version to resolve the BouncyCatle issue (#11759)
    
    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
---
 distribution/server/src/assemble/LICENSE.bin.txt | 52 ++++++++++++------------
 pom.xml                                          |  2 +-
 pulsar-sql/presto-distribution/LICENSE           | 24 +++++------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index ca29f01..eff8cfe 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
@@ -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
diff --git a/pom.xml b/pom.xml
index 1f11163..c103656 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@ flexible messaging model and an intuitive client API.</description>
     <!-- apache commons -->
     <commons-compress.version>1.21</commons-compress.version>
 
-    <bookkeeper.version>4.14.1</bookkeeper.version>
+    <bookkeeper.version>4.14.2</bookkeeper.version>
     <zookeeper.version>3.6.3</zookeeper.version>
     <snappy.version>1.1.7</snappy.version> <!-- ZooKeeper server -->
     <dropwizardmetrics.version>3.2.5</dropwizardmetrics.version> <!-- ZooKeeper server -->
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index c19c0a1..3408fc2 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