You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by xi...@apache.org on 2023/02/27 09:52:22 UTC
[pulsar] branch revert/zk-3.8.1 created (now 053ba60a5a2)
This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a change to branch revert/zk-3.8.1
in repository https://gitbox.apache.org/repos/asf/pulsar.git
at 053ba60a5a2 redundant items in LICENSE
This branch includes the following new commits:
new fe92cbd4b95 Revert "[improve] Upgrade to zk 3.8.1 (#19425)"
new 053ba60a5a2 redundant items in LICENSE
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[pulsar] 01/02: Revert "[improve] Upgrade to zk 3.8.1 (#19425)"
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a commit to branch revert/zk-3.8.1
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit fe92cbd4b95b1e61e1ba23b8080f3b5ad1d00427
Author: xiangying <19...@qq.com>
AuthorDate: Mon Feb 27 17:51:04 2023 +0800
Revert "[improve] Upgrade to zk 3.8.1 (#19425)"
This reverts commit e32f9ad4ea5b7ac969e6000dc3c8f898e57d5fa7.
---
distribution/server/src/assemble/LICENSE.bin.txt | 6 +++---
pom.xml | 3 ++-
pulsar-sql/presto-distribution/LICENSE | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 42dd8ceb331..168cf425b0c 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -528,9 +528,9 @@ The Apache Software License, Version 2.0
- io.vertx-vertx-web-3.9.8.jar
- io.vertx-vertx-web-common-3.9.8.jar
* Apache ZooKeeper
- - org.apache.zookeeper-zookeeper-3.8.1.jar
- - org.apache.zookeeper-zookeeper-jute-3.8.1.jar
- - org.apache.zookeeper-zookeeper-prometheus-metrics-3.8.1.jar
+ - org.apache.zookeeper-zookeeper-3.6.3.jar
+ - org.apache.zookeeper-zookeeper-jute-3.6.3.jar
+ - org.apache.zookeeper-zookeeper-prometheus-metrics-3.6.3.jar
* Snappy Java
- org.xerial.snappy-snappy-java-1.1.7.jar
* Google HTTP Client
diff --git a/pom.xml b/pom.xml
index 59fa88a25b2..8c23536abda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@ flexible messaging model and an intuitive client API.</description>
<commons-compress.version>1.21</commons-compress.version>
<bookkeeper.version>4.14.5</bookkeeper.version>
- <zookeeper.version>3.8.1</zookeeper.version>
+ <zookeeper.version>3.6.3</zookeeper.version>
<commons-cli.version>1.5.0</commons-cli.version>
<snappy.version>1.1.7</snappy.version> <!-- ZooKeeper server -->
<dropwizardmetrics.version>3.2.5</dropwizardmetrics.version> <!-- ZooKeeper server -->
@@ -2451,4 +2451,5 @@ flexible messaging model and an intuitive client API.</description>
</snapshots>
</repository>
</repositories>
+
</project>
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 2ed25cd3b3f..5fae3e01845 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -476,8 +476,8 @@ The Apache Software License, Version 2.0
- memory-0.8.3.jar
- sketches-core-0.8.3.jar
* Apache Zookeeper
- - zookeeper-3.8.1.jar
- - zookeeper-jute-3.8.1.jar
+ - zookeeper-3.6.3.jar
+ - zookeeper-jute-3.6.3.jar
* Apache Yetus Audience Annotations
- audience-annotations-0.5.0.jar
* Swagger
[pulsar] 02/02: redundant items in LICENSE
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a commit to branch revert/zk-3.8.1
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 053ba60a5a2528f29c33abfa6e3d399fc033eadc
Author: xiangying <19...@qq.com>
AuthorDate: Mon Feb 27 17:52:06 2023 +0800
redundant items in LICENSE
---
distribution/server/src/assemble/LICENSE.bin.txt | 6 ------
pulsar-sql/presto-distribution/LICENSE | 6 ------
2 files changed, 12 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 168cf425b0c..3265c469fd4 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -364,9 +364,6 @@ The Apache Software License, Version 2.0
- io.netty-netty-handler-proxy-4.1.87.Final.jar
- io.netty-netty-resolver-4.1.87.Final.jar
- io.netty-netty-resolver-dns-4.1.87.Final.jar
- - io.netty-netty-resolver-dns-classes-macos-4.1.87.Final.jar
- - io.netty-netty-resolver-dns-native-macos-4.1.87.Final-osx-aarch_64.jar
- - io.netty-netty-resolver-dns-native-macos-4.1.87.Final-osx-x86_64.jar
- io.netty-netty-transport-4.1.87.Final.jar
- io.netty-netty-transport-classes-epoll-4.1.87.Final.jar
- io.netty-netty-transport-native-epoll-4.1.87.Final-linux-x86_64.jar
@@ -380,9 +377,6 @@ The Apache Software License, Version 2.0
- io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar
- io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar
- io.netty-netty-tcnative-classes-2.0.56.Final.jar
- - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.17.Final.jar
- - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.17.Final-linux-x86_64.jar
- - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.17.Final-linux-aarch_64.jar
* Prometheus client
- io.prometheus-simpleclient-0.5.0.jar
- io.prometheus-simpleclient_common-0.5.0.jar
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 5fae3e01845..b44d43f7cb5 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -244,9 +244,6 @@ The Apache Software License, Version 2.0
- netty-reactive-streams-2.0.6.jar
- netty-resolver-4.1.87.Final.jar
- netty-resolver-dns-4.1.87.Final.jar
- - netty-resolver-dns-classes-macos-4.1.87.Final.jar
- - netty-resolver-dns-native-macos-4.1.87.Final-osx-aarch_64.jar
- - netty-resolver-dns-native-macos-4.1.87.Final-osx-x86_64.jar
- netty-tcnative-boringssl-static-2.0.56.Final.jar
- netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar
- netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar
@@ -260,9 +257,6 @@ The Apache Software License, Version 2.0
- netty-transport-native-unix-common-4.1.87.Final.jar
- netty-transport-native-unix-common-4.1.87.Final-linux-x86_64.jar
- netty-codec-http2-4.1.87.Final.jar
- - netty-incubator-transport-classes-io_uring-0.0.17.Final.jar
- - netty-incubator-transport-native-io_uring-0.0.17.Final-linux-x86_64.jar
- - netty-incubator-transport-native-io_uring-0.0.17.Final-linux-aarch_64.jar
* GRPC
- grpc-api-1.45.1.jar
- grpc-context-1.45.1.jar