This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new ba05dc1 [branch-2.6] update to stable version of bk 4.11.1 (#8604)
ba05dc1 is described below
commit ba05dc1b730f1dbf587683613413634481f31996
Author: Jia Zhai <[email protected]>
AuthorDate: Wed Nov 18 20:20:51 2020 +0800
[branch-2.6] update to stable version of bk 4.11.1 (#8604)
It would be great to update branch-2.6 to a stable version of bk. so some
issues could be fixed.
e.g. apache/bookkeeper#2333
---
.github/workflows/ci-license.yaml | 3 +-
distribution/io/pom.xml | 1 +
distribution/offloaders/pom.xml | 1 +
.../server/licenses/LICENSE-bouncycastle.txt | 20 ++-----
distribution/server/pom.xml | 1 +
distribution/server/src/assemble/LICENSE.bin.txt | 59 ++++++++++----------
.../bookkeeper/test/BookKeeperClusterTestCase.java | 4 +-
pom.xml | 12 +++-
.../org/apache/pulsar/PulsarBrokerStarter.java | 3 +-
.../pulsar/broker/service/RackAwareTest.java | 3 +-
pulsar-functions/runtime-all/pom.xml | 1 +
pulsar-sql/presto-distribution/LICENSE | 64 ++++++++++++----------
pulsar-sql/presto-distribution/pom.xml | 32 +++++++++++
pulsar-sql/presto-pulsar-plugin/pom.xml | 1 +
.../pulsar/zookeeper/LocalBookkeeperEnsemble.java | 9 +--
src/check-binary-license | 2 +-
16 files changed, 132 insertions(+), 84 deletions(-)
diff --git a/.github/workflows/ci-license.yaml
b/.github/workflows/ci-license.yaml
index 7d70304..9d3289b 100644
--- a/.github/workflows/ci-license.yaml
+++ b/.github/workflows/ci-license.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-2.6
push:
branches:
- branch-*
@@ -53,6 +54,6 @@ jobs:
- name: build and check license
run: mvn -B -ntp -DskipTests license:check install
-
+
- name: license check
run: src/check-binary-license
./distribution/server/target/apache-pulsar-*-bin.tar.gz
diff --git a/distribution/io/pom.xml b/distribution/io/pom.xml
index 338001d..26b16a9 100644
--- a/distribution/io/pom.xml
+++ b/distribution/io/pom.xml
@@ -51,6 +51,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
<executions>
<execution>
<id>distro-assembly</id>
diff --git a/distribution/offloaders/pom.xml b/distribution/offloaders/pom.xml
index 7b7b8cd..e3e36c3 100644
--- a/distribution/offloaders/pom.xml
+++ b/distribution/offloaders/pom.xml
@@ -45,6 +45,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
<executions>
<execution>
<id>distro-assembly</id>
diff --git a/distribution/server/licenses/LICENSE-bouncycastle.txt
b/distribution/server/licenses/LICENSE-bouncycastle.txt
index 6f1dedf..10a3dd4 100644
--- a/distribution/server/licenses/LICENSE-bouncycastle.txt
+++ b/distribution/server/licenses/LICENSE-bouncycastle.txt
@@ -1,19 +1,7 @@
-The Bouncy Castle License
+Copyright (c) 2000 - 2020 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
-Copyright (c) 2000-2015 The Legion Of The Bouncy Castle Inc.
(http://www.bouncycastle.org)
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software
-and associated documentation files (the "Software"), to deal in the Software
without restriction,
-including without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software
is furnished to do so,
-subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-The above copyright notice and this permission notice shall be included in all
copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER
-DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
\ No newline at end of file
diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
index 843114a..18b87d6 100644
--- a/distribution/server/pom.xml
+++ b/distribution/server/pom.xml
@@ -233,6 +233,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
<executions>
<execution>
<id>distro-assembly</id>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index 3352047..d5e82ee 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -371,7 +371,6 @@ The Apache Software License, Version 2.0
- io.netty-netty-transport-native-epoll-4.1.48.Final.jar
- io.netty-netty-transport-native-unix-common-4.1.48.Final.jar
- io.netty-netty-transport-native-unix-common-4.1.48.Final-linux-x86_64.jar
- - io.netty-netty-transport-native-kqueue-4.1.48.Final-osx-x86_64.jar
- io.netty-netty-tcnative-boringssl-static-2.0.30.Final.jar
* Prometheus client
- io.prometheus-simpleclient-0.5.0.jar
@@ -395,32 +394,35 @@ The Apache Software License, Version 2.0
- org.apache.logging.log4j-log4j-web-2.10.0.jar
* Java Native Access JNA -- net.java.dev.jna-jna-4.2.0.jar
* BookKeeper
- - org.apache.bookkeeper-bookkeeper-common-4.10.0.jar
- - org.apache.bookkeeper-bookkeeper-common-allocator-4.10.0.jar
- - org.apache.bookkeeper-bookkeeper-proto-4.10.0.jar
- - org.apache.bookkeeper-bookkeeper-server-4.10.0.jar
- - org.apache.bookkeeper-bookkeeper-tools-framework-4.10.0.jar
- - org.apache.bookkeeper-circe-checksum-4.10.0.jar
- - org.apache.bookkeeper-cpu-affinity-4.10.0.jar
- - org.apache.bookkeeper-statelib-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-api-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-common-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-java-client-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-java-client-base-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-proto-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-server-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-service-api-4.10.0.jar
- - org.apache.bookkeeper-stream-storage-service-impl-4.10.0.jar
- - org.apache.bookkeeper.http-http-server-4.10.0.jar
- - org.apache.bookkeeper.http-vertx-http-server-4.10.0.jar
- - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.10.0.jar
- - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.10.0.jar
- - org.apache.bookkeeper.tests-stream-storage-tests-common-4.10.0.jar
- - org.apache.distributedlog-distributedlog-common-4.10.0.jar
- - org.apache.distributedlog-distributedlog-core-4.10.0-tests.jar
- - org.apache.distributedlog-distributedlog-core-4.10.0.jar
- - org.apache.distributedlog-distributedlog-protocol-4.10.0.jar
- - org.apache.bookkeeper.stats-codahale-metrics-provider-4.10.0.jar
+ - org.apache.bookkeeper-bookkeeper-common-4.11.1.jar
+ - org.apache.bookkeeper-bookkeeper-common-allocator-4.11.1.jar
+ - org.apache.bookkeeper-bookkeeper-proto-4.11.1.jar
+ - org.apache.bookkeeper-bookkeeper-server-4.11.1.jar
+ - org.apache.bookkeeper-bookkeeper-tools-framework-4.11.1.jar
+ - org.apache.bookkeeper-circe-checksum-4.11.1.jar
+ - org.apache.bookkeeper-cpu-affinity-4.11.1.jar
+ - org.apache.bookkeeper-statelib-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-api-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-common-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-java-client-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-java-client-base-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-proto-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-server-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-service-api-4.11.1.jar
+ - org.apache.bookkeeper-stream-storage-service-impl-4.11.1.jar
+ - org.apache.bookkeeper.http-http-server-4.11.1.jar
+ - org.apache.bookkeeper.http-vertx-http-server-4.11.1.jar
+ - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.11.1.jar
+ - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.11.1.jar
+ - org.apache.bookkeeper.tests-stream-storage-tests-common-4.11.1.jar
+ - org.apache.distributedlog-distributedlog-common-4.11.1.jar
+ - org.apache.distributedlog-distributedlog-core-4.11.1-tests.jar
+ - org.apache.distributedlog-distributedlog-core-4.11.1.jar
+ - org.apache.distributedlog-distributedlog-protocol-4.11.1.jar
+ - org.apache.bookkeeper.stats-codahale-metrics-provider-4.11.1.jar
+ * Apache HTTP Client
+ - org.apache.httpcomponents-httpclient-4.5.5.jar
+ - org.apache.httpcomponents-httpcore-4.4.9.jar
* AirCompressor
- io.airlift-aircompressor-0.16.jar
* AsyncHttpClient
@@ -448,7 +450,8 @@ The Apache Software License, Version 2.0
- org.eclipse.jetty.websocket-websocket-server-9.4.33.v20201020.jar
- org.eclipse.jetty.websocket-websocket-servlet-9.4.33.v20201020.jar
* SnakeYaml -- org.yaml-snakeyaml-1.26.jar
- * RocksDB - org.rocksdb-rocksdbjni-5.13.3.jar
+ * RocksDB - org.rocksdb-rocksdbjni-6.10.2.jar
+ * Apache Thrifth - org.apache.thrift-libthrift-0.12.0.jar
* HttpClient
- org.apache.httpcomponents-httpclient-4.5.5.jar
- org.apache.httpcomponents-httpcore-4.4.9.jar
diff --git
a/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
b/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
index 96aaff8..cb44711 100644
---
a/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
+++
b/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
@@ -38,6 +38,7 @@ import java.util.Map.Entry;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.function.Supplier;
import org.apache.bookkeeper.bookie.Bookie;
import org.apache.bookkeeper.bookie.BookieException;
import org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage;
@@ -46,6 +47,7 @@ import org.apache.bookkeeper.common.allocator.PoolingPolicy;
import org.apache.bookkeeper.conf.AbstractConfiguration;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.discover.BookieServiceInfo;
import org.apache.bookkeeper.metastore.InMemoryMetaStore;
import org.apache.bookkeeper.net.BookieSocketAddress;
import org.apache.bookkeeper.proto.BookieServer;
@@ -471,7 +473,7 @@ public abstract class BookKeeperClusterTestCase {
protected BookieServer startBookie(ServerConfiguration conf, final Bookie
b) throws Exception {
BookieServer server = new BookieServer(conf) {
@Override
- protected Bookie newBookie(ServerConfiguration conf,
ByteBufAllocator allocator)
+ protected Bookie newBookie(ServerConfiguration conf,
ByteBufAllocator allocator, Supplier<BookieServiceInfo>
bookieServiceInfoProvider)
throws IOException, KeeperException, InterruptedException,
BookieException {
return b;
}
diff --git a/pom.xml b/pom.xml
index 8b7a15b..f161674 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,7 +155,7 @@ flexible messaging model and an intuitive client
API.</description>
<!-- apache commons -->
<commons-compress.version>1.19</commons-compress.version>
- <bookkeeper.version>4.10.0</bookkeeper.version>
+ <bookkeeper.version>4.11.1</bookkeeper.version>
<zookeeper.version>3.5.7</zookeeper.version>
<netty.version>4.1.48.Final</netty.version>
<netty-tc-native.version>2.0.30.Final</netty-tc-native.version>
@@ -166,7 +166,7 @@ flexible messaging model and an intuitive client
API.</description>
<prometheus.version>0.5.0</prometheus.version>
<aspectj.version>1.9.2</aspectj.version>
<vertx.version>3.5.3</vertx.version>
- <rocksdb.version>5.13.3</rocksdb.version>
+ <rocksdb.version>6.10.2</rocksdb.version>
<slf4j.version>1.7.25</slf4j.version>
<commons.collections.version>3.2.2</commons.collections.version>
<log4j2.version>2.10.0</log4j2.version>
@@ -333,6 +333,10 @@ flexible messaging model and an intuitive client
API.</description>
<version>${bookkeeper.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
@@ -1237,6 +1241,10 @@ flexible messaging model and an intuitive client
API.</description>
<classifier>tests</classifier>
<exclusions>
<exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java
b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java
index e988df1..44d1d78 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java
@@ -44,6 +44,7 @@ import org.apache.bookkeeper.proto.BookieServer;
import org.apache.bookkeeper.replication.AutoRecoveryMain;
import org.apache.bookkeeper.stats.StatsProvider;
import org.apache.bookkeeper.common.util.ReflectionUtils;
+import org.apache.bookkeeper.discover.BookieServiceInfo;
import org.apache.bookkeeper.util.DirectMemoryUtils;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.pulsar.broker.PulsarServerException;
@@ -249,7 +250,7 @@ public class PulsarBrokerStarter {
if (starterArguments.runBookie) {
checkNotNull(bookieConfig, "No ServerConfiguration for
Bookie");
checkNotNull(bookieStatsProvider, "No Stats Provider for
Bookie");
- bookieServer = new BookieServer(bookieConfig,
bookieStatsProvider.getStatsLogger(""));
+ bookieServer = new BookieServer(bookieConfig,
bookieStatsProvider.getStatsLogger(""), BookieServiceInfo.NO_INFO);
} else {
bookieServer = null;
}
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java
index bcca644a..026afc2 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java
@@ -29,6 +29,7 @@ import org.apache.bookkeeper.client.BookKeeper;
import org.apache.bookkeeper.client.BookKeeper.DigestType;
import org.apache.bookkeeper.client.LedgerHandle;
import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.discover.BookieServiceInfo;
import org.apache.bookkeeper.net.BookieSocketAddress;
import org.apache.bookkeeper.proto.BookieServer;
import org.apache.bookkeeper.stats.NullStatsLogger;
@@ -70,7 +71,7 @@ public class RackAwareTest extends BkEnsemblesTestBase {
String addr = String.format("10.0.0.%d", i + 1);
conf.setAdvertisedAddress(addr);
- BookieServer bs = new BookieServer(conf, NullStatsLogger.INSTANCE);
+ BookieServer bs = new BookieServer(conf, NullStatsLogger.INSTANCE,
BookieServiceInfo.NO_INFO);
bs.start();
bookies.add(bs);
diff --git a/pulsar-functions/runtime-all/pom.xml
b/pulsar-functions/runtime-all/pom.xml
index d943c85..60ad35f 100644
--- a/pulsar-functions/runtime-all/pom.xml
+++ b/pulsar-functions/runtime-all/pom.xml
@@ -80,6 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
<configuration>
<!-- get all project dependencies -->
<descriptorRefs>
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index 8ac96c7..23b2f95 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -237,18 +237,14 @@ The Apache Software License, Version 2.0
- netty-codec-4.1.48.Final.jar
- netty-codec-dns-4.1.48.Final.jar
- netty-codec-http-4.1.48.Final.jar
- - netty-codec-socks-4.1.48.Final.jar
- netty-common-4.1.48.Final.jar
- netty-handler-4.1.48.Final.jar
- - netty-handler-proxy-4.1.48.Final.jar
- netty-reactive-streams-2.0.4.jar
- netty-resolver-4.1.48.Final.jar
- netty-resolver-dns-4.1.48.Final.jar
- netty-tcnative-boringssl-static-2.0.30.Final.jar
- netty-transport-4.1.48.Final.jar
- - netty-transport-native-epoll-4.1.48.Final.jar
- netty-transport-native-epoll-4.1.48.Final-linux-x86_64.jar
- - netty-transport-native-kqueue-4.1.48.Final-osx-x86_64.jar
- netty-transport-native-unix-common-4.1.48.Final.jar
- netty-transport-native-unix-common-4.1.48.Final-linux-x86_64.jar
* Joda Time
@@ -309,6 +305,9 @@ The Apache Software License, Version 2.0
- stats-0.195.jar
- trace-token-0.195.jar
- units-1.6.jar
+ * Apache HTTP Client
+ - httpclient-4.5.5.jar
+ - httpcore-4.4.9.jar
* Error Prone Annotations
- error_prone_annotations-2.1.3.jar
* Esri Geometry API For Java
@@ -391,7 +390,7 @@ The Apache Software License, Version 2.0
- presto-plugin-toolkit-332.jar
- presto-spi-332.jar
* RocksDB JNI
- - rocksdbjni-5.13.3.jar
+ - rocksdbjni-6.10.2.jar
* SnakeYAML
- snakeyaml-1.26.jar
* Bean Validation API
@@ -414,17 +413,17 @@ 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.10.0.jar
- - bookkeeper-common-allocator-4.10.0.jar
- - bookkeeper-proto-4.10.0.jar
- - bookkeeper-server-4.10.0.jar
- - bookkeeper-stats-api-4.10.0.jar
- - bookkeeper-tools-framework-4.10.0.jar
- - circe-checksum-4.10.0.jar
- - codahale-metrics-provider-4.10.0.jar
- - cpu-affinity-4.10.0.jar
- - http-server-4.10.0.jar
- - prometheus-metrics-provider-4.10.0.jar
+ - bookkeeper-common-4.11.1.jar
+ - bookkeeper-common-allocator-4.11.1.jar
+ - bookkeeper-proto-4.11.1.jar
+ - bookkeeper-server-4.11.1.jar
+ - bookkeeper-stats-api-4.11.1.jar
+ - bookkeeper-tools-framework-4.11.1.jar
+ - circe-checksum-4.11.1.jar
+ - codahale-metrics-provider-4.11.1.jar
+ - cpu-affinity-4.11.1.jar
+ - http-server-4.11.1.jar
+ - prometheus-metrics-provider-4.11.1.jar
* Apache Commons
- commons-cli-1.2.jar
- commons-codec-1.10.jar
@@ -432,7 +431,7 @@ The Apache Software License, Version 2.0
- commons-configuration-1.10.jar
- commons-io-2.5.jar
- commons-lang-2.6.jar
- - commons-logging-1.1.1.jar
+ - commons-logging-1.2.jar
* GSON
- gson-2.8.2.jar
* Jackson
@@ -504,7 +503,7 @@ MIT License
CDDL - 1.0
* OSGi Resource Locator
- - osgi-resource-locator-1.0.1.jar
+ - osgi-resource-locator-1.0.3.jar
CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
* Java Annotations API
@@ -514,19 +513,27 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
- javax.activation-1.2.0.jar
- jakarta.activation-api-1.2.1.jar
- jakarta.annotation-api-1.3.5.jar
+ - jakarta.inject-2.6.1.jar
+ - jakarta.validation-api-2.0.2.jar
+ - jakarta.ws.rs-api-2.1.6.jar
* HK2 - Dependency Injection Kernel
- - hk2-api-2.5.0-b42.jar
- - hk2-locator-2.5.0-b42.jar
- - hk2-utils-2.5.0-b42.jar
+ - hk2-api-2.6.1.jar
+ - hk2-locator-2.6.1.jar
+ - hk2-utils-2.6.1.jar
+ - aopalliance-repackaged-2.6.1.jar
* Jersey
- jaxrs-0.195.jar
- - jersey-client-2.26.jar
- - jersey-container-servlet-2.26.jar
- - jersey-container-servlet-core-2.26.jar
- - jersey-hk2-2.26.jar
- - jersey-media-jaxb-2.26.jar
- - jersey-server-2.26.jar
- - jersey-common-2.26.jar
+ - jersey-client-2.31.jar
+ - jersey-common-2.31.jar
+ - jersey-container-servlet-2.31.jar
+ - jersey-container-servlet-core-2.31.jar
+ - jersey-entity-filtering-2.31.jar
+ - jersey-hk2-2.31.jar
+ - jersey-media-jaxb-2.31.jar
+ - jersey-media-json-jackson-2.31.jar
+ - jersey-media-multipart-2.31.jar
+ - jersey-server-2.31.jar
+
* JAXB
- jaxb-api-2.3.1.jar
- jaxb-impl-2.2.6.jar
@@ -564,4 +571,3 @@ Creative Commons Attribution License
Bouncy Castle License
* Bouncy Castle -- licenses/LICENSE-bouncycastle.txt
- - bouncy-castle-bc-shaded-2.6.2.jar
diff --git a/pulsar-sql/presto-distribution/pom.xml
b/pulsar-sql/presto-distribution/pom.xml
index 255988f..3309658 100644
--- a/pulsar-sql/presto-distribution/pom.xml
+++ b/pulsar-sql/presto-distribution/pom.xml
@@ -35,6 +35,7 @@
<properties>
<presto.version>332</presto.version>
+ <jersey.version>2.31</jersey.version>
<airlift.version>0.170</airlift.version>
<objenesis.version>2.6</objenesis.version>
<objectsize.version>0.0.12</objectsize.version>
@@ -54,6 +55,36 @@
<dependencies>
<dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.jersey.inject</groupId>
+ <artifactId>jersey-hk2</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet-core</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>io.prestosql</groupId>
<artifactId>presto-main</artifactId>
<version>${presto.version}</version>
@@ -235,6 +266,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<attach>true</attach>
diff --git a/pulsar-sql/presto-pulsar-plugin/pom.xml
b/pulsar-sql/presto-pulsar-plugin/pom.xml
index bd3615e..e50cc17 100644
--- a/pulsar-sql/presto-pulsar-plugin/pom.xml
+++ b/pulsar-sql/presto-pulsar-plugin/pom.xml
@@ -49,6 +49,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<attach>true</attach>
diff --git
a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
index 97639fd..1328685 100644
---
a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
+++
b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
@@ -55,6 +55,7 @@ import org.apache.bookkeeper.common.concurrent.FutureUtils;
import org.apache.bookkeeper.common.util.Backoff;
import org.apache.bookkeeper.common.util.Backoff.Jitter.Type;
import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.discover.BookieServiceInfo;
import org.apache.bookkeeper.proto.BookieServer;
import org.apache.bookkeeper.server.conf.BookieConfiguration;
import org.apache.bookkeeper.stats.NullStatsLogger;
@@ -293,7 +294,7 @@ public class LocalBookkeeperEnsemble {
bsConfs[i].setAllowEphemeralPorts(true);
try {
- bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE);
+ bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE,
BookieServiceInfo.NO_INFO);
} catch (InvalidCookieException e) {
// InvalidCookieException can happen if the machine IP has
changed
// Since we are running here a local bookie that is always
accessed
@@ -306,7 +307,7 @@ public class LocalBookkeeperEnsemble {
new File(new File(bkDataDir, "current"), "VERSION").delete();
// Retry to start the bookie after cleaning the old left cookie
- bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE);
+ bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE,
BookieServiceInfo.NO_INFO);
}
bs[i].start();
LOG.debug("Local BK[{}] started (port: {}, data_directory: {})",
i, bookiePort,
@@ -440,7 +441,7 @@ public class LocalBookkeeperEnsemble {
public void startBK(int i) throws Exception {
try {
- bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE);
+ bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE,
BookieServiceInfo.NO_INFO);
} catch (InvalidCookieException e) {
// InvalidCookieException can happen if the machine IP has changed
// Since we are running here a local bookie that is always accessed
@@ -453,7 +454,7 @@ public class LocalBookkeeperEnsemble {
new File(new File(bsConfs[i].getJournalDirNames()[0], "current"),
"VERSION").delete();
// Retry to start the bookie after cleaning the old left cookie
- bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE);
+ bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE,
BookieServiceInfo.NO_INFO);
}
bs[i].start();
diff --git a/src/check-binary-license b/src/check-binary-license
index dac370a..c53f0cc 100755
--- a/src/check-binary-license
+++ b/src/check-binary-license
@@ -87,7 +87,7 @@ for J in $NOTICEJARS; do
done
# check pulsar sql jars
-JARS=$(tar -tf $TARBALL | grep '\.jar' | grep 'lib/presto/' | grep -v
'managed-ledger' | grep -v 'pulsar-client-admin' | grep -v
'pulsar-client-api' | grep -v 'pulsar-functions-api' | grep -v
'pulsar-presto-connector-original' | grep -v 'pulsar-presto-distribution' |
grep -v 'pulsar-common' | grep -v 'pulsar-functions-proto' | grep -v
'pulsar-functions-utils' | grep -v 'pulsar-io-core' | grep -v
'pulsar-transaction-common' | sed 's!.*/!!' | sort)
+JARS=$(tar -tf $TARBALL | grep '\.jar' | grep 'lib/presto/' | grep -v
pulsar-client | grep -v bouncy-castle-bc | grep -v pulsar-metadata | grep -v
'managed-ledger' | grep -v 'pulsar-client-admin' | grep -v
'pulsar-client-api' | grep -v 'pulsar-functions-api' | grep -v
'pulsar-presto-connector-original' | grep -v 'pulsar-presto-distribution' |
grep -v 'pulsar-common' | grep -v 'pulsar-functions-proto' | grep -v
'pulsar-functions-utils' | grep -v 'pulsar-io-core' | grep -v 'pulsar-transa
[...]
LICENSEPATH=$(tar -tf $TARBALL | awk '/^[^\/]*\/lib\/presto\/LICENSE/')
LICENSE=$(tar -O -xf $TARBALL "$LICENSEPATH")
LICENSEJARS=$(echo "$LICENSE" | sed -nE 's!.* (.*\.jar).*!\1!gp')
