From 19f5d11a2c743f6830c1be67b136506e722d291f Mon Sep 17 00:00:00 2001 From: Massimiliano Mirelli Date: Tue, 25 Jan 2022 13:51:01 +0200 Subject: [PATCH] Revert "Upgrade BK to 4.14.4 and Grpc to 1.42.1 (#13714)" This reverts commit 104adbe66ae327305227ce8f57ba3bb95ce83492. --- .../server/src/assemble/LICENSE.bin.txt | 97 +++++++++---------- pom.xml | 4 +- pulsar-sql/presto-distribution/LICENSE | 24 ++--- 3 files changed, 60 insertions(+), 65 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 4ee7e26420d73..13606a1996553 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -322,7 +322,7 @@ The Apache Software License, Version 2.0 - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.12.6.jar * Caffeine -- com.github.ben-manes.caffeine-caffeine-2.9.1.jar * Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar - * Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-2.0.1.jar + * Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-1.17.0.jar * Bitbucket -- org.bitbucket.b_c-jose4j-0.7.6.jar * Gson - com.google.code.gson-gson-2.8.9.jar @@ -392,31 +392,31 @@ The Apache Software License, Version 2.0 - org.apache.logging.log4j-log4j-1.2-api-2.17.1.jar * Java Native Access JNA -- net.java.dev.jna-jna-4.2.0.jar * BookKeeper - - org.apache.bookkeeper-bookkeeper-common-4.14.4.jar - - org.apache.bookkeeper-bookkeeper-common-allocator-4.14.4.jar - - org.apache.bookkeeper-bookkeeper-proto-4.14.4.jar - - org.apache.bookkeeper-bookkeeper-server-4.14.4.jar - - org.apache.bookkeeper-bookkeeper-tools-framework-4.14.4.jar - - org.apache.bookkeeper-circe-checksum-4.14.4.jar - - org.apache.bookkeeper-cpu-affinity-4.14.4.jar - - org.apache.bookkeeper-statelib-4.14.4.jar - - org.apache.bookkeeper-stream-storage-api-4.14.4.jar - - org.apache.bookkeeper-stream-storage-common-4.14.4.jar - - org.apache.bookkeeper-stream-storage-java-client-4.14.4.jar - - org.apache.bookkeeper-stream-storage-java-client-base-4.14.4.jar - - org.apache.bookkeeper-stream-storage-proto-4.14.4.jar - - org.apache.bookkeeper-stream-storage-server-4.14.4.jar - - org.apache.bookkeeper-stream-storage-service-api-4.14.4.jar - - org.apache.bookkeeper-stream-storage-service-impl-4.14.4.jar - - org.apache.bookkeeper.http-http-server-4.14.4.jar - - org.apache.bookkeeper.http-vertx-http-server-4.14.4.jar - - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.14.4.jar - - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.14.4.jar - - org.apache.distributedlog-distributedlog-common-4.14.4.jar - - org.apache.distributedlog-distributedlog-core-4.14.4-tests.jar - - org.apache.distributedlog-distributedlog-core-4.14.4.jar - - org.apache.distributedlog-distributedlog-protocol-4.14.4.jar - - org.apache.bookkeeper.stats-codahale-metrics-provider-4.14.4.jar + - org.apache.bookkeeper-bookkeeper-common-4.14.3.jar + - org.apache.bookkeeper-bookkeeper-common-allocator-4.14.3.jar + - org.apache.bookkeeper-bookkeeper-proto-4.14.3.jar + - org.apache.bookkeeper-bookkeeper-server-4.14.3.jar + - org.apache.bookkeeper-bookkeeper-tools-framework-4.14.3.jar + - org.apache.bookkeeper-circe-checksum-4.14.3.jar + - org.apache.bookkeeper-cpu-affinity-4.14.3.jar + - org.apache.bookkeeper-statelib-4.14.3.jar + - org.apache.bookkeeper-stream-storage-api-4.14.3.jar + - org.apache.bookkeeper-stream-storage-common-4.14.3.jar + - org.apache.bookkeeper-stream-storage-java-client-4.14.3.jar + - org.apache.bookkeeper-stream-storage-java-client-base-4.14.3.jar + - org.apache.bookkeeper-stream-storage-proto-4.14.3.jar + - org.apache.bookkeeper-stream-storage-server-4.14.3.jar + - org.apache.bookkeeper-stream-storage-service-api-4.14.3.jar + - org.apache.bookkeeper-stream-storage-service-impl-4.14.3.jar + - org.apache.bookkeeper.http-http-server-4.14.3.jar + - org.apache.bookkeeper.http-vertx-http-server-4.14.3.jar + - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.14.3.jar + - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.14.3.jar + - org.apache.distributedlog-distributedlog-common-4.14.3.jar + - org.apache.distributedlog-distributedlog-core-4.14.3-tests.jar + - org.apache.distributedlog-distributedlog-core-4.14.3.jar + - org.apache.distributedlog-distributedlog-protocol-4.14.3.jar + - org.apache.bookkeeper.stats-codahale-metrics-provider-4.14.3.jar * Apache HTTP Client - org.apache.httpcomponents-httpclient-4.5.13.jar - org.apache.httpcomponents-httpcore-4.4.13.jar @@ -461,22 +461,20 @@ The Apache Software License, Version 2.0 - org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.4.32.jar - org.jetbrains-annotations-13.0.jar * gRPC - - io.grpc-grpc-all-1.42.1.jar - - io.grpc-grpc-auth-1.42.1.jar - - io.grpc-grpc-context-1.42.1.jar - - io.grpc-grpc-core-1.42.1.jar - - io.grpc-grpc-netty-1.42.1.jar - - io.grpc-grpc-protobuf-1.42.1.jar - - io.grpc-grpc-protobuf-lite-1.42.1.jar - - io.grpc-grpc-stub-1.42.1.jar - - io.grpc-grpc-alts-1.42.1.jar - - io.grpc-grpc-api-1.42.1.jar - - io.grpc-grpc-grpclb-1.42.1.jar - - io.grpc-grpc-netty-shaded-1.42.1.jar - - io.grpc-grpc-services-1.42.1.jar - - io.grpc-grpc-xds-1.42.1.jar - - io.grpc-grpc-rls-1.42.1.jar - - com.google.auto.service-auto-service-annotations-1.0.jar + - io.grpc-grpc-all-1.33.0.jar + - io.grpc-grpc-auth-1.33.0.jar + - io.grpc-grpc-context-1.33.0.jar + - io.grpc-grpc-core-1.33.0.jar + - io.grpc-grpc-netty-1.33.0.jar + - io.grpc-grpc-protobuf-1.33.0.jar + - io.grpc-grpc-protobuf-lite-1.33.0.jar + - io.grpc-grpc-stub-1.33.0.jar + - io.grpc-grpc-alts-1.33.0.jar + - io.grpc-grpc-api-1.33.0.jar + - io.grpc-grpc-grpclb-1.33.0.jar + - io.grpc-grpc-netty-shaded-1.33.0.jar + - io.grpc-grpc-services-1.33.0.jar + - io.grpc-grpc-xds-1.33.0.jar * Perfmark - io.perfmark-perfmark-api-0.19.0.jar * OpenCensus @@ -524,18 +522,15 @@ The Apache Software License, Version 2.0 * Snappy Java - org.xerial.snappy-snappy-java-1.1.7.jar * Google HTTP Client - - com.google.http-client-google-http-client-jackson2-1.38.0.jar - - com.google.http-client-google-http-client-1.38.0.jar - - com.google.auto.value-auto-value-annotations-1.7.4.jar - - com.google.re2j-re2j-1.5.jar - * Jetcd - - io.etcd-jetcd-common-0.5.11.jar - - io.etcd-jetcd-core-0.5.11.jar + - com.google.http-client-google-http-client-jackson2-1.34.0.jar + - com.google.http-client-google-http-client-1.34.0.jar + - com.google.auto.value-auto-value-annotations-1.7.jar + - com.google.re2j-re2j-1.2.jar BSD 3-clause "New" or "Revised" License * Google auth library - - com.google.auth-google-auth-library-credentials-0.22.2.jar -- licenses/LICENSE-google-auth-library.txt - - com.google.auth-google-auth-library-oauth2-http-0.22.2.jar -- licenses/LICENSE-google-auth-library.txt + - com.google.auth-google-auth-library-credentials-0.20.0.jar -- licenses/LICENSE-google-auth-library.txt + - com.google.auth-google-auth-library-oauth2-http-0.20.0.jar -- licenses/LICENSE-google-auth-library.txt * LevelDB -- (included in org.rocksdb.*.jar) -- licenses/LICENSE-LevelDB.txt * JSR305 -- com.google.code.findbugs-jsr305-3.0.2.jar -- licenses/LICENSE-JSR305.txt * JLine -- jline-jline-2.14.6.jar -- licenses/LICENSE-JLine.txt diff --git a/pom.xml b/pom.xml index 356c6e381ce28..6aa7b8f73a62f 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ flexible messaging model and an intuitive client API. 1.21 - 4.14.4 + 4.14.3 3.6.3 1.1.7 3.2.5 @@ -131,7 +131,7 @@ flexible messaging model and an intuitive client API. 0.5.0 3.16.1 ${protobuf3.version} - 1.42.1 + 1.33.0 0.19.0 ${grpc.version} 2.8.9 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index e3775939a801e..6bfd6b0b6f373 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -430,18 +430,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.4.jar - - bookkeeper-common-allocator-4.14.4.jar - - bookkeeper-proto-4.14.4.jar - - bookkeeper-server-4.14.4.jar - - bookkeeper-stats-api-4.14.4.jar - - bookkeeper-tools-framework-4.14.4.jar - - circe-checksum-4.14.4.jar - - codahale-metrics-provider-4.14.4.jar - - cpu-affinity-4.14.4.jar - - http-server-4.14.4.jar - - prometheus-metrics-provider-4.14.4.jar - - codahale-metrics-provider-4.14.4.jar + - bookkeeper-common-4.14.3.jar + - bookkeeper-common-allocator-4.14.3.jar + - bookkeeper-proto-4.14.3.jar + - bookkeeper-server-4.14.3.jar + - bookkeeper-stats-api-4.14.3.jar + - bookkeeper-tools-framework-4.14.3.jar + - circe-checksum-4.14.3.jar + - codahale-metrics-provider-4.14.3.jar + - cpu-affinity-4.14.3.jar + - http-server-4.14.3.jar + - prometheus-metrics-provider-4.14.3.jar + - codahale-metrics-provider-4.14.3.jar * Apache Commons - commons-cli-1.2.jar - commons-codec-1.15.jar