diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index c2f993387bd9a..71fc4b9061c8e 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -47,7 +47,7 @@
4.1
8.37
3.1.2
- 4.1.94.Final
+ 4.1.100.Final
4.2.3
32.1.1-jre
1.10.12
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index d32c44a6651c5..89f2fef4c3dbb 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -265,7 +265,7 @@ The Apache Software License, Version 2.0
- com.google.code.gson-gson-2.8.9.jar
- io.gsonfire-gson-fire-1.8.5.jar
* Guava
- - com.google.guava-guava-32.1.1-jre.jar
+ - com.google.guava-guava-32.1.2-jre.jar
- com.google.guava-failureaccess-1.0.1.jar
- com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
* J2ObjC Annotations -- com.google.j2objc-j2objc-annotations-1.3.jar
@@ -289,27 +289,27 @@ The Apache Software License, Version 2.0
- org.apache.commons-commons-lang3-3.11.jar
- org.apache.commons-commons-text-1.10.0.jar
* Netty
- - io.netty-netty-buffer-4.1.94.Final.jar
- - io.netty-netty-codec-4.1.94.Final.jar
- - io.netty-netty-codec-dns-4.1.94.Final.jar
- - io.netty-netty-codec-http-4.1.94.Final.jar
- - io.netty-netty-codec-http2-4.1.94.Final.jar
- - io.netty-netty-codec-socks-4.1.94.Final.jar
- - io.netty-netty-codec-haproxy-4.1.94.Final.jar
- - io.netty-netty-common-4.1.94.Final.jar
- - io.netty-netty-handler-4.1.94.Final.jar
- - io.netty-netty-handler-proxy-4.1.94.Final.jar
- - io.netty-netty-resolver-4.1.94.Final.jar
- - io.netty-netty-resolver-dns-4.1.94.Final.jar
- - io.netty-netty-resolver-dns-classes-macos-4.1.94.Final.jar
- - io.netty-netty-resolver-dns-native-macos-4.1.94.Final-osx-aarch_64.jar
- - io.netty-netty-resolver-dns-native-macos-4.1.94.Final-osx-x86_64.jar
- - io.netty-netty-transport-4.1.94.Final.jar
- - io.netty-netty-transport-classes-epoll-4.1.94.Final.jar
- - io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar
- - io.netty-netty-transport-native-epoll-4.1.94.Final.jar
- - io.netty-netty-transport-native-unix-common-4.1.94.Final.jar
- - io.netty-netty-transport-native-unix-common-4.1.94.Final-linux-x86_64.jar
+ - io.netty-netty-buffer-4.1.100.Final.jar
+ - io.netty-netty-codec-4.1.100.Final.jar
+ - io.netty-netty-codec-dns-4.1.100.Final.jar
+ - io.netty-netty-codec-http-4.1.100.Final.jar
+ - io.netty-netty-codec-http2-4.1.100.Final.jar
+ - io.netty-netty-codec-socks-4.1.100.Final.jar
+ - io.netty-netty-codec-haproxy-4.1.100.Final.jar
+ - io.netty-netty-common-4.1.100.Final.jar
+ - io.netty-netty-handler-4.1.100.Final.jar
+ - io.netty-netty-handler-proxy-4.1.100.Final.jar
+ - io.netty-netty-resolver-4.1.100.Final.jar
+ - io.netty-netty-resolver-dns-4.1.100.Final.jar
+ - io.netty-netty-resolver-dns-classes-macos-4.1.100.Final.jar
+ - io.netty-netty-resolver-dns-native-macos-4.1.100.Final-osx-aarch_64.jar
+ - io.netty-netty-resolver-dns-native-macos-4.1.100.Final-osx-x86_64.jar
+ - io.netty-netty-transport-4.1.100.Final.jar
+ - io.netty-netty-transport-classes-epoll-4.1.100.Final.jar
+ - io.netty-netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
+ - io.netty-netty-transport-native-epoll-4.1.100.Final.jar
+ - io.netty-netty-transport-native-unix-common-4.1.100.Final.jar
+ - io.netty-netty-transport-native-unix-common-4.1.100.Final-linux-x86_64.jar
- io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar
- io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar
- io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar
@@ -383,25 +383,25 @@ The Apache Software License, Version 2.0
- org.asynchttpclient-async-http-client-2.12.1.jar
- org.asynchttpclient-async-http-client-netty-utils-2.12.1.jar
* Jetty
- - org.eclipse.jetty-jetty-client-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-continuation-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-proxy-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-server-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-servlet-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-servlets-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-util-ajax-9.4.51.v20230217.jar
- - org.eclipse.jetty.websocket-javax-websocket-client-impl-9.4.51.v20230217.jar
- - org.eclipse.jetty.websocket-websocket-api-9.4.51.v20230217.jar
- - org.eclipse.jetty.websocket-websocket-client-9.4.51.v20230217.jar
- - org.eclipse.jetty.websocket-websocket-common-9.4.51.v20230217.jar
- - org.eclipse.jetty.websocket-websocket-server-9.4.51.v20230217.jar
- - org.eclipse.jetty.websocket-websocket-servlet-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-alpn-conscrypt-server-9.4.51.v20230217.jar
- - org.eclipse.jetty-jetty-alpn-server-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-client-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-continuation-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-proxy-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-servlets-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar
+ - org.eclipse.jetty.websocket-javax-websocket-client-impl-9.4.53.v20231009.jar
+ - org.eclipse.jetty.websocket-websocket-api-9.4.53.v20231009.jar
+ - org.eclipse.jetty.websocket-websocket-client-9.4.53.v20231009.jar
+ - org.eclipse.jetty.websocket-websocket-common-9.4.53.v20231009.jar
+ - org.eclipse.jetty.websocket-websocket-server-9.4.53.v20231009.jar
+ - org.eclipse.jetty.websocket-websocket-servlet-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-alpn-conscrypt-server-9.4.53.v20231009.jar
+ - org.eclipse.jetty-jetty-alpn-server-9.4.53.v20231009.jar
* SnakeYaml -- org.yaml-snakeyaml-2.0.jar
* RocksDB - org.rocksdb-rocksdbjni-7.9.2.jar
* Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.5.1.jar
@@ -480,11 +480,11 @@ The Apache Software License, Version 2.0
- io.vertx-vertx-web-common-4.3.8.jar
- io.vertx-vertx-grpc-4.3.5.jar
* Apache ZooKeeper
- - org.apache.zookeeper-zookeeper-3.8.1.jar
- - org.apache.zookeeper-zookeeper-jute-3.8.1.jar
- - org.apache.zookeeper-zookeeper-prometheus-metrics-3.8.1.jar
+ - org.apache.zookeeper-zookeeper-3.9.1.jar
+ - org.apache.zookeeper-zookeeper-jute-3.9.1.jar
+ - org.apache.zookeeper-zookeeper-prometheus-metrics-3.9.1.jar
* Snappy Java
- - org.xerial.snappy-snappy-java-1.1.10.1.jar
+ - org.xerial.snappy-snappy-java-1.1.10.5.jar
* Google HTTP Client
- com.google.http-client-google-http-client-gson-1.41.0.jar
- com.google.http-client-google-http-client-1.41.0.jar
@@ -499,8 +499,6 @@ The Apache Software License, Version 2.0
- com.github.seancfoley-ipaddress-5.3.3.jar
* RxJava
- io.reactivex.rxjava3-rxjava-3.0.1.jar
- * RabbitMQ Java Client
- - com.rabbitmq-amqp-client-5.5.3.jar
* RoaringBitmap
- org.roaringbitmap-RoaringBitmap-0.9.44.jar
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
index f92d95928298a..eeaa33589d640 100644
--- a/distribution/shell/src/assemble/LICENSE.bin.txt
+++ b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -326,7 +326,7 @@ The Apache Software License, Version 2.0
* Gson
- gson-2.8.9.jar
* Guava
- - guava-32.1.1-jre.jar
+ - guava-32.1.2-jre.jar
- failureaccess-1.0.1.jar
- listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
* J2ObjC Annotations -- j2objc-annotations-1.3.jar
@@ -344,22 +344,22 @@ The Apache Software License, Version 2.0
- commons-text-1.10.0.jar
- commons-compress-1.21.jar
* Netty
- - netty-buffer-4.1.94.Final.jar
- - netty-codec-4.1.94.Final.jar
- - netty-codec-dns-4.1.94.Final.jar
- - netty-codec-http-4.1.94.Final.jar
- - netty-codec-socks-4.1.94.Final.jar
- - netty-codec-haproxy-4.1.94.Final.jar
- - netty-common-4.1.94.Final.jar
- - netty-handler-4.1.94.Final.jar
- - netty-handler-proxy-4.1.94.Final.jar
- - netty-resolver-4.1.94.Final.jar
- - netty-resolver-dns-4.1.94.Final.jar
- - netty-transport-4.1.94.Final.jar
- - netty-transport-classes-epoll-4.1.94.Final.jar
- - netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar
- - netty-transport-native-unix-common-4.1.94.Final.jar
- - netty-transport-native-unix-common-4.1.94.Final-linux-x86_64.jar
+ - netty-buffer-4.1.100.Final.jar
+ - netty-codec-4.1.100.Final.jar
+ - netty-codec-dns-4.1.100.Final.jar
+ - netty-codec-http-4.1.100.Final.jar
+ - netty-codec-socks-4.1.100.Final.jar
+ - netty-codec-haproxy-4.1.100.Final.jar
+ - netty-common-4.1.100.Final.jar
+ - netty-handler-4.1.100.Final.jar
+ - netty-handler-proxy-4.1.100.Final.jar
+ - netty-resolver-4.1.100.Final.jar
+ - netty-resolver-dns-4.1.100.Final.jar
+ - netty-transport-4.1.100.Final.jar
+ - netty-transport-classes-epoll-4.1.100.Final.jar
+ - netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
+ - netty-transport-native-unix-common-4.1.100.Final.jar
+ - netty-transport-native-unix-common-4.1.100.Final-linux-x86_64.jar
- netty-tcnative-boringssl-static-2.0.61.Final.jar
- netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar
- netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar
@@ -370,9 +370,9 @@ The Apache Software License, Version 2.0
- netty-incubator-transport-classes-io_uring-0.0.21.Final.jar
- netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar
- netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar
- - netty-resolver-dns-classes-macos-4.1.94.Final.jar
- - netty-resolver-dns-native-macos-4.1.94.Final-osx-aarch_64.jar
- - netty-resolver-dns-native-macos-4.1.94.Final-osx-x86_64.jar
+ - netty-resolver-dns-classes-macos-4.1.100.Final.jar
+ - netty-resolver-dns-native-macos-4.1.100.Final-osx-aarch_64.jar
+ - netty-resolver-dns-native-macos-4.1.100.Final-osx-x86_64.jar
* Prometheus client
- simpleclient-0.16.0.jar
- simpleclient_log4j2-0.16.0.jar
@@ -395,20 +395,20 @@ The Apache Software License, Version 2.0
- async-http-client-2.12.1.jar
- async-http-client-netty-utils-2.12.1.jar
* Jetty
- - jetty-client-9.4.51.v20230217.jar
- - jetty-http-9.4.51.v20230217.jar
- - jetty-io-9.4.51.v20230217.jar
- - jetty-util-9.4.51.v20230217.jar
- - javax-websocket-client-impl-9.4.51.v20230217.jar
- - websocket-api-9.4.51.v20230217.jar
- - websocket-client-9.4.51.v20230217.jar
- - websocket-common-9.4.51.v20230217.jar
+ - jetty-client-9.4.53.v20231009.jar
+ - jetty-http-9.4.53.v20231009.jar
+ - jetty-io-9.4.53.v20231009.jar
+ - jetty-util-9.4.53.v20231009.jar
+ - javax-websocket-client-impl-9.4.53.v20231009.jar
+ - websocket-api-9.4.53.v20231009.jar
+ - websocket-client-9.4.53.v20231009.jar
+ - websocket-common-9.4.53.v20231009.jar
* SnakeYaml -- snakeyaml-2.0.jar
* Google Error Prone Annotations - error_prone_annotations-2.5.1.jar
* Javassist -- javassist-3.25.0-GA.jar
* Apache Avro
- - avro-1.10.2.jar
- - avro-protobuf-1.10.2.jar
+ - avro-1.11.3.jar
+ - avro-protobuf-1.11.3.jar
BSD 3-clause "New" or "Revised" License
* JSR305 -- jsr305-3.0.2.jar -- ../licenses/LICENSE-JSR305.txt
diff --git a/pom.xml b/pom.xml
index 8c8571597b84f..e318a858a4a6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,15 +134,15 @@ flexible messaging model and an intuitive client API.
1.21
4.16.3
- 3.8.1
+ 3.9.1
1.5.0
1.10.0
- 1.1.10.1
+ 1.1.10.5
4.1.12.1
5.1.0
- 4.1.94.Final
+ 4.1.100.Final
0.0.21.Final
- 9.4.51.v20230217
+ 9.4.53.v20231009
2.5.2
2.34
1.10.50
@@ -159,7 +159,7 @@ flexible messaging model and an intuitive client API.
0.10.2
1.6.2
8.37
- 0.42.1
+ 0.43.3
true
0.5.0
3.19.6
@@ -175,9 +175,9 @@ flexible messaging model and an intuitive client API.
3.11.2
4.4.20
3.4.0
- 5.5.3
+ 5.18.0
1.12.262
- 1.10.2
+ 1.11.3
2.10.10
2.5.0
5.1.0
@@ -223,7 +223,7 @@ flexible messaging model and an intuitive client API.
0.9.1
2.1.0
3.24.2
- 1.18.26
+ 1.18.30
1.3.2
2.3.1
1.2.0
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java
index 140dea9e7ebc7..49517a424b936 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java
@@ -407,7 +407,7 @@ public void testSchemaComparison() throws Exception {
assertEquals(admin.namespaces().getSchemaCompatibilityStrategy(namespaceName.toString()),
SchemaCompatibilityStrategy.UNDEFINED);
byte[] changeSchemaBytes = (new String(Schema.AVRO(Schemas.PersonOne.class)
- .getSchemaInfo().getSchema(), UTF_8) + "/n /n /n").getBytes();
+ .getSchemaInfo().getSchema(), UTF_8) + "\n \n \n").getBytes();
SchemaInfo schemaInfo = SchemaInfo.builder().type(SchemaType.AVRO).schema(changeSchemaBytes).build();
admin.schemas().createSchema(fqtn, schemaInfo);
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufSchemaTest.java
index 3fcd6f12b982d..85012276d5af1 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufSchemaTest.java
@@ -41,20 +41,20 @@ public class ProtobufSchemaTest {
"\"namespace\":\"org.apache.pulsar.client.schema.proto.Test\"," +
"\"fields\":[{\"name\":\"stringField\",\"type\":{\"type\":\"string\"," +
"\"avro.java.string\":\"String\"},\"default\":\"\"},{\"name\":\"doubleField\"," +
- "\"type\":\"double\",\"default\":0},{\"name\":\"intField\",\"type\":\"int\"," +
+ "\"type\":\"double\",\"default\":0.0},{\"name\":\"intField\",\"type\":\"int\"," +
"\"default\":0},{\"name\":\"testEnum\",\"type\":{\"type\":\"enum\"," +
"\"name\":\"TestEnum\",\"symbols\":[\"SHARED\",\"FAILOVER\"]}," +
"\"default\":\"SHARED\"},{\"name\":\"nestedField\"," +
"\"type\":[\"null\",{\"type\":\"record\",\"name\":\"SubMessage\"," +
"\"fields\":[{\"name\":\"foo\",\"type\":{\"type\":\"string\"," +
"\"avro.java.string\":\"String\"},\"default\":\"\"}" +
- ",{\"name\":\"bar\",\"type\":\"double\",\"default\":0}]}]" +
+ ",{\"name\":\"bar\",\"type\":\"double\",\"default\":0.0}]}]" +
",\"default\":null},{\"name\":\"repeatedField\",\"type\":{\"type\":\"array\"" +
",\"items\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},\"default\":[]}" +
",{\"name\":\"externalMessage\",\"type\":[\"null\",{\"type\":\"record\"" +
",\"name\":\"ExternalMessage\",\"namespace\":\"org.apache.pulsar.client.schema.proto.ExternalTest\"" +
",\"fields\":[{\"name\":\"stringField\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}," +
- "\"default\":\"\"},{\"name\":\"doubleField\",\"type\":\"double\",\"default\":0}]}],\"default\":null}]}";
+ "\"default\":\"\"},{\"name\":\"doubleField\",\"type\":\"double\",\"default\":0.0}]}],\"default\":null}]}";
private static final String EXPECTED_PARSING_INFO = "{\"__alwaysAllowNull\":\"true\",\"__jsr310ConversionEnabled\":\"false\"," +
"\"__PARSING_INFO__\":\"[{\\\"number\\\":1,\\\"name\\\":\\\"stringField\\\",\\\"type\\\":\\\"STRING\\\"," +
diff --git a/pulsar-io/kafka-connect-adaptor/pom.xml b/pulsar-io/kafka-connect-adaptor/pom.xml
index 59f3ceb2ccf1c..ddc178c9119b8 100644
--- a/pulsar-io/kafka-connect-adaptor/pom.xml
+++ b/pulsar-io/kafka-connect-adaptor/pom.xml
@@ -116,6 +116,12 @@
io.confluent
kafka-connect-avro-converter
${confluent.version}
+
+
+ org.apache.avro
+ avro
+
+
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/TestZKServer.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/TestZKServer.java
index 726f5ae312d19..33034ddb3fe0f 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/TestZKServer.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/TestZKServer.java
@@ -19,39 +19,33 @@
package org.apache.pulsar.metadata;
import static org.testng.Assert.assertTrue;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.net.InetSocketAddress;
+import java.lang.reflect.Field;
import java.net.Socket;
-
-import java.nio.charset.StandardCharsets;
-
+import java.util.Properties;
+import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
-
import org.apache.commons.io.FileUtils;
-import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.server.ContainerManager;
-import org.apache.zookeeper.server.NIOServerCnxnFactory;
-import org.apache.zookeeper.server.Request;
-import org.apache.zookeeper.server.RequestProcessor;
import org.apache.zookeeper.server.ServerCnxnFactory;
-import org.apache.zookeeper.server.SessionTracker;
import org.apache.zookeeper.server.ZooKeeperServer;
+import org.apache.zookeeper.server.ZooKeeperServerMain;
+import org.apache.zookeeper.server.embedded.ExitHandler;
+import org.apache.zookeeper.server.embedded.ZooKeeperServerEmbedded;
import org.assertj.core.util.Files;
@Slf4j
public class TestZKServer implements AutoCloseable {
+
public static final int TICK_TIME = 1000;
- protected ZooKeeperServer zks;
- private final File zkDataDir;
- private ServerCnxnFactory serverFactory;
- private ContainerManager containerManager;
- private int zkPort = 0;
+ private final File zkDataDir;
+ private int zkPort; // initially this is zero
+ private ZooKeeperServerEmbedded zooKeeperServerEmbedded;
public TestZKServer() throws Exception {
this.zkDataDir = Files.newTemporaryFolder();
@@ -64,86 +58,86 @@ public TestZKServer() throws Exception {
}
public void start() throws Exception {
- this.zks = new ZooKeeperServer(zkDataDir, zkDataDir, TICK_TIME);
- this.zks.setMaxSessionTimeout(300_000);
- this.serverFactory = new NIOServerCnxnFactory();
- this.serverFactory.configure(new InetSocketAddress(zkPort), 1000);
- this.serverFactory.startup(zks, true);
-
- this.zkPort = serverFactory.getLocalPort();
- log.info("Started test ZK server on port {}", zkPort);
+ final Properties configZookeeper = new Properties();
+ configZookeeper.put("clientPort", zkPort + "");
+ configZookeeper.put("host", "127.0.0.1");
+ configZookeeper.put("ticktime", TICK_TIME + "");
+ zooKeeperServerEmbedded = ZooKeeperServerEmbedded
+ .builder()
+ .baseDir(zkDataDir.toPath())
+ .configuration(configZookeeper)
+ .exitHandler(ExitHandler.LOG_ONLY)
+ .build();
+
+ zooKeeperServerEmbedded.start(60_000);
+ log.info("Started test ZK server on at {}", zooKeeperServerEmbedded.getConnectionString());
+
+ ZooKeeperServerMain zooKeeperServerMain = getZooKeeperServerMain(zooKeeperServerEmbedded);
+ ServerCnxnFactory serverCnxnFactory = getServerCnxnFactory(zooKeeperServerMain);
+ // save the port, in order to allow restarting on the same port
+ zkPort = serverCnxnFactory.getLocalPort();
boolean zkServerReady = waitForServerUp(this.getConnectionString(), 30_000);
assertTrue(zkServerReady);
+ }
- this.containerManager = new ContainerManager(zks.getZKDatabase(), new RequestProcessor() {
- @Override
- public void processRequest(Request request) throws RequestProcessorException {
- String path = StandardCharsets.UTF_8.decode(request.request).toString();
- try {
- zks.getZKDatabase().getDataTree().deleteNode(path, -1);
- } catch (KeeperException.NoNodeException e) {
- // Ok
- }
- }
+ @SneakyThrows
+ private static ZooKeeperServerMain getZooKeeperServerMain(ZooKeeperServerEmbedded zooKeeperServerEmbedded) {
+ ZooKeeperServerMain zooKeeperServerMain = readField(zooKeeperServerEmbedded.getClass(),
+ "mainsingle", zooKeeperServerEmbedded);
+ return zooKeeperServerMain;
+ }
- @Override
- public void shutdown() {
+ @SneakyThrows
+ private static ContainerManager getContainerManager(ZooKeeperServerMain zooKeeperServerMain) {
+ ContainerManager containerManager = readField(ZooKeeperServerMain.class, "containerManager", zooKeeperServerMain);
+ return containerManager;
+ }
- }
- }, 10, 10000, 0L);
+ @SneakyThrows
+ private static ZooKeeperServer getZooKeeperServer(ZooKeeperServerMain zooKeeperServerMain) {
+ ServerCnxnFactory serverCnxnFactory = getServerCnxnFactory(zooKeeperServerMain);
+ ZooKeeperServer zkServer = readField(ServerCnxnFactory.class, "zkServer", serverCnxnFactory);
+ return zkServer;
+ }
+
+ @SneakyThrows
+ private static T readField(Class clazz, String field, Object object) {
+ Field declaredField = clazz.getDeclaredField(field);
+ boolean accessible = declaredField.isAccessible();
+ if (!accessible) {
+ declaredField.setAccessible(true);
+ }
+ try {
+ return (T) declaredField.get(object);
+ } finally {
+ declaredField.setAccessible(accessible);
+ }
+ }
+
+ private static ServerCnxnFactory getServerCnxnFactory(ZooKeeperServerMain zooKeeperServerMain) throws Exception {
+ ServerCnxnFactory serverCnxnFactory = readField(ZooKeeperServerMain.class, "cnxnFactory", zooKeeperServerMain);
+ return serverCnxnFactory;
}
public void checkContainers() throws Exception {
// Make sure the container nodes are actually deleted
Thread.sleep(1000);
+ ContainerManager containerManager = getContainerManager(getZooKeeperServerMain(zooKeeperServerEmbedded));
containerManager.checkContainers();
}
public void stop() throws Exception {
- if (containerManager != null) {
- containerManager.stop();
- containerManager = null;
- }
-
- if (serverFactory != null) {
- serverFactory.shutdown();
- serverFactory = null;
- }
-
- if (zks != null) {
- SessionTracker sessionTracker = zks.getSessionTracker();
- zks.shutdown();
- zks.getZKDatabase().close();
- if (sessionTracker instanceof Thread) {
- Thread sessionTrackerThread = (Thread) sessionTracker;
- sessionTrackerThread.interrupt();
- sessionTrackerThread.join();
- }
- zks = null;
+ if (zooKeeperServerEmbedded != null) {
+ zooKeeperServerEmbedded.close();
}
-
log.info("Stopped test ZK server");
}
public void expireSession(long sessionId) {
- zks.expire(new SessionTracker.Session() {
- @Override
- public long getSessionId() {
- return sessionId;
- }
-
- @Override
- public int getTimeout() {
- return 10_000;
- }
-
- @Override
- public boolean isClosing() {
- return false;
- }
- });
+ getZooKeeperServer(getZooKeeperServerMain(zooKeeperServerEmbedded))
+ .expire(sessionId);
}
@Override
@@ -152,12 +146,9 @@ public void close() throws Exception {
FileUtils.deleteDirectory(zkDataDir);
}
- public int getPort() {
- return zkPort;
- }
-
+ @SneakyThrows
public String getConnectionString() {
- return "127.0.0.1:" + getPort();
+ return zooKeeperServerEmbedded.getConnectionString();
}
public static boolean waitForServerUp(String hp, long timeout) {
diff --git a/pulsar-package-management/bookkeeper-storage/pom.xml b/pulsar-package-management/bookkeeper-storage/pom.xml
index 72920e30ba513..be03a0e20653b 100644
--- a/pulsar-package-management/bookkeeper-storage/pom.xml
+++ b/pulsar-package-management/bookkeeper-storage/pom.xml
@@ -71,6 +71,12 @@
+
+ org.hamcrest
+ hamcrest
+ test
+
+
io.dropwizard.metrics
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 61332595c65b8..af13caeabdf4e 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -231,21 +231,21 @@ The Apache Software License, Version 2.0
- commons-compress-1.21.jar
- commons-lang3-3.11.jar
* Netty
- - netty-buffer-4.1.94.Final.jar
- - netty-codec-4.1.94.Final.jar
- - netty-codec-dns-4.1.94.Final.jar
- - netty-codec-http-4.1.94.Final.jar
- - netty-codec-haproxy-4.1.94.Final.jar
- - netty-codec-socks-4.1.94.Final.jar
- - netty-handler-proxy-4.1.94.Final.jar
- - netty-common-4.1.94.Final.jar
- - netty-handler-4.1.94.Final.jar
+ - netty-buffer-4.1.100.Final.jar
+ - netty-codec-4.1.100.Final.jar
+ - netty-codec-dns-4.1.100.Final.jar
+ - netty-codec-http-4.1.100.Final.jar
+ - netty-codec-haproxy-4.1.100.Final.jar
+ - netty-codec-socks-4.1.100.Final.jar
+ - netty-handler-proxy-4.1.100.Final.jar
+ - netty-common-4.1.100.Final.jar
+ - netty-handler-4.1.100.Final.jar
- netty-reactive-streams-2.0.6.jar
- - netty-resolver-4.1.94.Final.jar
- - netty-resolver-dns-4.1.94.Final.jar
- - netty-resolver-dns-classes-macos-4.1.94.Final.jar
- - netty-resolver-dns-native-macos-4.1.94.Final-osx-aarch_64.jar
- - netty-resolver-dns-native-macos-4.1.94.Final-osx-x86_64.jar
+ - netty-resolver-4.1.100.Final.jar
+ - netty-resolver-dns-4.1.100.Final.jar
+ - netty-resolver-dns-classes-macos-4.1.100.Final.jar
+ - netty-resolver-dns-native-macos-4.1.100.Final-osx-aarch_64.jar
+ - netty-resolver-dns-native-macos-4.1.100.Final-osx-x86_64.jar
- netty-tcnative-boringssl-static-2.0.61.Final.jar
- netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar
- netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar
@@ -253,12 +253,12 @@ The Apache Software License, Version 2.0
- netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar
- netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar
- netty-tcnative-classes-2.0.61.Final.jar
- - netty-transport-4.1.94.Final.jar
- - netty-transport-classes-epoll-4.1.94.Final.jar
- - netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar
- - netty-transport-native-unix-common-4.1.94.Final.jar
- - netty-transport-native-unix-common-4.1.94.Final-linux-x86_64.jar
- - netty-codec-http2-4.1.94.Final.jar
+ - netty-transport-4.1.100.Final.jar
+ - netty-transport-classes-epoll-4.1.100.Final.jar
+ - netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
+ - netty-transport-native-unix-common-4.1.100.Final.jar
+ - netty-transport-native-unix-common-4.1.100.Final-linux-x86_64.jar
+ - netty-codec-http2-4.1.100.Final.jar
- netty-incubator-transport-classes-io_uring-0.0.21.Final.jar
- netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar
- netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar
@@ -283,22 +283,22 @@ The Apache Software License, Version 2.0
- joda-time-2.10.10.jar
- failsafe-2.4.4.jar
* Jetty
- - http2-client-9.4.51.v20230217.jar
- - http2-common-9.4.51.v20230217.jar
- - http2-hpack-9.4.51.v20230217.jar
- - http2-http-client-transport-9.4.51.v20230217.jar
- - jetty-alpn-client-9.4.51.v20230217.jar
- - http2-server-9.4.51.v20230217.jar
- - jetty-alpn-java-client-9.4.51.v20230217.jar
- - jetty-client-9.4.51.v20230217.jar
- - jetty-http-9.4.51.v20230217.jar
- - jetty-io-9.4.51.v20230217.jar
- - jetty-jmx-9.4.51.v20230217.jar
- - jetty-security-9.4.51.v20230217.jar
- - jetty-server-9.4.51.v20230217.jar
- - jetty-servlet-9.4.51.v20230217.jar
- - jetty-util-9.4.51.v20230217.jar
- - jetty-util-ajax-9.4.51.v20230217.jar
+ - http2-client-9.4.53.v20231009.jar
+ - http2-common-9.4.53.v20231009.jar
+ - http2-hpack-9.4.53.v20231009.jar
+ - http2-http-client-transport-9.4.53.v20231009.jar
+ - jetty-alpn-client-9.4.53.v20231009.jar
+ - http2-server-9.4.53.v20231009.jar
+ - jetty-alpn-java-client-9.4.53.v20231009.jar
+ - jetty-client-9.4.53.v20231009.jar
+ - jetty-http-9.4.53.v20231009.jar
+ - jetty-io-9.4.53.v20231009.jar
+ - jetty-jmx-9.4.53.v20231009.jar
+ - jetty-security-9.4.53.v20231009.jar
+ - jetty-server-9.4.53.v20231009.jar
+ - jetty-servlet-9.4.53.v20231009.jar
+ - jetty-util-9.4.53.v20231009.jar
+ - jetty-util-ajax-9.4.53.v20231009.jar
* Byte Buddy
- byte-buddy-1.11.13.jar
* Apache BVal
@@ -372,8 +372,8 @@ The Apache Software License, Version 2.0
* OpenCSV
- opencsv-2.3.jar
* Avro
- - avro-1.10.2.jar
- - avro-protobuf-1.10.2.jar
+ - avro-1.11.3.jar
+ - avro-protobuf-1.11.3.jar
* Caffeine
- caffeine-2.9.1.jar
* Javax
@@ -458,7 +458,7 @@ The Apache Software License, Version 2.0
* JSON Simple
- json-simple-1.1.1.jar
* Snappy
- - snappy-java-1.1.10.1.jar
+ - snappy-java-1.1.10.5.jar
* Jackson
- jackson-module-parameter-names-2.14.2.jar
* Java Assist
@@ -472,8 +472,8 @@ The Apache Software License, Version 2.0
- memory-0.8.3.jar
- sketches-core-0.8.3.jar
* Apache Zookeeper
- - zookeeper-3.8.1.jar
- - zookeeper-jute-3.8.1.jar
+ - zookeeper-3.8.3.jar
+ - zookeeper-jute-3.8.3.jar
* Apache Yetus Audience Annotations
- audience-annotations-0.12.0.jar
* Perfmark
diff --git a/src/owasp-dependency-check-suppressions.xml b/src/owasp-dependency-check-suppressions.xml
index d5ddc28e884cb..b5bb58c3d0eaf 100644
--- a/src/owasp-dependency-check-suppressions.xml
+++ b/src/owasp-dependency-check-suppressions.xml
@@ -457,4 +457,16 @@
]]>
CVE-2023-35116
+
+
+ CVE-2023-37475
+
+
+
+ CVE-2023-4586
+