Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/schema-cache' into featu…
Browse files Browse the repository at this point in the history
…re/schema-cache
  • Loading branch information
yunmaoQu committed Jan 7, 2025
2 parents 232073c + 59a1f81 commit 1cf7b61
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 49 deletions.
2 changes: 1 addition & 1 deletion buildtools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<license-maven-plugin.version>4.1</license-maven-plugin.version>
<puppycrawl.checkstyle.version>10.14.2</puppycrawl.checkstyle.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
<netty.version>4.1.115.Final</netty.version>
<netty.version>4.1.116.Final</netty.version>
<guice.version>4.2.3</guice.version>
<guava.version>32.1.2-jre</guava.version>
<ant.version>1.10.12</ant.version>
Expand Down
46 changes: 23 additions & 23 deletions distribution/server/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -293,36 +293,36 @@ 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.115.Final.jar
- io.netty-netty-codec-4.1.115.Final.jar
- io.netty-netty-codec-dns-4.1.115.Final.jar
- io.netty-netty-codec-http-4.1.115.Final.jar
- io.netty-netty-codec-http2-4.1.115.Final.jar
- io.netty-netty-codec-socks-4.1.115.Final.jar
- io.netty-netty-codec-haproxy-4.1.115.Final.jar
- io.netty-netty-common-4.1.115.Final.jar
- io.netty-netty-handler-4.1.115.Final.jar
- io.netty-netty-handler-proxy-4.1.115.Final.jar
- io.netty-netty-resolver-4.1.115.Final.jar
- io.netty-netty-resolver-dns-4.1.115.Final.jar
- io.netty-netty-resolver-dns-classes-macos-4.1.115.Final.jar
- io.netty-netty-resolver-dns-native-macos-4.1.115.Final-osx-aarch_64.jar
- io.netty-netty-resolver-dns-native-macos-4.1.115.Final-osx-x86_64.jar
- io.netty-netty-transport-4.1.115.Final.jar
- io.netty-netty-transport-classes-epoll-4.1.115.Final.jar
- io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar
- io.netty-netty-transport-native-epoll-4.1.115.Final-linux-x86_64.jar
- io.netty-netty-transport-native-unix-common-4.1.115.Final.jar
- io.netty-netty-buffer-4.1.116.Final.jar
- io.netty-netty-codec-4.1.116.Final.jar
- io.netty-netty-codec-dns-4.1.116.Final.jar
- io.netty-netty-codec-http-4.1.116.Final.jar
- io.netty-netty-codec-http2-4.1.116.Final.jar
- io.netty-netty-codec-socks-4.1.116.Final.jar
- io.netty-netty-codec-haproxy-4.1.116.Final.jar
- io.netty-netty-common-4.1.116.Final.jar
- io.netty-netty-handler-4.1.116.Final.jar
- io.netty-netty-handler-proxy-4.1.116.Final.jar
- io.netty-netty-resolver-4.1.116.Final.jar
- io.netty-netty-resolver-dns-4.1.116.Final.jar
- io.netty-netty-resolver-dns-classes-macos-4.1.116.Final.jar
- io.netty-netty-resolver-dns-native-macos-4.1.116.Final-osx-aarch_64.jar
- io.netty-netty-resolver-dns-native-macos-4.1.116.Final-osx-x86_64.jar
- io.netty-netty-transport-4.1.116.Final.jar
- io.netty-netty-transport-classes-epoll-4.1.116.Final.jar
- io.netty-netty-transport-native-epoll-4.1.116.Final-linux-aarch_64.jar
- io.netty-netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar
- io.netty-netty-transport-native-unix-common-4.1.116.Final.jar
- io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar
- io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar
- io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar
- io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar
- io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar
- io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar
- io.netty-netty-tcnative-classes-2.0.69.Final.jar
- io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.24.Final.jar
- io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.24.Final-linux-x86_64.jar
- io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.24.Final-linux-aarch_64.jar
- io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.26.Final.jar
- io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar
- io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar
* Prometheus client
- io.prometheus.jmx-collector-0.16.1.jar
- io.prometheus-simpleclient-0.16.0.jar
Expand Down
44 changes: 22 additions & 22 deletions distribution/shell/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -347,35 +347,35 @@ The Apache Software License, Version 2.0
- commons-text-1.10.0.jar
- commons-compress-1.26.0.jar
* Netty
- netty-buffer-4.1.115.Final.jar
- netty-codec-4.1.115.Final.jar
- netty-codec-dns-4.1.115.Final.jar
- netty-codec-http-4.1.115.Final.jar
- netty-codec-socks-4.1.115.Final.jar
- netty-codec-haproxy-4.1.115.Final.jar
- netty-common-4.1.115.Final.jar
- netty-handler-4.1.115.Final.jar
- netty-handler-proxy-4.1.115.Final.jar
- netty-resolver-4.1.115.Final.jar
- netty-resolver-dns-4.1.115.Final.jar
- netty-transport-4.1.115.Final.jar
- netty-transport-classes-epoll-4.1.115.Final.jar
- netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar
- netty-transport-native-epoll-4.1.115.Final-linux-x86_64.jar
- netty-transport-native-unix-common-4.1.115.Final.jar
- netty-buffer-4.1.116.Final.jar
- netty-codec-4.1.116.Final.jar
- netty-codec-dns-4.1.116.Final.jar
- netty-codec-http-4.1.116.Final.jar
- netty-codec-socks-4.1.116.Final.jar
- netty-codec-haproxy-4.1.116.Final.jar
- netty-common-4.1.116.Final.jar
- netty-handler-4.1.116.Final.jar
- netty-handler-proxy-4.1.116.Final.jar
- netty-resolver-4.1.116.Final.jar
- netty-resolver-dns-4.1.116.Final.jar
- netty-transport-4.1.116.Final.jar
- netty-transport-classes-epoll-4.1.116.Final.jar
- netty-transport-native-epoll-4.1.116.Final-linux-aarch_64.jar
- netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar
- netty-transport-native-unix-common-4.1.116.Final.jar
- netty-tcnative-boringssl-static-2.0.69.Final.jar
- netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar
- netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar
- netty-tcnative-boringssl-static-2.0.69.Final-osx-aarch_64.jar
- netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar
- netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar
- netty-tcnative-classes-2.0.69.Final.jar
- netty-incubator-transport-classes-io_uring-0.0.24.Final.jar
- netty-incubator-transport-native-io_uring-0.0.24.Final-linux-aarch_64.jar
- netty-incubator-transport-native-io_uring-0.0.24.Final-linux-x86_64.jar
- netty-resolver-dns-classes-macos-4.1.115.Final.jar
- netty-resolver-dns-native-macos-4.1.115.Final-osx-aarch_64.jar
- netty-resolver-dns-native-macos-4.1.115.Final-osx-x86_64.jar
- netty-incubator-transport-classes-io_uring-0.0.26.Final.jar
- netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar
- netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar
- netty-resolver-dns-classes-macos-4.1.116.Final.jar
- netty-resolver-dns-native-macos-4.1.116.Final-osx-aarch_64.jar
- netty-resolver-dns-native-macos-4.1.116.Final-osx-x86_64.jar
* Prometheus client
- simpleclient-0.16.0.jar
- simpleclient_log4j2-0.16.0.jar
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ flexible messaging model and an intuitive client API.</description>
<snappy.version>1.1.10.5</snappy.version> <!-- ZooKeeper server -->
<dropwizardmetrics.version>4.1.12.1</dropwizardmetrics.version> <!-- ZooKeeper server -->
<curator.version>5.7.1</curator.version>
<netty.version>4.1.115.Final</netty.version>
<netty-iouring.version>0.0.24.Final</netty-iouring.version>
<netty.version>4.1.116.Final</netty.version>
<netty-iouring.version>0.0.26.Final</netty-iouring.version>
<jetty.version>9.4.56.v20240826</jetty.version>
<conscrypt.version>2.5.2</conscrypt.version>
<jersey.version>2.42</jersey.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2776,6 +2776,7 @@ public void readEntryFailed(ManagedLedgerException exception,
if (exception instanceof ManagedLedgerException.LedgerNotExistException) {
results.completeExceptionally(
new RestException(Status.NOT_FOUND, "Message id not found"));
return;
}
results.completeExceptionally(new RestException(exception));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import org.testng.annotations.Test;

@Slf4j
@Test(groups = "broker")
@Test(groups = "flaky")
public class ZkSessionExpireTest extends NetworkErrorTestBase {

private java.util.function.Consumer<ServiceConfiguration> settings;
Expand Down

0 comments on commit 1cf7b61

Please sign in to comment.