Skip to content

Commit

Permalink
Revert "Upgrade BK to 4.14.4 and Grpc to 1.42.1 (apache#13714)"
Browse files Browse the repository at this point in the history
This reverts commit 104adbe.
  • Loading branch information
MMirelli committed Jan 25, 2022
1 parent bd7e2a3 commit 19f5d11
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 65 deletions.
97 changes: 46 additions & 51 deletions distribution/server/src/assemble/LICENSE.bin.txt
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -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.4</bookkeeper.version>
<bookkeeper.version>4.14.3</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 -->
Expand Down Expand Up @@ -131,7 +131,7 @@ flexible messaging model and an intuitive client API.</description>
<typetools.version>0.5.0</typetools.version>
<protobuf3.version>3.16.1</protobuf3.version>
<protoc3.version>${protobuf3.version}</protoc3.version>
<grpc.version>1.42.1</grpc.version>
<grpc.version>1.33.0</grpc.version>
<perfmark.version>0.19.0</perfmark.version>
<protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
<gson.version>2.8.9</gson.version>
Expand Down
24 changes: 12 additions & 12 deletions pulsar-sql/presto-distribution/LICENSE
Expand Up @@ -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
Expand Down

0 comments on commit 19f5d11

Please sign in to comment.