Bump bk version to 4.11.0

distribution/server/src/assemble/LICENSE.bin.txt

@@ -345,6 +345,15 @@ The Apache Software License, Version 2.0
     - org.apache.commons-commons-collections4-4.1.jar
     - org.apache.commons-commons-compress-1.19.jar
     - org.apache.commons-commons-lang3-3.6.jar
+ * Apache Http Components
+    - org.apache.httpcomponents-httpclient-4.5.5.jar
+    - org.apache.httpcomponents-httpcore-4.4.1.jar
+ * Apache Thrift
+    - org.apache.thrift-libthrift-0.12.0.jar
+ * Bouncy Castle
+    - org.bouncycastle-bcpkix-jdk15on-1.60.jar
+    - org.bouncycastle-bcprov-ext-jdk15on-1.60.jar
+    - org.bouncycastle-bcprov-jdk15on-1.60.jar
  * Netty
     - io.netty-netty-buffer-4.1.51.Final.jar
     - io.netty-netty-codec-4.1.51.Final.jar
@@ -384,32 +393,32 @@ 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.0.jar
+    - org.apache.bookkeeper-bookkeeper-common-allocator-4.11.0.jar
+    - org.apache.bookkeeper-bookkeeper-proto-4.11.0.jar
+    - org.apache.bookkeeper-bookkeeper-server-4.11.0.jar
+    - org.apache.bookkeeper-bookkeeper-tools-framework-4.11.0.jar
+    - org.apache.bookkeeper-circe-checksum-4.11.0.jar
+    - org.apache.bookkeeper-cpu-affinity-4.11.0.jar
+    - org.apache.bookkeeper-statelib-4.11.0.jar
+    - org.apache.bookkeeper-stream-storage-api-4.11.0.jar
+    - org.apache.bookkeeper-stream-storage-common-4.11.0.jar
+    - org.apache.bookkeeper-stream-storage-java-client-4.11.0.jar
+    - org.apache.bookkeeper-stream-storage-java-client-base-4.11.0.jar
+    - org.apache.bookkeeper-stream-storage-proto-4.11.0.jar
+    - org.apache.bookkeeper-stream-storage-server-4.11.0.jar
+    - org.apache.bookkeeper-stream-storage-service-api-4.11.0.jar
+    - org.apache.bookkeeper-stream-storage-service-impl-4.11.0.jar
+    - org.apache.bookkeeper.http-http-server-4.11.0.jar
+    - org.apache.bookkeeper.http-vertx-http-server-4.11.0.jar
+    - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.11.0.jar
+    - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.11.0.jar
+    - org.apache.bookkeeper.tests-stream-storage-tests-common-4.11.0.jar
+    - org.apache.distributedlog-distributedlog-common-4.11.0.jar
+    - org.apache.distributedlog-distributedlog-core-4.11.0-tests.jar
+    - org.apache.distributedlog-distributedlog-core-4.11.0.jar
+    - org.apache.distributedlog-distributedlog-protocol-4.11.0.jar
+    - org.apache.bookkeeper.stats-codahale-metrics-provider-4.11.0.jar
  * AirCompressor
     - io.airlift-aircompressor-0.16.jar
  * AsyncHttpClient

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;
@@ -470,11 +472,12 @@ 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)
-                    throws IOException, KeeperException, InterruptedException, BookieException {
+            protected Bookie newBookie(ServerConfiguration conf, ByteBufAllocator allocator, Supplier<BookieServiceInfo> bookieServiceInfoProvider) throws IOException, KeeperException, InterruptedException, BookieException {
                 return b;
             }
+
         };
         server.start();
 

pom.xml

@@ -98,7 +98,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.0</bookkeeper.version>
     <zookeeper.version>3.5.7</zookeeper.version>
     <netty.version>4.1.51.Final</netty.version>
     <netty-tc-native.version>2.0.30.Final</netty-tc-native.version>

pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java

@@ -40,6 +40,7 @@
 import java.text.SimpleDateFormat;
 
 import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.discover.BookieServiceInfo;
 import org.apache.bookkeeper.proto.BookieServer;
 import org.apache.bookkeeper.replication.AutoRecoveryMain;
 import org.apache.bookkeeper.stats.StatsProvider;
@@ -248,7 +249,8 @@ && 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;
             }

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);

pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java

@@ -40,7 +40,7 @@
 import org.apache.bookkeeper.client.EnsemblePlacementPolicy;
 import org.apache.bookkeeper.client.PulsarMockBookKeeper;
 import org.apache.bookkeeper.stats.StatsLogger;
-import org.apache.bookkeeper.test.PortManager;
+import org.apache.bookkeeper.util.PortManager;
 import org.apache.bookkeeper.util.ZkUtils;
 import org.apache.pulsar.broker.BookKeeperClientFactory;
 import org.apache.pulsar.broker.PulsarService;

pulsar-sql/presto-distribution/LICENSE

@@ -229,6 +229,9 @@ The Apache Software License, Version 2.0
     - commons-math3-3.6.1.jar
     - commons-compress-1.19.jar
     - commons-lang3-3.6.jar
+ * Http
+    - httpcore-4.4.9.jar
+    - httpclient-4.5.5.jar
  * Netty
     - netty-3.10.6.Final.jar
     - netty-buffer-4.1.51.Final.jar
@@ -244,7 +247,6 @@ The Apache Software License, Version 2.0
     - netty-resolver-dns-4.1.51.Final.jar
     - netty-tcnative-boringssl-static-2.0.30.Final.jar
     - netty-transport-4.1.51.Final.jar
-    - netty-transport-native-epoll-4.1.51.Final.jar
     - netty-transport-native-epoll-4.1.51.Final-linux-x86_64.jar
     - netty-transport-native-kqueue-4.1.51.Final-osx-x86_64.jar
     - netty-transport-native-unix-common-4.1.51.Final.jar
@@ -409,25 +411,25 @@ 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.0.jar
+    - bookkeeper-common-allocator-4.11.0.jar
+    - bookkeeper-proto-4.11.0.jar
+    - bookkeeper-server-4.11.0.jar
+    - bookkeeper-stats-api-4.11.0.jar
+    - bookkeeper-tools-framework-4.11.0.jar
+    - circe-checksum-4.11.0.jar
+    - codahale-metrics-provider-4.11.0.jar
+    - cpu-affinity-4.11.0.jar
+    - http-server-4.11.0.jar
+    - prometheus-metrics-provider-4.11.0.jar
   * Apache Commons
     - commons-cli-1.2.jar
     - commons-codec-1.10.jar
     - commons-collections4-4.1.jar
     - 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
@@ -561,5 +563,9 @@ Creative Commons Attribution License
     - jcip-annotations-1.0.jar
 
 Bouncy Castle License
+ * Bouncy Castle
+    - bcprov-jdk15on-1.60.jar
+    - bcprov-ext-jdk15on-1.60.jar
+    - bcpkix-jdk15on-1.60.jar
  * Bouncy Castle -- licenses/LICENSE-bouncycastle.txt
     - bouncy-castle-bc-shaded-2.7.0-SNAPSHOT.jar

pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java

@@ -54,6 +54,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.replication.ReplicationException;
 import org.apache.bookkeeper.server.conf.BookieConfiguration;
@@ -275,7 +276,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
@@ -288,7 +289,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,
@@ -420,7 +421,7 @@ public void startBK() throws Exception {
         for (int i = 0; i < numberOfBookies; i++) {
 
             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
@@ -433,7 +434,7 @@ public void startBK() 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();