diff --git a/.github/workflows/ci-license.yaml b/.github/workflows/ci-license.yaml index 7d7030444c19f..9d3289bb4ae8c 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 338001d5850b4..26b16a9586822 100644 --- a/distribution/io/pom.xml +++ b/distribution/io/pom.xml @@ -51,6 +51,7 @@ maven-assembly-plugin + 3.3.0 distro-assembly diff --git a/distribution/offloaders/pom.xml b/distribution/offloaders/pom.xml index 7b7b8cd193e16..e3e36c3a9f376 100644 --- a/distribution/offloaders/pom.xml +++ b/distribution/offloaders/pom.xml @@ -45,6 +45,7 @@ maven-assembly-plugin + 3.3.0 distro-assembly diff --git a/distribution/server/licenses/LICENSE-bouncycastle.txt b/distribution/server/licenses/LICENSE-bouncycastle.txt index 6f1dedfe77d57..10a3dd4a6e4b6 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 843114aa9ab62..18b87d6733d7e 100644 --- a/distribution/server/pom.xml +++ b/distribution/server/pom.xml @@ -233,6 +233,7 @@ maven-assembly-plugin + 3.3.0 distro-assembly diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 3352047074680..d5e82eeb32d1e 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 96aaff8d4d163..cb447114d9a3b 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.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.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 @@ protected BookieServer startBookie(ServerConfiguration conf) throws Exception { 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 bookieServiceInfoProvider) throws IOException, KeeperException, InterruptedException, BookieException { return b; } diff --git a/pom.xml b/pom.xml index 8b7a15b85dde4..f161674f24539 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ flexible messaging model and an intuitive client API. 1.19 - 4.10.0 + 4.11.1 3.5.7 4.1.48.Final 2.0.30.Final @@ -166,7 +166,7 @@ flexible messaging model and an intuitive client API. 0.5.0 1.9.2 3.5.3 - 5.13.3 + 6.10.2 1.7.25 3.2.2 2.10.0 @@ -332,6 +332,10 @@ flexible messaging model and an intuitive client API. bookkeeper-server ${bookkeeper.version} + + org.bouncycastle + * + slf4j-log4j12 org.slf4j @@ -1236,6 +1240,10 @@ flexible messaging model and an intuitive client API. test tests + + org.bouncycastle + * + org.slf4j slf4j-log4j12 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 e988df1eff35b..44d1d78e86605 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.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 @@ && isBlank(starterArguments.bookieConfigFile)) { 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 bcca644a3064c..026afc25d9b4a 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.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 @@ protected void setup() throws Exception { 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 d943c85654d06..60ad35fd6c924 100644 --- a/pulsar-functions/runtime-all/pom.xml +++ b/pulsar-functions/runtime-all/pom.xml @@ -80,6 +80,7 @@ org.apache.maven.plugins maven-assembly-plugin + 3.3.0 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 8ac96c7140ee9..23b2f95d7a550 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 255988fc8e910..330965895e362 100644 --- a/pulsar-sql/presto-distribution/pom.xml +++ b/pulsar-sql/presto-distribution/pom.xml @@ -35,6 +35,7 @@ 332 + 2.31 0.170 2.6 0.0.12 @@ -53,6 +54,36 @@ + + org.glassfish.jersey.core + jersey-client + ${jersey.version} + + + + org.glassfish.jersey.core + jersey-server + ${jersey.version} + + + + org.glassfish.jersey.inject + jersey-hk2 + ${jersey.version} + + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey.version} + + + + org.glassfish.jersey.containers + jersey-container-servlet + ${jersey.version} + + io.prestosql presto-main @@ -235,6 +266,7 @@ maven-assembly-plugin + 3.3.0 false true diff --git a/pulsar-sql/presto-pulsar-plugin/pom.xml b/pulsar-sql/presto-pulsar-plugin/pom.xml index bd3615eab85e1..e50cc174e8193 100644 --- a/pulsar-sql/presto-pulsar-plugin/pom.xml +++ b/pulsar-sql/presto-pulsar-plugin/pom.xml @@ -49,6 +49,7 @@ maven-assembly-plugin + 3.3.0 false true 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 97639fd43f96a..1328685595d80 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.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 @@ private void runBookies(ServerConfiguration baseConf) throws Exception { 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 @@ private void runBookies(ServerConfiguration baseConf) throws Exception { 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 void stopBK() { 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 void startBK(int i) throws Exception { 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 dac370a958fc4..c53f0ccbd4310 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-transaction-common' | sed 's!.*/!!' | sort) LICENSEPATH=$(tar -tf $TARBALL | awk '/^[^\/]*\/lib\/presto\/LICENSE/') LICENSE=$(tar -O -xf $TARBALL "$LICENSEPATH") LICENSEJARS=$(echo "$LICENSE" | sed -nE 's!.* (.*\.jar).*!\1!gp')