From 8e3f5ada6e55972d606782d7d76edbc84b44cd8d Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Thu, 15 Oct 2020 12:20:31 +0200 Subject: [PATCH 01/10] Upgrade Apache BookKeeper to 4.11.1 --- .../bookkeeper/test/BookKeeperClusterTestCase.java | 4 +++- pom.xml | 2 +- .../main/java/org/apache/pulsar/PulsarBrokerStarter.java | 4 +++- .../apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java | 9 +++++---- 4 files changed, 12 insertions(+), 7 deletions(-) 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 f030eaede28a5..7b05faa30ccaa 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; @@ -469,7 +471,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 c80704f3ef730..61479ae9e69c7 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ flexible messaging model and an intuitive client API. 1.19 - 4.10.0 + 4.11.0 3.5.7 4.1.51.Final 2.0.30.Final 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 165b616a5356b..892d823693bc2 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; @@ -55,6 +56,7 @@ import org.apache.pulsar.common.protocol.Commands; import org.apache.pulsar.functions.worker.WorkerConfig; import org.apache.pulsar.functions.worker.WorkerService; +import org.apache.zookeeper.server.WorkerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.bridge.SLF4JBridgeHandler; @@ -248,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-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(); From b78e39fbbc8a9f684d9e18eab8ac9a4abea7bdb5 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Thu, 15 Oct 2020 13:02:54 +0200 Subject: [PATCH 02/10] fix build --- .../src/main/java/org/apache/pulsar/PulsarBrokerStarter.java | 1 - .../java/org/apache/pulsar/broker/service/RackAwareTest.java | 3 ++- .../apache/pulsar/broker/transaction/TransactionTestBase.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) 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 892d823693bc2..3d728266fa60e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java @@ -56,7 +56,6 @@ import org.apache.pulsar.common.protocol.Commands; import org.apache.pulsar.functions.worker.WorkerConfig; import org.apache.pulsar.functions.worker.WorkerService; -import org.apache.zookeeper.server.WorkerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.bridge.SLF4JBridgeHandler; 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-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java index 18f07ea1bf9a8..e9e189b4357b3 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java @@ -40,7 +40,6 @@ 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.ZkUtils; import org.apache.pulsar.broker.BookKeeperClientFactory; import org.apache.pulsar.broker.PulsarService; From 1a49848d9c1683b2e886e40dadac349cd9d0435f Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Thu, 15 Oct 2020 14:05:17 +0200 Subject: [PATCH 03/10] fix LICENSE files --- pulsar-sql/presto-distribution/LICENSE | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 071e21daec0c8..c54d5fcea9169 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -409,17 +409,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.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 From c8e67f0e7c6aadd8c8ae6e64629d3f36955d7923 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Tue, 20 Oct 2020 14:09:27 +0200 Subject: [PATCH 04/10] Use BK 4.11.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61479ae9e69c7..1543ef7b34f81 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ flexible messaging model and an intuitive client API. 1.19 - 4.11.0 + 4.11.1 3.5.7 4.1.51.Final 2.0.30.Final From 887db96c2d47534942f044390e83a2497bac4325 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Tue, 20 Oct 2020 14:52:33 +0200 Subject: [PATCH 05/10] Upgrade RocksDB to 6.10.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1543ef7b34f81..576d4cc8f0e30 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,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 From 18e8cb0151d6f93b8b568802bcb29542574ec59c Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Wed, 21 Oct 2020 09:54:38 +0200 Subject: [PATCH 06/10] Fix license and upgrade maven assembly plugin --- distribution/io/pom.xml | 1 + distribution/offloaders/pom.xml | 1 + .../server/licenses/LICENSE-bouncycastle.txt | 20 +---- distribution/server/pom.xml | 1 + .../server/src/assemble/LICENSE.bin.txt | 64 ++++++++-------- pulsar-functions/runtime-all/pom.xml | 1 + pulsar-sql/presto-distribution/LICENSE | 76 +++++++++++-------- pulsar-sql/presto-distribution/pom.xml | 36 ++++++++- pulsar-sql/presto-pulsar-plugin/pom.xml | 1 + src/check-binary-license | 2 +- 10 files changed, 123 insertions(+), 80 deletions(-) diff --git a/distribution/io/pom.xml b/distribution/io/pom.xml index 13b96d21b0163..8e061adc809e7 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 1a12683b9208f..4aed9c1f3f957 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 381ac6a59add2..618924b10cfe8 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 899b8e438a1e7..de99dd3e01509 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.51.Final.jar - io.netty-netty-transport-native-unix-common-4.1.51.Final.jar - io.netty-netty-transport-native-unix-common-4.1.51.Final-linux-x86_64.jar - - io.netty-netty-transport-native-kqueue-4.1.51.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 @@ -393,32 +392,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 @@ -443,8 +445,9 @@ The Apache Software License, Version 2.0 - org.eclipse.jetty.websocket-websocket-server-9.4.31.v20200723.jar - org.eclipse.jetty.websocket-websocket-servlet-9.4.31.v20200723.jar * SnakeYaml -- org.yaml-snakeyaml-1.26.jar - * RocksDB - org.rocksdb-rocksdbjni-5.13.3.jar + * RocksDB - org.rocksdb-rocksdbjni-6.10.2.jar * Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.1.3.jar + * Apache Thrifth - org.apache.thrift-libthrift-0.12.0.jar * OkHttp - com.squareup.okhttp-okhttp-2.5.0.jar * Okio - com.squareup.okio-okio-1.13.0.jar @@ -563,8 +566,9 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt * Mimepull -- org.jvnet.mimepull-mimepull-1.9.13.jar Eclipse Distribution License 1.0 -- licenses/LICENSE-EDL-1.0.txt - * Jakarta Activation -- jakarta.activation-jakarta.activation-api-1.2.1.jar - * Jakarta XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-2.3.2.jar + * Jakarta Activation -- jakarta.activation-jakarta.activation-api-1.2.2.jar + * Jakarta Activation -- com.sun.activation-jakarta.activation-1.2.2.jar + * Jakarta XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-2.3.3.jar Eclipse Public License 1.0 -- licenses/LICENSE-AspectJ.txt * AspectJ diff --git a/pulsar-functions/runtime-all/pom.xml b/pulsar-functions/runtime-all/pom.xml index 32db1f856337f..a06fa00ddf4ed 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 c54d5fcea9169..61e4a29d48863 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -235,18 +235,14 @@ The Apache Software License, Version 2.0 - netty-codec-4.1.51.Final.jar - netty-codec-dns-4.1.51.Final.jar - netty-codec-http-4.1.51.Final.jar - - netty-codec-socks-4.1.51.Final.jar - netty-common-4.1.51.Final.jar - netty-handler-4.1.51.Final.jar - - netty-handler-proxy-4.1.51.Final.jar - netty-reactive-streams-2.0.4.jar - netty-resolver-4.1.51.Final.jar - 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 - netty-transport-native-unix-common-4.1.51.Final-linux-x86_64.jar * Joda Time @@ -259,6 +255,7 @@ The Apache Software License, Version 2.0 - http2-http-client-transport-9.4.27.v20200227.jar - http2-server-9.4.27.v20200227.jar - jetty-alpn-client-9.4.27.v20200227.jar + - jetty-alpn-java-client-9.4.27.v20200227.jar - jetty-client-9.4.27.v20200227.jar - jetty-http-9.4.27.v20200227.jar - jetty-io-9.4.27.v20200227.jar @@ -365,7 +362,8 @@ The Apache Software License, Version 2.0 - javax.inject-1.jar - javax.servlet-api-3.1.0.jar - javax.servlet-api-4.0.1.jar - - javax.ws.rs-api-2.1.jar + - javax.ws.rs-api-2.1.jar + - jakarta.inject-2.6.1.jar * JCommander - jcommander-1.78.jar * FindBugs JSR305 @@ -386,11 +384,11 @@ 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 - - validation-api-2.0.1.Final.jar + - validation-api-2.0.1.Final.jar * Objectsize - objectsize-0.0.12.jar * Dropwizard Metrics @@ -409,17 +407,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.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 + - 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 @@ -427,7 +425,10 @@ 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 + * Apache HTTP Client + - httpclient-4.5.5.jar + - httpcore-4.4.9.jar * GSON - gson-2.8.2.jar * Jackson @@ -500,28 +501,37 @@ 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 + * Java Annotations and Validation API - javax.annotation-api-1.2.jar - javax.annotation-api-1.3.2.jar - javax.activation-1.2.0.jar - javax.activation-api-1.2.0.jar + - jakarta.activation-1.2.2.jar - jakarta.activation-api-1.2.1.jar + - jakarta.activation-api-1.2.2.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-container-servlet-2.31.jar + - jersey-container-servlet-core-2.31.jar + - jersey-entity-filtering-2.31.jar + - jersey-media-json-jackson-2.31.jar + - jersey-media-multipart-2.31.jar + - jersey-hk2-2.31.jar + - jersey-media-jaxb-2.31.jar + - jersey-server-2.31.jar + - jersey-common-2.31.jar * JAXB - jaxb-api-2.3.1.jar @@ -543,6 +553,7 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt - mimepull-1.9.13.jar * XML Bind API - jakarta.xml.bind-api-2.3.2.jar + - jakarta.xml.bind-api-2.3.3.jar Eclipse Public License - v2.0 -- licenses/LICENSE-EPL-2.0.txt * jakarta.annotation-api-1.3.5.jar @@ -562,3 +573,6 @@ Creative Commons Attribution License Bouncy Castle License * Bouncy Castle -- licenses/LICENSE-bouncycastle.txt - bouncy-castle-bc-shaded-2.7.0-SNAPSHOT.jar + - bcpkix-jdk15on-1.60.jar + - bcprov-ext-jdk15on-1.60.jar + - bcprov-jdk15on-1.60.jar diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml index 22b83e16f2e7a..c6fdd5e242b30 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 @@ -180,7 +211,7 @@ - + @@ -193,7 +224,7 @@ netty 3.10.6.Final - + org.apache.maven maven-core @@ -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 74c63914b1d8a..fc5f04ae566b7 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/src/check-binary-license b/src/check-binary-license index dac370a958fc4..56e4a6e420ac9 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-original' | 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') From 0a25aff36d43be72bd20bc4a69234da7c13779f5 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Thu, 29 Oct 2020 10:29:19 +0100 Subject: [PATCH 07/10] update license --- .../server/src/assemble/LICENSE.bin.txt | 4 +- pulsar-sql/presto-distribution/LICENSE | 47 ++++++++++--------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index a7ecee61a2873..e93560e2e8026 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -566,9 +566,9 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt * Mimepull -- org.jvnet.mimepull-mimepull-1.9.13.jar Eclipse Distribution License 1.0 -- licenses/LICENSE-EDL-1.0.txt - * Jakarta Activation -- jakarta.activation-jakarta.activation-api-1.2.2.jar + * Jakarta Activation -- jakarta.activation-jakarta.activation-api-1.2.1.jar * Jakarta Activation -- com.sun.activation-jakarta.activation-1.2.2.jar - * Jakarta XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-2.3.3.jar + * Jakarta XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-2.3.2.jar Eclipse Public License 1.0 -- licenses/LICENSE-AspectJ.txt * AspectJ diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index c54d5fcea9169..9cd5ba8f2a1c8 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -386,7 +386,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 @@ -409,17 +409,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.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 + - 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 @@ -500,7 +500,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 @@ -510,18 +510,19 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt - javax.activation-api-1.2.0.jar - jakarta.activation-api-1.2.1.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-container-servlet-2.31.jar + - jersey-container-servlet-core-2.31.jar + - jersey-hk2-2.31.jar + - jersey-media-jaxb-2.31.jar + - jersey-server-2.31.jar + - jersey-common-2.31.jar * JAXB - jaxb-api-2.3.1.jar From 4c652f0b24bbc95f213e0a3b0face799a87804aa Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Thu, 29 Oct 2020 10:31:05 +0100 Subject: [PATCH 08/10] restore bouncy castle license --- pulsar-sql/presto-distribution/LICENSE | 7 +++---- src/check-binary-license | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 9cd5ba8f2a1c8..5f1d6757d972c 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -235,7 +235,6 @@ The Apache Software License, Version 2.0 - netty-codec-4.1.51.Final.jar - netty-codec-dns-4.1.51.Final.jar - netty-codec-http-4.1.51.Final.jar - - netty-codec-socks-4.1.51.Final.jar - netty-common-4.1.51.Final.jar - netty-handler-4.1.51.Final.jar - netty-handler-proxy-4.1.51.Final.jar @@ -244,9 +243,7 @@ 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 - netty-transport-native-unix-common-4.1.51.Final-linux-x86_64.jar * Joda Time @@ -562,4 +559,6 @@ Creative Commons Attribution License Bouncy Castle License * Bouncy Castle -- licenses/LICENSE-bouncycastle.txt - - bouncy-castle-bc-shaded-2.7.0-SNAPSHOT.jar +- - bcpkix-jdk15on-1.66.jar +- - bcprov-ext-jdk15on-1.66.jar +- - bcprov-jdk15on-1.66.jar diff --git a/src/check-binary-license b/src/check-binary-license index 0d8779130577a..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 pulsar-client | 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) +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') From ccf90ecc78daf04b71d5ad2283ec686ea3e24242 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Thu, 29 Oct 2020 11:56:29 +0100 Subject: [PATCH 09/10] fix licenses --- distribution/server/src/assemble/LICENSE.bin.txt | 1 - pulsar-sql/presto-distribution/LICENSE | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index e93560e2e8026..b92caff5ad0f9 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -567,7 +567,6 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt Eclipse Distribution License 1.0 -- licenses/LICENSE-EDL-1.0.txt * Jakarta Activation -- jakarta.activation-jakarta.activation-api-1.2.1.jar - * Jakarta Activation -- com.sun.activation-jakarta.activation-1.2.2.jar * Jakarta XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-2.3.2.jar Eclipse Public License 1.0 -- licenses/LICENSE-AspectJ.txt diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 5f1d6757d972c..bb6e203d9aa1d 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -237,7 +237,6 @@ The Apache Software License, Version 2.0 - netty-codec-http-4.1.51.Final.jar - netty-common-4.1.51.Final.jar - netty-handler-4.1.51.Final.jar - - netty-handler-proxy-4.1.51.Final.jar - netty-reactive-streams-2.0.4.jar - netty-resolver-4.1.51.Final.jar - netty-resolver-dns-4.1.51.Final.jar @@ -301,6 +300,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 @@ -424,7 +426,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 @@ -520,6 +522,9 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt - jersey-media-jaxb-2.31.jar - jersey-server-2.31.jar - jersey-common-2.31.jar + - jersey-entity-filtering-2.31.jar + - jersey-media-json-jackson-2.31.jar + - jersey-media-multipart-2.31.jar * JAXB - jaxb-api-2.3.1.jar @@ -544,6 +549,9 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt Eclipse Public License - v2.0 -- licenses/LICENSE-EPL-2.0.txt * 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 Public Domain (CC0) -- licenses/LICENSE-CC0.txt * HdrHistogram From 2de612791f0334fe469e8e0a58e291358af77cdb Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Thu, 29 Oct 2020 17:01:00 +0100 Subject: [PATCH 10/10] Exclude BouncyCastle inherited from BK --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index ba0ce1f4e1b13..43d488cecf523 100644 --- a/pom.xml +++ b/pom.xml @@ -299,6 +299,10 @@ flexible messaging model and an intuitive client API. bookkeeper-server ${bookkeeper.version} + + org.bouncycastle + * + slf4j-log4j12 org.slf4j @@ -1032,6 +1036,10 @@ flexible messaging model and an intuitive client API. test tests + + org.bouncycastle + * + org.slf4j slf4j-log4j12