This is an automated email from the ASF dual-hosted git repository.
yong pushed a commit to branch branch-2.8
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.8 by this push:
new 57dcac6 Fix the license issue introduced by cherry-pick
57dcac6 is described below
commit 57dcac64f03baecb580f46a6305a9b5e6d3a1a02
Author: Yong Zhang <[email protected]>
AuthorDate: Sat Jan 29 14:07:55 2022 +0800
Fix the license issue introduced by cherry-pick
---
distribution/server/src/assemble/LICENSE.bin.txt | 3 ++-
pulsar-sql/presto-distribution/LICENSE | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index c47458e..cd71b38 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -453,7 +453,7 @@ The Apache Software License, Version 2.0
- com.squareup.okhttp-okhttp-2.7.4.jar
- com.squareup.okhttp3-logging-interceptor-3.14.9.jar
- com.squareup.okhttp3-okhttp-3.14.9.jar
- * Okio - com.squareup.okio-okio-1.13.0.jar
+ * Okio - com.squareup.okio-okio-1.17.5.jar
* Javassist -- org.javassist-javassist-3.25.0-GA.jar
* gRPC
- io.grpc-grpc-all-1.42.1.jar
@@ -461,6 +461,7 @@ The Apache Software License, Version 2.0
- 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-okhttp-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
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index 93499f4..5136518 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -259,7 +259,7 @@ The Apache Software License, Version 2.0
- http2-http-client-transport-9.4.43.v20210629.jar
- jetty-alpn-client-9.4.43.v20210629.jar
- http2-server-9.4.43.v20210629.jar
- - jetty-alpn-java-client-9.4.43.v20210629.jar
+ - jetty-alpn-openjdk8-client-9.4.43.v20210629.jar
- jetty-client-9.4.43.v20210629.jar
- jetty-http-9.4.43.v20210629.jar
- jetty-io-9.4.43.v20210629.jar