From 5885f458ba1e93d68f7ae359c71744cf83a11e00 Mon Sep 17 00:00:00 2001 From: Jiwei Guo Date: Fri, 19 Jan 2024 20:00:52 +0800 Subject: [PATCH 01/24] [improve][misc] Upgrade Netty version to 4.1.105.Final (#21923) (cherry picked from commit 74f1cd51380b71c77d2f33ecb5830eab19ecb6f3) Signed-off-by: Zixuan Liu # Conflicts: # buildtools/pom.xml # distribution/server/src/assemble/LICENSE.bin.txt # distribution/shell/src/assemble/LICENSE.bin.txt # pom.xml # pulsar-sql/presto-distribution/LICENSE --- buildtools/pom.xml | 1 + .../server/src/assemble/LICENSE.bin.txt | 38 +++++++++--------- pom.xml | 2 +- pulsar-sql/presto-distribution/LICENSE | 39 ++++++++++--------- 4 files changed, 42 insertions(+), 38 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index b16ee33ddd396..c30396a640475 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -53,6 +53,7 @@ 3.4.0 8.37 3.1.2 + 4.1.105.Final 4.2.3 32.0.0-jre 1.10.12 diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index f0099bce47086..db8d6ff746907 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -352,24 +352,26 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-compress-1.26.0.jar - org.apache.commons-commons-lang3-3.11.jar * Netty - - 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-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-aarch_64.jar - - io.netty-netty-transport-native-epoll-4.1.100.Final-linux-x86_64.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-buffer-4.1.105.Final.jar + - io.netty-netty-codec-4.1.105.Final.jar + - io.netty-netty-codec-dns-4.1.105.Final.jar + - io.netty-netty-codec-http-4.1.105.Final.jar + - io.netty-netty-codec-http2-4.1.105.Final.jar + - io.netty-netty-codec-socks-4.1.105.Final.jar + - io.netty-netty-codec-haproxy-4.1.105.Final.jar + - io.netty-netty-common-4.1.105.Final.jar + - io.netty-netty-handler-4.1.105.Final.jar + - io.netty-netty-handler-proxy-4.1.105.Final.jar + - io.netty-netty-resolver-4.1.105.Final.jar + - io.netty-netty-resolver-dns-4.1.105.Final.jar + - io.netty-netty-resolver-dns-classes-macos-4.1.105.Final.jar + - io.netty-netty-resolver-dns-native-macos-4.1.105.Final-osx-aarch_64.jar + - io.netty-netty-resolver-dns-native-macos-4.1.105.Final-osx-x86_64.jar + - io.netty-netty-transport-4.1.105.Final.jar + - io.netty-netty-transport-classes-epoll-4.1.105.Final.jar + - io.netty-netty-transport-native-epoll-4.1.105.Final-linux-x86_64.jar + - io.netty-netty-transport-native-unix-common-4.1.105.Final.jar + - io.netty-netty-transport-native-unix-common-4.1.105.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 diff --git a/pom.xml b/pom.xml index 312a615d00bca..bf5099ad8bf25 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ flexible messaging model and an intuitive client API. 1.1.10.5 4.1.12.1 5.7.1 - 4.1.100.Final + 4.1.105.Final 9.4.54.v20240208 2.5.2 2.34 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 5cea16335652e..95d26bfa97a12 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -231,19 +231,21 @@ The Apache Software License, Version 2.0 - commons-compress-1.26.0.jar - commons-lang3-3.11.jar * Netty - - netty-3.10.6.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-buffer-4.1.105.Final.jar + - netty-codec-4.1.105.Final.jar + - netty-codec-dns-4.1.105.Final.jar + - netty-codec-http-4.1.105.Final.jar + - netty-codec-haproxy-4.1.105.Final.jar + - netty-codec-socks-4.1.105.Final.jar + - netty-handler-proxy-4.1.105.Final.jar + - netty-common-4.1.105.Final.jar + - netty-handler-4.1.105.Final.jar - netty-reactive-streams-2.0.6.jar - - netty-resolver-4.1.100.Final.jar - - netty-resolver-dns-4.1.100.Final.jar + - netty-resolver-4.1.105.Final.jar + - netty-resolver-dns-4.1.105.Final.jar + - netty-resolver-dns-classes-macos-4.1.105.Final.jar + - netty-resolver-dns-native-macos-4.1.105.Final-osx-aarch_64.jar + - netty-resolver-dns-native-macos-4.1.105.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 @@ -251,13 +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.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-epoll-4.1.100.Final-linux-aarch_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-transport-4.1.105.Final.jar + - netty-transport-classes-epoll-4.1.105.Final.jar + - netty-transport-native-epoll-4.1.105.Final-linux-x86_64.jar + - netty-transport-native-unix-common-4.1.105.Final.jar + - netty-transport-native-unix-common-4.1.105.Final-linux-x86_64.jar + - netty-codec-http2-4.1.105.Final.jar - netty-incubator-transport-classes-io_uring-0.0.25.Final.jar - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar From 43f720f11344ef86f0a36ae2741b79ca1a0e4063 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 28 Mar 2024 03:34:14 +0800 Subject: [PATCH 02/24] [improve][misc] Upgrade to Netty 4.1.108 and tcnative 2.0.65 (#22369) (cherry picked from commit be0a9d9d9bb23dabc065f091b853f27c0ebcaa16) Signed-off-by: Zixuan Liu --- buildtools/pom.xml | 2 +- .../server/src/assemble/LICENSE.bin.txt | 55 +++++++++--------- pom.xml | 2 +- pulsar-sql/presto-distribution/LICENSE | 57 ++++++++++--------- 4 files changed, 59 insertions(+), 57 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index c30396a640475..578ee8300e9b2 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -53,7 +53,7 @@ 3.4.0 8.37 3.1.2 - 4.1.105.Final + 4.1.108.Final 4.2.3 32.0.0-jre 1.10.12 diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index db8d6ff746907..2a83b4e48de7e 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -352,33 +352,34 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-compress-1.26.0.jar - org.apache.commons-commons-lang3-3.11.jar * Netty - - io.netty-netty-buffer-4.1.105.Final.jar - - io.netty-netty-codec-4.1.105.Final.jar - - io.netty-netty-codec-dns-4.1.105.Final.jar - - io.netty-netty-codec-http-4.1.105.Final.jar - - io.netty-netty-codec-http2-4.1.105.Final.jar - - io.netty-netty-codec-socks-4.1.105.Final.jar - - io.netty-netty-codec-haproxy-4.1.105.Final.jar - - io.netty-netty-common-4.1.105.Final.jar - - io.netty-netty-handler-4.1.105.Final.jar - - io.netty-netty-handler-proxy-4.1.105.Final.jar - - io.netty-netty-resolver-4.1.105.Final.jar - - io.netty-netty-resolver-dns-4.1.105.Final.jar - - io.netty-netty-resolver-dns-classes-macos-4.1.105.Final.jar - - io.netty-netty-resolver-dns-native-macos-4.1.105.Final-osx-aarch_64.jar - - io.netty-netty-resolver-dns-native-macos-4.1.105.Final-osx-x86_64.jar - - io.netty-netty-transport-4.1.105.Final.jar - - io.netty-netty-transport-classes-epoll-4.1.105.Final.jar - - io.netty-netty-transport-native-epoll-4.1.105.Final-linux-x86_64.jar - - io.netty-netty-transport-native-unix-common-4.1.105.Final.jar - - io.netty-netty-transport-native-unix-common-4.1.105.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 - - io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar - - io.netty-netty-tcnative-classes-2.0.61.Final.jar + - io.netty-netty-buffer-4.1.108.Final.jar + - io.netty-netty-codec-4.1.108.Final.jar + - io.netty-netty-codec-dns-4.1.108.Final.jar + - io.netty-netty-codec-http-4.1.108.Final.jar + - io.netty-netty-codec-http2-4.1.108.Final.jar + - io.netty-netty-codec-socks-4.1.108.Final.jar + - io.netty-netty-codec-haproxy-4.1.108.Final.jar + - io.netty-netty-common-4.1.108.Final.jar + - io.netty-netty-handler-4.1.108.Final.jar + - io.netty-netty-handler-proxy-4.1.108.Final.jar + - io.netty-netty-resolver-4.1.108.Final.jar + - io.netty-netty-resolver-dns-4.1.108.Final.jar + - io.netty-netty-resolver-dns-classes-macos-4.1.108.Final.jar + - io.netty-netty-resolver-dns-native-macos-4.1.108.Final-osx-aarch_64.jar + - io.netty-netty-resolver-dns-native-macos-4.1.108.Final-osx-x86_64.jar + - io.netty-netty-transport-4.1.108.Final.jar + - io.netty-netty-transport-classes-epoll-4.1.108.Final.jar + - io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar + - io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar + - io.netty-netty-transport-native-unix-common-4.1.108.Final.jar + - io.netty-netty-transport-native-unix-common-4.1.108.Final-linux-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar + - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar + - io.netty-netty-tcnative-classes-2.0.65.Final.jar - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.25.Final.jar - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar diff --git a/pom.xml b/pom.xml index bf5099ad8bf25..34edb6071146f 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ flexible messaging model and an intuitive client API. 1.1.10.5 4.1.12.1 5.7.1 - 4.1.105.Final + 4.1.108.Final 9.4.54.v20240208 2.5.2 2.34 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 95d26bfa97a12..ab655b81df03b 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -231,37 +231,38 @@ The Apache Software License, Version 2.0 - commons-compress-1.26.0.jar - commons-lang3-3.11.jar * Netty - - netty-buffer-4.1.105.Final.jar - - netty-codec-4.1.105.Final.jar - - netty-codec-dns-4.1.105.Final.jar - - netty-codec-http-4.1.105.Final.jar - - netty-codec-haproxy-4.1.105.Final.jar - - netty-codec-socks-4.1.105.Final.jar - - netty-handler-proxy-4.1.105.Final.jar - - netty-common-4.1.105.Final.jar - - netty-handler-4.1.105.Final.jar + - netty-buffer-4.1.108.Final.jar + - netty-codec-4.1.108.Final.jar + - netty-codec-dns-4.1.108.Final.jar + - netty-codec-http-4.1.108.Final.jar + - netty-codec-haproxy-4.1.108.Final.jar + - netty-codec-socks-4.1.108.Final.jar + - netty-handler-proxy-4.1.108.Final.jar + - netty-common-4.1.108.Final.jar + - netty-handler-4.1.108.Final.jar - netty-reactive-streams-2.0.6.jar - - netty-resolver-4.1.105.Final.jar - - netty-resolver-dns-4.1.105.Final.jar - - netty-resolver-dns-classes-macos-4.1.105.Final.jar - - netty-resolver-dns-native-macos-4.1.105.Final-osx-aarch_64.jar - - netty-resolver-dns-native-macos-4.1.105.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 - - netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar - - 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.105.Final.jar - - netty-transport-classes-epoll-4.1.105.Final.jar - - netty-transport-native-epoll-4.1.105.Final-linux-x86_64.jar - - netty-transport-native-unix-common-4.1.105.Final.jar - - netty-transport-native-unix-common-4.1.105.Final-linux-x86_64.jar - - netty-codec-http2-4.1.105.Final.jar + - netty-resolver-4.1.108.Final.jar + - netty-resolver-dns-4.1.108.Final.jar + - netty-resolver-dns-classes-macos-4.1.108.Final.jar + - netty-resolver-dns-native-macos-4.1.108.Final-osx-aarch_64.jar + - netty-resolver-dns-native-macos-4.1.108.Final-osx-x86_64.jar + - netty-tcnative-boringssl-static-2.0.65.Final.jar + - netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar + - netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar + - netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar + - netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar + - netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar + - netty-tcnative-classes-2.0.65.Final.jar + - netty-transport-4.1.108.Final.jar + - netty-transport-classes-epoll-4.1.108.Final.jar + - netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar + - netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar + - netty-transport-native-unix-common-4.1.108.Final.jar + - netty-transport-native-unix-common-4.1.108.Final-linux-x86_64.jar + - netty-codec-http2-4.1.108.Final.jar - netty-incubator-transport-classes-io_uring-0.0.25.Final.jar - - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar + - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar * GRPC - grpc-api-1.45.1.jar - grpc-context-1.45.1.jar From 84d4d3ad07147608fbfa4992be575be90e48153b Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 13 Jun 2024 06:24:04 +0800 Subject: [PATCH 03/24] [improve][misc] Upgrade to Netty 4.1.111.Final and switch to use grpc-netty-shaded (#22892) (cherry picked from commit 75d7e557d84bf2cca2ec791dfe8479b8a6df7875) Signed-off-by: Zixuan Liu --- buildtools/pom.xml | 2 +- distribution/server/pom.xml | 13 ++ .../server/src/assemble/LICENSE.bin.txt | 81 ++++---- jetcd-core-shaded/pom.xml | 187 ++++++++++++++++++ pom.xml | 58 +++++- pulsar-broker/pom.xml | 12 ++ pulsar-functions/instance/pom.xml | 7 +- pulsar-metadata/pom.xml | 11 +- pulsar-sql/presto-distribution/LICENSE | 64 +++--- .../src/assembly/assembly.xml | 3 + .../src/assembly/assembly.xml | 3 + 11 files changed, 359 insertions(+), 82 deletions(-) create mode 100644 jetcd-core-shaded/pom.xml diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 578ee8300e9b2..0eabd87222638 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -53,7 +53,7 @@ 3.4.0 8.37 3.1.2 - 4.1.108.Final + 4.1.111.Final 4.2.3 32.0.0-jre 1.10.12 diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml index e74cdec53d505..18ef30b523675 100644 --- a/distribution/server/pom.xml +++ b/distribution/server/pom.xml @@ -40,6 +40,19 @@ ${project.version} + + ${project.groupId} + pulsar-metadata + ${project.version} + + + + ${project.groupId} + jetcd-core-shaded + ${project.version} + shaded + + ${project.groupId} pulsar-proxy diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 2a83b4e48de7e..cdfc78661a7ce 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -352,27 +352,27 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-compress-1.26.0.jar - org.apache.commons-commons-lang3-3.11.jar * Netty - - io.netty-netty-buffer-4.1.108.Final.jar - - io.netty-netty-codec-4.1.108.Final.jar - - io.netty-netty-codec-dns-4.1.108.Final.jar - - io.netty-netty-codec-http-4.1.108.Final.jar - - io.netty-netty-codec-http2-4.1.108.Final.jar - - io.netty-netty-codec-socks-4.1.108.Final.jar - - io.netty-netty-codec-haproxy-4.1.108.Final.jar - - io.netty-netty-common-4.1.108.Final.jar - - io.netty-netty-handler-4.1.108.Final.jar - - io.netty-netty-handler-proxy-4.1.108.Final.jar - - io.netty-netty-resolver-4.1.108.Final.jar - - io.netty-netty-resolver-dns-4.1.108.Final.jar - - io.netty-netty-resolver-dns-classes-macos-4.1.108.Final.jar - - io.netty-netty-resolver-dns-native-macos-4.1.108.Final-osx-aarch_64.jar - - io.netty-netty-resolver-dns-native-macos-4.1.108.Final-osx-x86_64.jar - - io.netty-netty-transport-4.1.108.Final.jar - - io.netty-netty-transport-classes-epoll-4.1.108.Final.jar - - io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar - - io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar - - io.netty-netty-transport-native-unix-common-4.1.108.Final.jar - - io.netty-netty-transport-native-unix-common-4.1.108.Final-linux-x86_64.jar + - io.netty-netty-buffer-4.1.111.Final.jar + - io.netty-netty-codec-4.1.111.Final.jar + - io.netty-netty-codec-dns-4.1.111.Final.jar + - io.netty-netty-codec-http-4.1.111.Final.jar + - io.netty-netty-codec-http2-4.1.111.Final.jar + - io.netty-netty-codec-socks-4.1.111.Final.jar + - io.netty-netty-codec-haproxy-4.1.111.Final.jar + - io.netty-netty-common-4.1.111.Final.jar + - io.netty-netty-handler-4.1.111.Final.jar + - io.netty-netty-handler-proxy-4.1.111.Final.jar + - io.netty-netty-resolver-4.1.111.Final.jar + - io.netty-netty-resolver-dns-4.1.111.Final.jar + - io.netty-netty-resolver-dns-classes-macos-4.1.111.Final.jar + - io.netty-netty-resolver-dns-native-macos-4.1.111.Final-osx-aarch_64.jar + - io.netty-netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar + - io.netty-netty-transport-4.1.111.Final.jar + - io.netty-netty-transport-classes-epoll-4.1.111.Final.jar + - io.netty-netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar + - io.netty-netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar + - io.netty-netty-transport-native-unix-common-4.1.111.Final.jar + - io.netty-netty-transport-native-unix-common-4.1.111.Final-linux-x86_64.jar - io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar @@ -476,22 +476,23 @@ The Apache Software License, Version 2.0 - org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.6.0.jar - org.jetbrains-annotations-13.0.jar * gRPC - - io.grpc-grpc-all-1.45.1.jar - - io.grpc-grpc-auth-1.45.1.jar - - io.grpc-grpc-context-1.45.1.jar - - io.grpc-grpc-core-1.45.1.jar - - io.grpc-grpc-netty-1.45.1.jar - - io.grpc-grpc-protobuf-1.45.1.jar - - io.grpc-grpc-protobuf-lite-1.45.1.jar - - io.grpc-grpc-stub-1.45.1.jar - - io.grpc-grpc-alts-1.45.1.jar - - io.grpc-grpc-api-1.45.1.jar - - io.grpc-grpc-grpclb-1.45.1.jar - - io.grpc-grpc-netty-shaded-1.45.1.jar - - io.grpc-grpc-services-1.45.1.jar - - io.grpc-grpc-xds-1.45.1.jar - - io.grpc-grpc-rls-1.45.1.jar - - com.google.auto.service-auto-service-annotations-1.0.jar + - io.grpc-grpc-all-1.55.3.jar + - io.grpc-grpc-auth-1.55.3.jar + - io.grpc-grpc-context-1.55.3.jar + - io.grpc-grpc-core-1.55.3.jar + - io.grpc-grpc-protobuf-1.55.3.jar + - io.grpc-grpc-protobuf-lite-1.55.3.jar + - io.grpc-grpc-stub-1.55.3.jar + - io.grpc-grpc-alts-1.55.3.jar + - io.grpc-grpc-api-1.55.3.jar + - io.grpc-grpc-grpclb-1.55.3.jar + - io.grpc-grpc-netty-shaded-1.55.3.jar + - io.grpc-grpc-services-1.55.3.jar + - io.grpc-grpc-xds-1.55.3.jar + - io.grpc-grpc-rls-1.55.3.jar + - io.grpc-grpc-servlet-1.55.3.jar + - io.grpc-grpc-servlet-jakarta-1.55.3.jar + - io.grpc-grpc-util-1.60.0.jar * Perfmark - io.perfmark-perfmark-api-0.19.0.jar * OpenCensus @@ -547,10 +548,8 @@ The Apache Software License, Version 2.0 - com.google.http-client-google-http-client-gson-1.41.0.jar - com.google.http-client-google-http-client-1.41.0.jar - com.google.auto.value-auto-value-annotations-1.9.jar - - com.google.re2j-re2j-1.5.jar - * Jetcd - - io.etcd-jetcd-common-0.5.11.jar - - io.etcd-jetcd-core-0.5.11.jar + - com.google.re2j-re2j-1.6.jar + * Jetcd - shaded * IPAddress - com.github.seancfoley-ipaddress-5.3.3.jar * RoaringBitmap diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml new file mode 100644 index 0000000000000..18dabf28b87f9 --- /dev/null +++ b/jetcd-core-shaded/pom.xml @@ -0,0 +1,187 @@ + + + + 4.0.0 + + org.apache.pulsar + pulsar + 3.0.6-SNAPSHOT + + + jetcd-core-shaded + Apache Pulsar :: jetcd-core shaded + + + + io.etcd + jetcd-core + + + io.grpc + grpc-netty + + + io.netty + * + + + + + io.grpc + grpc-netty-shaded + + + + dev.failsafe + failsafe + + + io.grpc + grpc-protobuf + + + io.grpc + grpc-stub + + + io.grpc + grpc-grpclb + + + io.grpc + grpc-util + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + true + true + false + + + io.etcd:* + io.vertx:* + + + + + + io.vertx + org.apache.pulsar.jetcd.shaded.io.vertx + + + + io.grpc.netty + io.grpc.netty.shaded.io.grpc.netty + + + + io.netty + io.grpc.netty.shaded.io.netty + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml + + + + + + + + META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml + ${project.basedir}/dependency-reduced-pom.xml + + + + true + shaded + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-shaded-jar + package + + attach-artifact + + + + + ${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar + jar + shaded + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + unpack-shaded-jar + package + + run + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 34edb6071146f..2fe136d113d74 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ flexible messaging model and an intuitive client API. 1.1.10.5 4.1.12.1 5.7.1 - 4.1.108.Final + 4.1.111.Final 9.4.54.v20240208 2.5.2 2.34 @@ -536,6 +536,14 @@ flexible messaging model and an intuitive client API. com.squareup.okio okio + + jose4j + org.bitbucket.b_c + + + io.grpc + grpc-netty + @@ -925,12 +933,51 @@ flexible messaging model and an intuitive client API. io.etcd jetcd-core ${jetcd.version} + + + io.grpc + grpc-netty + + - io.etcd jetcd-test ${jetcd.version} + + + io.grpc + grpc-netty + + + io.etcd + jetcd-core + + + io.etcd + jetcd-api + + + io.vertx + * + + + + + ${project.groupId} + jetcd-core-shaded + ${project.version} + shaded + + + io.etcd + * + + + io.vertx + * + + @@ -1024,6 +1071,10 @@ flexible messaging model and an intuitive client API. com.squareup.okio okio + + io.grpc + grpc-netty + @@ -2218,6 +2269,7 @@ flexible messaging model and an intuitive client API. pulsar-client-messagecrypto-bc pulsar-metadata + jetcd-core-shaded jclouds-shaded @@ -2274,7 +2326,7 @@ flexible messaging model and an intuitive client API. distribution pulsar-metadata - + jetcd-core-shaded pulsar-package-management diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index 24f204415cf51..9b7886c825e81 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -435,6 +435,18 @@ ${project.version} + + ${project.groupId} + jetcd-core-shaded + ${project.version} + shaded + test + + + io.grpc + grpc-netty-shaded + test + io.etcd jetcd-test diff --git a/pulsar-functions/instance/pom.xml b/pulsar-functions/instance/pom.xml index b300bed1a3f34..c458b20e99998 100644 --- a/pulsar-functions/instance/pom.xml +++ b/pulsar-functions/instance/pom.xml @@ -107,7 +107,7 @@ io.grpc - grpc-all + * com.google.protobuf @@ -116,6 +116,11 @@ + + io.grpc + grpc-netty-shaded + + io.grpc grpc-stub diff --git a/pulsar-metadata/pom.xml b/pulsar-metadata/pom.xml index 16f6751be0d45..ba40d8487414b 100644 --- a/pulsar-metadata/pom.xml +++ b/pulsar-metadata/pom.xml @@ -83,10 +83,15 @@ - io.etcd - jetcd-core + ${project.groupId} + jetcd-core-shaded + ${project.version} + shaded + + + io.grpc + grpc-netty-shaded - io.etcd diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index ab655b81df03b..f3110df331710 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.26.0.jar - commons-lang3-3.11.jar * Netty - - netty-buffer-4.1.108.Final.jar - - netty-codec-4.1.108.Final.jar - - netty-codec-dns-4.1.108.Final.jar - - netty-codec-http-4.1.108.Final.jar - - netty-codec-haproxy-4.1.108.Final.jar - - netty-codec-socks-4.1.108.Final.jar - - netty-handler-proxy-4.1.108.Final.jar - - netty-common-4.1.108.Final.jar - - netty-handler-4.1.108.Final.jar + - netty-buffer-4.1.111.Final.jar + - netty-codec-4.1.111.Final.jar + - netty-codec-dns-4.1.111.Final.jar + - netty-codec-http-4.1.111.Final.jar + - netty-codec-haproxy-4.1.111.Final.jar + - netty-codec-socks-4.1.111.Final.jar + - netty-handler-proxy-4.1.111.Final.jar + - netty-common-4.1.111.Final.jar + - netty-handler-4.1.111.Final.jar - netty-reactive-streams-2.0.6.jar - - netty-resolver-4.1.108.Final.jar - - netty-resolver-dns-4.1.108.Final.jar - - netty-resolver-dns-classes-macos-4.1.108.Final.jar - - netty-resolver-dns-native-macos-4.1.108.Final-osx-aarch_64.jar - - netty-resolver-dns-native-macos-4.1.108.Final-osx-x86_64.jar + - netty-resolver-4.1.111.Final.jar + - netty-resolver-dns-4.1.111.Final.jar + - netty-resolver-dns-classes-macos-4.1.111.Final.jar + - netty-resolver-dns-native-macos-4.1.111.Final-osx-aarch_64.jar + - netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar - netty-tcnative-boringssl-static-2.0.65.Final.jar - netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar - netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar @@ -253,29 +253,27 @@ The Apache Software License, Version 2.0 - netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar - netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar - netty-tcnative-classes-2.0.65.Final.jar - - netty-transport-4.1.108.Final.jar - - netty-transport-classes-epoll-4.1.108.Final.jar - - netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar - - netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar - - netty-transport-native-unix-common-4.1.108.Final.jar - - netty-transport-native-unix-common-4.1.108.Final-linux-x86_64.jar - - netty-codec-http2-4.1.108.Final.jar + - netty-transport-4.1.111.Final.jar + - netty-transport-classes-epoll-4.1.111.Final.jar + - netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar + - netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar + - netty-transport-native-unix-common-4.1.111.Final.jar + - netty-transport-native-unix-common-4.1.111.Final-linux-x86_64.jar - netty-incubator-transport-classes-io_uring-0.0.25.Final.jar - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar * GRPC - - grpc-api-1.45.1.jar - - grpc-context-1.45.1.jar - - grpc-core-1.45.1.jar - - grpc-grpclb-1.45.1.jar - - grpc-netty-1.45.1.jar - - grpc-protobuf-1.45.1.jar - - grpc-protobuf-lite-1.45.1.jar - - grpc-stub-1.45.1.jar - * JEtcd - - jetcd-common-0.5.11.jar - - jetcd-core-0.5.11.jar - + - grpc-api-1.55.3.jar + - grpc-context-1.55.3.jar + - grpc-core-1.55.3.jar + - grpc-grpclb-1.55.3.jar + - grpc-netty-shaded-1.55.3.jar + - grpc-protobuf-1.55.3.jar + - grpc-protobuf-lite-1.55.3.jar + - grpc-stub-1.55.3.jar + - grpc-util-1.60.0.jar + * JEtcd - shaded + * Vertx - shaded * Joda Time - joda-time-2.10.5.jar - failsafe-2.4.4.jar diff --git a/pulsar-sql/presto-distribution/src/assembly/assembly.xml b/pulsar-sql/presto-distribution/src/assembly/assembly.xml index bc1fe5ed46037..c3b0a18c959f1 100644 --- a/pulsar-sql/presto-distribution/src/assembly/assembly.xml +++ b/pulsar-sql/presto-distribution/src/assembly/assembly.xml @@ -61,6 +61,9 @@ io.airlift:launcher:tar.gz:bin:${airlift.version} io.airlift:launcher:tar.gz:properties:${airlift.version} *:tar.gz + + org.codehaus.mojo:animal-sniffer-annotations + com.google.android:annotations diff --git a/pulsar-sql/presto-pulsar-plugin/src/assembly/assembly.xml b/pulsar-sql/presto-pulsar-plugin/src/assembly/assembly.xml index 6650abfda3fc3..ac17aaed70bdf 100644 --- a/pulsar-sql/presto-pulsar-plugin/src/assembly/assembly.xml +++ b/pulsar-sql/presto-pulsar-plugin/src/assembly/assembly.xml @@ -33,6 +33,9 @@ runtime jakarta.ws.rs:jakarta.ws.rs-api + + org.codehaus.mojo:animal-sniffer-annotations + com.google.android:annotations From e2e065fa1afa041ad873440fd7ece7da9648946e Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 5 Sep 2024 12:53:07 +0800 Subject: [PATCH 04/24] [improve][misc] Upgrade Netty to 4.1.113 and netty-tcnative to 2.0.66 (#23255) (cherry picked from commit a28c0df9ba3bb7aec8985ef9daa97c7ea38f8a39) Signed-off-by: Zixuan Liu --- buildtools/pom.xml | 2 +- .../server/src/assemble/LICENSE.bin.txt | 55 +++++++++---------- pom.xml | 2 +- pulsar-sql/presto-distribution/LICENSE | 53 +++++++++--------- 4 files changed, 55 insertions(+), 57 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 0eabd87222638..ec9988e40d845 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -53,7 +53,7 @@ 3.4.0 8.37 3.1.2 - 4.1.111.Final + 4.1.113.Final 4.2.3 32.0.0-jre 1.10.12 diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index cdfc78661a7ce..7e4a04890fe84 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -352,34 +352,33 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-compress-1.26.0.jar - org.apache.commons-commons-lang3-3.11.jar * Netty - - io.netty-netty-buffer-4.1.111.Final.jar - - io.netty-netty-codec-4.1.111.Final.jar - - io.netty-netty-codec-dns-4.1.111.Final.jar - - io.netty-netty-codec-http-4.1.111.Final.jar - - io.netty-netty-codec-http2-4.1.111.Final.jar - - io.netty-netty-codec-socks-4.1.111.Final.jar - - io.netty-netty-codec-haproxy-4.1.111.Final.jar - - io.netty-netty-common-4.1.111.Final.jar - - io.netty-netty-handler-4.1.111.Final.jar - - io.netty-netty-handler-proxy-4.1.111.Final.jar - - io.netty-netty-resolver-4.1.111.Final.jar - - io.netty-netty-resolver-dns-4.1.111.Final.jar - - io.netty-netty-resolver-dns-classes-macos-4.1.111.Final.jar - - io.netty-netty-resolver-dns-native-macos-4.1.111.Final-osx-aarch_64.jar - - io.netty-netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar - - io.netty-netty-transport-4.1.111.Final.jar - - io.netty-netty-transport-classes-epoll-4.1.111.Final.jar - - io.netty-netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar - - io.netty-netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar - - io.netty-netty-transport-native-unix-common-4.1.111.Final.jar - - io.netty-netty-transport-native-unix-common-4.1.111.Final-linux-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar - - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar - - io.netty-netty-tcnative-classes-2.0.65.Final.jar + - io.netty-netty-buffer-4.1.113.Final.jar + - io.netty-netty-codec-4.1.113.Final.jar + - io.netty-netty-codec-dns-4.1.113.Final.jar + - io.netty-netty-codec-http-4.1.113.Final.jar + - io.netty-netty-codec-http2-4.1.113.Final.jar + - io.netty-netty-codec-socks-4.1.113.Final.jar + - io.netty-netty-codec-haproxy-4.1.113.Final.jar + - io.netty-netty-common-4.1.113.Final.jar + - io.netty-netty-handler-4.1.113.Final.jar + - io.netty-netty-handler-proxy-4.1.113.Final.jar + - io.netty-netty-resolver-4.1.113.Final.jar + - io.netty-netty-resolver-dns-4.1.113.Final.jar + - io.netty-netty-resolver-dns-classes-macos-4.1.113.Final.jar + - io.netty-netty-resolver-dns-native-macos-4.1.113.Final-osx-aarch_64.jar + - io.netty-netty-resolver-dns-native-macos-4.1.113.Final-osx-x86_64.jar + - io.netty-netty-transport-4.1.113.Final.jar + - io.netty-netty-transport-classes-epoll-4.1.113.Final.jar + - io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar + - io.netty-netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar + - io.netty-netty-transport-native-unix-common-4.1.113.Final.jar + - io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar + - io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar + - io.netty-netty-tcnative-classes-2.0.66.Final.jar - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.25.Final.jar - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar diff --git a/pom.xml b/pom.xml index 2fe136d113d74..46d6ead57f6de 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ flexible messaging model and an intuitive client API. 1.1.10.5 4.1.12.1 5.7.1 - 4.1.111.Final + 4.1.113.Final 9.4.54.v20240208 2.5.2 2.34 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index f3110df331710..e51881d1aebdd 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -231,34 +231,33 @@ The Apache Software License, Version 2.0 - commons-compress-1.26.0.jar - commons-lang3-3.11.jar * Netty - - netty-buffer-4.1.111.Final.jar - - netty-codec-4.1.111.Final.jar - - netty-codec-dns-4.1.111.Final.jar - - netty-codec-http-4.1.111.Final.jar - - netty-codec-haproxy-4.1.111.Final.jar - - netty-codec-socks-4.1.111.Final.jar - - netty-handler-proxy-4.1.111.Final.jar - - netty-common-4.1.111.Final.jar - - netty-handler-4.1.111.Final.jar + - netty-buffer-4.1.113.Final.jar + - netty-codec-4.1.113.Final.jar + - netty-codec-dns-4.1.113.Final.jar + - netty-codec-http-4.1.113.Final.jar + - netty-codec-haproxy-4.1.113.Final.jar + - netty-codec-socks-4.1.113.Final.jar + - netty-handler-proxy-4.1.113.Final.jar + - netty-common-4.1.113.Final.jar + - netty-handler-4.1.113.Final.jar - netty-reactive-streams-2.0.6.jar - - netty-resolver-4.1.111.Final.jar - - netty-resolver-dns-4.1.111.Final.jar - - netty-resolver-dns-classes-macos-4.1.111.Final.jar - - netty-resolver-dns-native-macos-4.1.111.Final-osx-aarch_64.jar - - netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar - - netty-tcnative-boringssl-static-2.0.65.Final.jar - - netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar - - netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar - - netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar - - netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar - - netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar - - netty-tcnative-classes-2.0.65.Final.jar - - netty-transport-4.1.111.Final.jar - - netty-transport-classes-epoll-4.1.111.Final.jar - - netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar - - netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar - - netty-transport-native-unix-common-4.1.111.Final.jar - - netty-transport-native-unix-common-4.1.111.Final-linux-x86_64.jar + - netty-resolver-4.1.113.Final.jar + - netty-resolver-dns-4.1.113.Final.jar + - netty-resolver-dns-classes-macos-4.1.113.Final.jar + - netty-resolver-dns-native-macos-4.1.113.Final-osx-aarch_64.jar + - netty-resolver-dns-native-macos-4.1.113.Final-osx-x86_64.jar + - netty-tcnative-boringssl-static-2.0.66.Final.jar + - netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar + - netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar + - netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar + - netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar + - netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar + - netty-tcnative-classes-2.0.66.Final.jar + - netty-transport-4.1.113.Final.jar + - netty-transport-classes-epoll-4.1.113.Final.jar + - netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar + - netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar + - netty-transport-native-unix-common-4.1.113.Final.jar - netty-incubator-transport-classes-io_uring-0.0.25.Final.jar - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar From 8d82a1020a9fa21e1e1598fc6f9eb70b4159232c Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 13 Nov 2024 17:54:39 +0800 Subject: [PATCH 05/24] [fix][sec] Upgrade to Netty 4.1.115.Final to address CVE-2024-47535 (#23596) (cherry picked from commit 04c80f17d4f48bc0a2062d9cc0e90946fcc145ad) Signed-off-by: Zixuan Liu --- buildtools/pom.xml | 2 +- .../server/src/assemble/LICENSE.bin.txt | 54 +++++++++---------- pom.xml | 2 +- pulsar-sql/presto-distribution/LICENSE | 52 +++++++++--------- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index ec9988e40d845..6394af5eb9326 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -53,7 +53,7 @@ 3.4.0 8.37 3.1.2 - 4.1.113.Final + 4.1.115.Final 4.2.3 32.0.0-jre 1.10.12 diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 7e4a04890fe84..324cd90980216 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -352,33 +352,33 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-compress-1.26.0.jar - org.apache.commons-commons-lang3-3.11.jar * Netty - - io.netty-netty-buffer-4.1.113.Final.jar - - io.netty-netty-codec-4.1.113.Final.jar - - io.netty-netty-codec-dns-4.1.113.Final.jar - - io.netty-netty-codec-http-4.1.113.Final.jar - - io.netty-netty-codec-http2-4.1.113.Final.jar - - io.netty-netty-codec-socks-4.1.113.Final.jar - - io.netty-netty-codec-haproxy-4.1.113.Final.jar - - io.netty-netty-common-4.1.113.Final.jar - - io.netty-netty-handler-4.1.113.Final.jar - - io.netty-netty-handler-proxy-4.1.113.Final.jar - - io.netty-netty-resolver-4.1.113.Final.jar - - io.netty-netty-resolver-dns-4.1.113.Final.jar - - io.netty-netty-resolver-dns-classes-macos-4.1.113.Final.jar - - io.netty-netty-resolver-dns-native-macos-4.1.113.Final-osx-aarch_64.jar - - io.netty-netty-resolver-dns-native-macos-4.1.113.Final-osx-x86_64.jar - - io.netty-netty-transport-4.1.113.Final.jar - - io.netty-netty-transport-classes-epoll-4.1.113.Final.jar - - io.netty-netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar - - io.netty-netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar - - io.netty-netty-transport-native-unix-common-4.1.113.Final.jar - - io.netty-netty-tcnative-boringssl-static-2.0.66.Final.jar - - io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar - - io.netty-netty-tcnative-classes-2.0.66.Final.jar + - 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-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.25.Final.jar - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar diff --git a/pom.xml b/pom.xml index 46d6ead57f6de..1e01bb96b8d79 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ flexible messaging model and an intuitive client API. 1.1.10.5 4.1.12.1 5.7.1 - 4.1.113.Final + 4.1.115.Final 9.4.54.v20240208 2.5.2 2.34 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index e51881d1aebdd..064f4fa557f51 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -231,33 +231,33 @@ The Apache Software License, Version 2.0 - commons-compress-1.26.0.jar - commons-lang3-3.11.jar * Netty - - netty-buffer-4.1.113.Final.jar - - netty-codec-4.1.113.Final.jar - - netty-codec-dns-4.1.113.Final.jar - - netty-codec-http-4.1.113.Final.jar - - netty-codec-haproxy-4.1.113.Final.jar - - netty-codec-socks-4.1.113.Final.jar - - netty-handler-proxy-4.1.113.Final.jar - - netty-common-4.1.113.Final.jar - - netty-handler-4.1.113.Final.jar + - 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-haproxy-4.1.115.Final.jar + - netty-codec-socks-4.1.115.Final.jar + - netty-handler-proxy-4.1.115.Final.jar + - netty-common-4.1.115.Final.jar + - netty-handler-4.1.115.Final.jar - netty-reactive-streams-2.0.6.jar - - netty-resolver-4.1.113.Final.jar - - netty-resolver-dns-4.1.113.Final.jar - - netty-resolver-dns-classes-macos-4.1.113.Final.jar - - netty-resolver-dns-native-macos-4.1.113.Final-osx-aarch_64.jar - - netty-resolver-dns-native-macos-4.1.113.Final-osx-x86_64.jar - - netty-tcnative-boringssl-static-2.0.66.Final.jar - - netty-tcnative-boringssl-static-2.0.66.Final-linux-aarch_64.jar - - netty-tcnative-boringssl-static-2.0.66.Final-linux-x86_64.jar - - netty-tcnative-boringssl-static-2.0.66.Final-osx-aarch_64.jar - - netty-tcnative-boringssl-static-2.0.66.Final-osx-x86_64.jar - - netty-tcnative-boringssl-static-2.0.66.Final-windows-x86_64.jar - - netty-tcnative-classes-2.0.66.Final.jar - - netty-transport-4.1.113.Final.jar - - netty-transport-classes-epoll-4.1.113.Final.jar - - netty-transport-native-epoll-4.1.113.Final-linux-aarch_64.jar - - netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar - - netty-transport-native-unix-common-4.1.113.Final.jar + - netty-resolver-4.1.115.Final.jar + - netty-resolver-dns-4.1.115.Final.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-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-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-incubator-transport-classes-io_uring-0.0.25.Final.jar - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar From 2b6e336671acb682e3163acd197ef036d39e509d Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Mon, 6 Jan 2025 02:51:08 +0800 Subject: [PATCH 06/24] [improve] Upgrade to Netty 4.1.116.Final and io_uring to 0.0.26.Final (#23813) (cherry picked from commit 2bd97845bdbc11733ee5ff2eaa5cd16e96129180) Signed-off-by: Zixuan Liu --- buildtools/pom.xml | 2 +- .../server/src/assemble/LICENSE.bin.txt | 46 +++++++++---------- pom.xml | 3 +- pulsar-sql/presto-distribution/LICENSE | 44 +++++++++--------- 4 files changed, 48 insertions(+), 47 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 6394af5eb9326..632a480b2e56e 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -53,7 +53,7 @@ 3.4.0 8.37 3.1.2 - 4.1.115.Final + 4.1.116.Final 4.2.3 32.0.0-jre 1.10.12 diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 324cd90980216..b58b5a61ff642 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -352,26 +352,26 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-compress-1.26.0.jar - org.apache.commons-commons-lang3-3.11.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 @@ -379,9 +379,9 @@ The Apache Software License, Version 2.0 - 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.25.Final.jar - - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar - - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.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-simpleclient-0.5.0.jar - io.prometheus-simpleclient_common-0.5.0.jar diff --git a/pom.xml b/pom.xml index 1e01bb96b8d79..9c7dae49f09d9 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,8 @@ flexible messaging model and an intuitive client API. 1.1.10.5 4.1.12.1 5.7.1 - 4.1.115.Final + 4.1.116.Final + 0.0.26.Final 9.4.54.v20240208 2.5.2 2.34 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 064f4fa557f51..4fbc6633e881b 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.26.0.jar - commons-lang3-3.11.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-haproxy-4.1.115.Final.jar - - netty-codec-socks-4.1.115.Final.jar - - netty-handler-proxy-4.1.115.Final.jar - - netty-common-4.1.115.Final.jar - - netty-handler-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-haproxy-4.1.116.Final.jar + - netty-codec-socks-4.1.116.Final.jar + - netty-handler-proxy-4.1.116.Final.jar + - netty-common-4.1.116.Final.jar + - netty-handler-4.1.116.Final.jar - netty-reactive-streams-2.0.6.jar - - netty-resolver-4.1.115.Final.jar - - netty-resolver-dns-4.1.115.Final.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-resolver-4.1.116.Final.jar + - netty-resolver-dns-4.1.116.Final.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 - 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 @@ -253,14 +253,14 @@ The Apache Software License, Version 2.0 - 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-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-incubator-transport-classes-io_uring-0.0.25.Final.jar - - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar - - netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.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-incubator-transport-classes-io_uring-0.0.26.Final.jar + - netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar + - netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar * GRPC - grpc-api-1.55.3.jar - grpc-context-1.55.3.jar From 1dec3cb7be71d3ff009d04ba44a1b50bec738d51 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 21 Jan 2025 01:39:54 +0800 Subject: [PATCH 07/24] [improve] Upgrade to Netty 4.1.117.Final (#23863) (cherry picked from commit a96af729d805b679d0356b6dd2f6a1c66ad20252) Signed-off-by: Zixuan Liu --- buildtools/pom.xml | 2 +- .../server/src/assemble/LICENSE.bin.txt | 40 +++++++++---------- pom.xml | 2 +- pulsar-sql/presto-distribution/LICENSE | 38 +++++++++--------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 632a480b2e56e..e8438dfd7de87 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -53,7 +53,7 @@ 3.4.0 8.37 3.1.2 - 4.1.116.Final + 4.1.117.Final 4.2.3 32.0.0-jre 1.10.12 diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index b58b5a61ff642..3250dd81af560 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -352,26 +352,26 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-compress-1.26.0.jar - org.apache.commons-commons-lang3-3.11.jar * Netty - - 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-buffer-4.1.117.Final.jar + - io.netty-netty-codec-4.1.117.Final.jar + - io.netty-netty-codec-dns-4.1.117.Final.jar + - io.netty-netty-codec-http-4.1.117.Final.jar + - io.netty-netty-codec-http2-4.1.117.Final.jar + - io.netty-netty-codec-socks-4.1.117.Final.jar + - io.netty-netty-codec-haproxy-4.1.117.Final.jar + - io.netty-netty-common-4.1.117.Final.jar + - io.netty-netty-handler-4.1.117.Final.jar + - io.netty-netty-handler-proxy-4.1.117.Final.jar + - io.netty-netty-resolver-4.1.117.Final.jar + - io.netty-netty-resolver-dns-4.1.117.Final.jar + - io.netty-netty-resolver-dns-classes-macos-4.1.117.Final.jar + - io.netty-netty-resolver-dns-native-macos-4.1.117.Final-osx-aarch_64.jar + - io.netty-netty-resolver-dns-native-macos-4.1.117.Final-osx-x86_64.jar + - io.netty-netty-transport-4.1.117.Final.jar + - io.netty-netty-transport-classes-epoll-4.1.117.Final.jar + - io.netty-netty-transport-native-epoll-4.1.117.Final-linux-aarch_64.jar + - io.netty-netty-transport-native-epoll-4.1.117.Final-linux-x86_64.jar + - io.netty-netty-transport-native-unix-common-4.1.117.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 diff --git a/pom.xml b/pom.xml index 9c7dae49f09d9..5993317cd26b1 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ flexible messaging model and an intuitive client API. 1.1.10.5 4.1.12.1 5.7.1 - 4.1.116.Final + 4.1.117.Final 0.0.26.Final 9.4.54.v20240208 2.5.2 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 4fbc6633e881b..97cea3bc66995 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.26.0.jar - commons-lang3-3.11.jar * Netty - - 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-haproxy-4.1.116.Final.jar - - netty-codec-socks-4.1.116.Final.jar - - netty-handler-proxy-4.1.116.Final.jar - - netty-common-4.1.116.Final.jar - - netty-handler-4.1.116.Final.jar + - netty-buffer-4.1.117.Final.jar + - netty-codec-4.1.117.Final.jar + - netty-codec-dns-4.1.117.Final.jar + - netty-codec-http-4.1.117.Final.jar + - netty-codec-haproxy-4.1.117.Final.jar + - netty-codec-socks-4.1.117.Final.jar + - netty-handler-proxy-4.1.117.Final.jar + - netty-common-4.1.117.Final.jar + - netty-handler-4.1.117.Final.jar - netty-reactive-streams-2.0.6.jar - - netty-resolver-4.1.116.Final.jar - - netty-resolver-dns-4.1.116.Final.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 + - netty-resolver-4.1.117.Final.jar + - netty-resolver-dns-4.1.117.Final.jar + - netty-resolver-dns-classes-macos-4.1.117.Final.jar + - netty-resolver-dns-native-macos-4.1.117.Final-osx-aarch_64.jar + - netty-resolver-dns-native-macos-4.1.117.Final-osx-x86_64.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 @@ -253,11 +253,11 @@ The Apache Software License, Version 2.0 - 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-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-transport-4.1.117.Final.jar + - netty-transport-classes-epoll-4.1.117.Final.jar + - netty-transport-native-epoll-4.1.117.Final-linux-aarch_64.jar + - netty-transport-native-epoll-4.1.117.Final-linux-x86_64.jar + - netty-transport-native-unix-common-4.1.117.Final.jar - netty-incubator-transport-classes-io_uring-0.0.26.Final.jar - netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar - netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar From 00393339fb1e37ac79378c3d2d44389fc8c6f4ba Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Wed, 12 Feb 2025 04:37:09 +0800 Subject: [PATCH 08/24] [fix][sec] Upgrade to Netty 4.1.118 (#23965) Signed-off-by: Zixuan Liu --- buildtools/pom.xml | 2 +- .../server/src/assemble/LICENSE.bin.txt | 54 +++++++++---------- pom.xml | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index e8438dfd7de87..c428f2bcbfc11 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -53,7 +53,7 @@ 3.4.0 8.37 3.1.2 - 4.1.117.Final + 4.1.118.Final 4.2.3 32.0.0-jre 1.10.12 diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 3250dd81af560..989c9667caf72 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -352,33 +352,33 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-compress-1.26.0.jar - org.apache.commons-commons-lang3-3.11.jar * Netty - - io.netty-netty-buffer-4.1.117.Final.jar - - io.netty-netty-codec-4.1.117.Final.jar - - io.netty-netty-codec-dns-4.1.117.Final.jar - - io.netty-netty-codec-http-4.1.117.Final.jar - - io.netty-netty-codec-http2-4.1.117.Final.jar - - io.netty-netty-codec-socks-4.1.117.Final.jar - - io.netty-netty-codec-haproxy-4.1.117.Final.jar - - io.netty-netty-common-4.1.117.Final.jar - - io.netty-netty-handler-4.1.117.Final.jar - - io.netty-netty-handler-proxy-4.1.117.Final.jar - - io.netty-netty-resolver-4.1.117.Final.jar - - io.netty-netty-resolver-dns-4.1.117.Final.jar - - io.netty-netty-resolver-dns-classes-macos-4.1.117.Final.jar - - io.netty-netty-resolver-dns-native-macos-4.1.117.Final-osx-aarch_64.jar - - io.netty-netty-resolver-dns-native-macos-4.1.117.Final-osx-x86_64.jar - - io.netty-netty-transport-4.1.117.Final.jar - - io.netty-netty-transport-classes-epoll-4.1.117.Final.jar - - io.netty-netty-transport-native-epoll-4.1.117.Final-linux-aarch_64.jar - - io.netty-netty-transport-native-epoll-4.1.117.Final-linux-x86_64.jar - - io.netty-netty-transport-native-unix-common-4.1.117.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-netty-buffer-4.1.118.Final.jar + - io.netty-netty-codec-4.1.118.Final.jar + - io.netty-netty-codec-dns-4.1.118.Final.jar + - io.netty-netty-codec-http-4.1.118.Final.jar + - io.netty-netty-codec-http2-4.1.118.Final.jar + - io.netty-netty-codec-socks-4.1.118.Final.jar + - io.netty-netty-codec-haproxy-4.1.118.Final.jar + - io.netty-netty-common-4.1.118.Final.jar + - io.netty-netty-handler-4.1.118.Final.jar + - io.netty-netty-handler-proxy-4.1.118.Final.jar + - io.netty-netty-resolver-4.1.118.Final.jar + - io.netty-netty-resolver-dns-4.1.118.Final.jar + - io.netty-netty-resolver-dns-classes-macos-4.1.118.Final.jar + - io.netty-netty-resolver-dns-native-macos-4.1.118.Final-osx-aarch_64.jar + - io.netty-netty-resolver-dns-native-macos-4.1.118.Final-osx-x86_64.jar + - io.netty-netty-transport-4.1.118.Final.jar + - io.netty-netty-transport-classes-epoll-4.1.118.Final.jar + - io.netty-netty-transport-native-epoll-4.1.118.Final-linux-aarch_64.jar + - io.netty-netty-transport-native-epoll-4.1.118.Final-linux-x86_64.jar + - io.netty-netty-transport-native-unix-common-4.1.118.Final.jar + - io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar + - io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-aarch_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar + - io.netty-netty-tcnative-classes-2.0.70.Final.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 diff --git a/pom.xml b/pom.xml index 5993317cd26b1..43a56fa03e5cb 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ flexible messaging model and an intuitive client API. 1.1.10.5 4.1.12.1 5.7.1 - 4.1.117.Final + 4.1.118.Final 0.0.26.Final 9.4.54.v20240208 2.5.2 From e299f2ba6844bf5fcbfc6ad997cd709250d21dfe Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 4 Mar 2025 19:18:48 +0800 Subject: [PATCH 09/24] [improve] Upgrade Netty to 4.1.119.Final (#24049) (cherry picked from commit d6c09af7e8c50c6e3925600cb61eb0cbc0a0e2a0) Signed-off-by: Zixuan Liu --- buildtools/pom.xml | 2 +- .../server/src/assemble/LICENSE.bin.txt | 40 +++++++++---------- pom.xml | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index c428f2bcbfc11..b536b5d7703a6 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -53,7 +53,7 @@ 3.4.0 8.37 3.1.2 - 4.1.118.Final + 4.1.119.Final 4.2.3 32.0.0-jre 1.10.12 diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 989c9667caf72..5a4ac6022879c 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -352,26 +352,26 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-compress-1.26.0.jar - org.apache.commons-commons-lang3-3.11.jar * Netty - - io.netty-netty-buffer-4.1.118.Final.jar - - io.netty-netty-codec-4.1.118.Final.jar - - io.netty-netty-codec-dns-4.1.118.Final.jar - - io.netty-netty-codec-http-4.1.118.Final.jar - - io.netty-netty-codec-http2-4.1.118.Final.jar - - io.netty-netty-codec-socks-4.1.118.Final.jar - - io.netty-netty-codec-haproxy-4.1.118.Final.jar - - io.netty-netty-common-4.1.118.Final.jar - - io.netty-netty-handler-4.1.118.Final.jar - - io.netty-netty-handler-proxy-4.1.118.Final.jar - - io.netty-netty-resolver-4.1.118.Final.jar - - io.netty-netty-resolver-dns-4.1.118.Final.jar - - io.netty-netty-resolver-dns-classes-macos-4.1.118.Final.jar - - io.netty-netty-resolver-dns-native-macos-4.1.118.Final-osx-aarch_64.jar - - io.netty-netty-resolver-dns-native-macos-4.1.118.Final-osx-x86_64.jar - - io.netty-netty-transport-4.1.118.Final.jar - - io.netty-netty-transport-classes-epoll-4.1.118.Final.jar - - io.netty-netty-transport-native-epoll-4.1.118.Final-linux-aarch_64.jar - - io.netty-netty-transport-native-epoll-4.1.118.Final-linux-x86_64.jar - - io.netty-netty-transport-native-unix-common-4.1.118.Final.jar + - io.netty-netty-buffer-4.1.119.Final.jar + - io.netty-netty-codec-4.1.119.Final.jar + - io.netty-netty-codec-dns-4.1.119.Final.jar + - io.netty-netty-codec-http-4.1.119.Final.jar + - io.netty-netty-codec-http2-4.1.119.Final.jar + - io.netty-netty-codec-socks-4.1.119.Final.jar + - io.netty-netty-codec-haproxy-4.1.119.Final.jar + - io.netty-netty-common-4.1.119.Final.jar + - io.netty-netty-handler-4.1.119.Final.jar + - io.netty-netty-handler-proxy-4.1.119.Final.jar + - io.netty-netty-resolver-4.1.119.Final.jar + - io.netty-netty-resolver-dns-4.1.119.Final.jar + - io.netty-netty-resolver-dns-classes-macos-4.1.119.Final.jar + - io.netty-netty-resolver-dns-native-macos-4.1.119.Final-osx-aarch_64.jar + - io.netty-netty-resolver-dns-native-macos-4.1.119.Final-osx-x86_64.jar + - io.netty-netty-transport-4.1.119.Final.jar + - io.netty-netty-transport-classes-epoll-4.1.119.Final.jar + - io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar + - io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar + - io.netty-netty-transport-native-unix-common-4.1.119.Final.jar - io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar - io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar - io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar diff --git a/pom.xml b/pom.xml index 43a56fa03e5cb..cc4ee93530733 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ flexible messaging model and an intuitive client API. 1.1.10.5 4.1.12.1 5.7.1 - 4.1.118.Final + 4.1.119.Final 0.0.26.Final 9.4.54.v20240208 2.5.2 From e607875d76261caa5283e2d0366bf4723b82a4a5 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Sat, 26 Apr 2025 18:18:49 +0800 Subject: [PATCH 10/24] [improve] Upgrade Netty to 4.1.121.Final (#24214) (cherry picked from commit c8401e49134ef1d3acb30dbd6c0098afd91d52b9) Signed-off-by: Zixuan Liu --- buildtools/pom.xml | 2 +- .../server/src/assemble/LICENSE.bin.txt | 40 +++++++++---------- pom.xml | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index b536b5d7703a6..720542b862259 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -53,7 +53,7 @@ 3.4.0 8.37 3.1.2 - 4.1.119.Final + 4.1.121.Final 4.2.3 32.0.0-jre 1.10.12 diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 5a4ac6022879c..02400c3595923 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -352,26 +352,26 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-compress-1.26.0.jar - org.apache.commons-commons-lang3-3.11.jar * Netty - - io.netty-netty-buffer-4.1.119.Final.jar - - io.netty-netty-codec-4.1.119.Final.jar - - io.netty-netty-codec-dns-4.1.119.Final.jar - - io.netty-netty-codec-http-4.1.119.Final.jar - - io.netty-netty-codec-http2-4.1.119.Final.jar - - io.netty-netty-codec-socks-4.1.119.Final.jar - - io.netty-netty-codec-haproxy-4.1.119.Final.jar - - io.netty-netty-common-4.1.119.Final.jar - - io.netty-netty-handler-4.1.119.Final.jar - - io.netty-netty-handler-proxy-4.1.119.Final.jar - - io.netty-netty-resolver-4.1.119.Final.jar - - io.netty-netty-resolver-dns-4.1.119.Final.jar - - io.netty-netty-resolver-dns-classes-macos-4.1.119.Final.jar - - io.netty-netty-resolver-dns-native-macos-4.1.119.Final-osx-aarch_64.jar - - io.netty-netty-resolver-dns-native-macos-4.1.119.Final-osx-x86_64.jar - - io.netty-netty-transport-4.1.119.Final.jar - - io.netty-netty-transport-classes-epoll-4.1.119.Final.jar - - io.netty-netty-transport-native-epoll-4.1.119.Final-linux-aarch_64.jar - - io.netty-netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar - - io.netty-netty-transport-native-unix-common-4.1.119.Final.jar + - io.netty-netty-buffer-4.1.121.Final.jar + - io.netty-netty-codec-4.1.121.Final.jar + - io.netty-netty-codec-dns-4.1.121.Final.jar + - io.netty-netty-codec-http-4.1.121.Final.jar + - io.netty-netty-codec-http2-4.1.121.Final.jar + - io.netty-netty-codec-socks-4.1.121.Final.jar + - io.netty-netty-codec-haproxy-4.1.121.Final.jar + - io.netty-netty-common-4.1.121.Final.jar + - io.netty-netty-handler-4.1.121.Final.jar + - io.netty-netty-handler-proxy-4.1.121.Final.jar + - io.netty-netty-resolver-4.1.121.Final.jar + - io.netty-netty-resolver-dns-4.1.121.Final.jar + - io.netty-netty-resolver-dns-classes-macos-4.1.121.Final.jar + - io.netty-netty-resolver-dns-native-macos-4.1.121.Final-osx-aarch_64.jar + - io.netty-netty-resolver-dns-native-macos-4.1.121.Final-osx-x86_64.jar + - io.netty-netty-transport-4.1.121.Final.jar + - io.netty-netty-transport-classes-epoll-4.1.121.Final.jar + - io.netty-netty-transport-native-epoll-4.1.121.Final-linux-aarch_64.jar + - io.netty-netty-transport-native-epoll-4.1.121.Final-linux-x86_64.jar + - io.netty-netty-transport-native-unix-common-4.1.121.Final.jar - io.netty-netty-tcnative-boringssl-static-2.0.70.Final.jar - io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar - io.netty-netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar diff --git a/pom.xml b/pom.xml index cc4ee93530733..b7323590e51c3 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ flexible messaging model and an intuitive client API. 1.1.10.5 4.1.12.1 5.7.1 - 4.1.119.Final + 4.1.121.Final 0.0.26.Final 9.4.54.v20240208 2.5.2 From b2892beb23daa05e090efb82501b5fc2e7f790dc Mon Sep 17 00:00:00 2001 From: Michael Marshall Date: Wed, 17 May 2023 17:14:44 +0800 Subject: [PATCH 11/24] [feat][meta] Upgrade to jetcd to 0.7.5 (#20339) (cherry picked from commit c7a4060763b905925ffe8e9690ea983d863aa52f) Signed-off-by: Zixuan Liu --- pom.xml | 2 +- .../metadata/BaseMetadataStoreTest.java | 7 +-- .../impl/LeaderElectionImplTest.java | 2 +- src/owasp-dependency-check-suppressions.xml | 45 ------------------- 4 files changed, 6 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index b7323590e51c3..d7053752daa2b 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ flexible messaging model and an intuitive client API. 9.1.6 5.3.19 4.5.13 - 0.5.11 + 0.7.5 2.0 1.10.12 5.3.3 diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java index 6a15e1e8cc23e..3f5f26ba302b5 100644 --- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java +++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import io.etcd.jetcd.launcher.EtcdCluster; -import io.etcd.jetcd.launcher.EtcdClusterFactory; +import io.etcd.jetcd.test.EtcdClusterExtension; import java.io.File; import java.net.URI; import java.util.UUID; @@ -84,10 +84,11 @@ public Object[][] implementations() { private synchronized String getEtcdClusterConnectString() { if (etcdCluster == null) { - etcdCluster = EtcdClusterFactory.buildCluster("test", 1, false); + etcdCluster = EtcdClusterExtension.builder().withClusterName("test").withNodes(1).withSsl(false).build() + .cluster(); etcdCluster.start(); } - return etcdCluster.getClientEndpoints().stream().map(URI::toString).collect(Collectors.joining(",")); + return etcdCluster.clientEndpoints().stream().map(URI::toString).collect(Collectors.joining(",")); } public static Supplier stringSupplier(Supplier supplier) { diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java index 8f70ab5195852..5169225a0ae0b 100644 --- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java +++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java @@ -29,7 +29,7 @@ public class LeaderElectionImplTest extends BaseMetadataStoreTest { - @Test(dataProvider = "impl", timeOut = 10000) + @Test(dataProvider = "impl", timeOut = 20000) public void validateDeadLock(String provider, Supplier urlSupplier) throws Exception { if (provider.equals("Memory") || provider.equals("RocksDB")) { diff --git a/src/owasp-dependency-check-suppressions.xml b/src/owasp-dependency-check-suppressions.xml index e242ac52cec08..735fb522a24c1 100644 --- a/src/owasp-dependency-check-suppressions.xml +++ b/src/owasp-dependency-check-suppressions.xml @@ -187,51 +187,6 @@ CVE-2021-42550 - - - - c85851ca3ea8128d480d3f75c568a37e64e8a77b - CVE-2020-15106 - - - - c85851ca3ea8128d480d3f75c568a37e64e8a77b - CVE-2020-15112 - - - - c85851ca3ea8128d480d3f75c568a37e64e8a77b - CVE-2020-15113 - - - - - 6dac6efe035a2be9ba299fbf31be5f903401869f - CVE-2020-15106 - - - - 6dac6efe035a2be9ba299fbf31be5f903401869f - CVE-2020-15112 - - - - 6dac6efe035a2be9ba299fbf31be5f903401869f - CVE-2020-15113 - - Date: Tue, 4 Jun 2024 18:18:39 +0800 Subject: [PATCH 12/24] [improve] Upgrade Jetcd to 0.7.7 and VertX to 4.5.8 (#22835) (cherry picked from commit be5eb919f8c9fb4612fea74054eee8c1412b954b) Signed-off-by: Zixuan Liu --- .../server/src/assemble/LICENSE.bin.txt | 3 ++- pom.xml | 21 ++++++++++++++++++- tests/integration/pom.xml | 6 ++++++ .../integration/io/PulsarIOTestRunner.java | 8 +++---- .../io/sinks/PulsarIOSinkRunner.java | 2 +- .../io/sources/PulsarIOSourceRunner.java | 2 +- .../PulsarIODebeziumSourceRunner.java | 7 +++---- 7 files changed, 37 insertions(+), 12 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 02400c3595923..b9ce1c1cbc4ec 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -500,7 +500,7 @@ The Apache Software License, Version 2.0 - io.opencensus-opencensus-proto-0.2.0.jar * Jodah - net.jodah-typetools-0.5.0.jar - - net.jodah-failsafe-2.4.4.jar + - dev.failsafe-failsafe-3.3.2.jar * Byte Buddy - net.bytebuddy-byte-buddy-1.14.12.jar * zt-zip @@ -537,6 +537,7 @@ The Apache Software License, Version 2.0 - io.vertx-vertx-core-4.5.15.jar - io.vertx-vertx-web-4.5.15.jar - io.vertx-vertx-web-common-4.5.15.jar + - io.vertx-vertx-grpc-4.5.15.jar * Apache ZooKeeper - org.apache.zookeeper-zookeeper-3.9.3.jar - org.apache.zookeeper-zookeeper-jute-3.9.3.jar diff --git a/pom.xml b/pom.xml index d7053752daa2b..6af40e3ffdd72 100644 --- a/pom.xml +++ b/pom.xml @@ -227,12 +227,13 @@ flexible messaging model and an intuitive client API. 9.1.6 5.3.19 4.5.13 - 0.7.5 + 0.7.7 2.0 1.10.12 5.3.3 2.0.6 1.0.3 + 3.3.2 3.6.0 @@ -364,6 +365,12 @@ flexible messaging model and an intuitive client API. ${powermock.version} + + dev.failsafe + failsafe + ${failsafe.version} + + org.apache.zookeeper zookeeper @@ -479,6 +486,11 @@ flexible messaging model and an intuitive client API. vertx-web ${vertx.version} + + io.vertx + vertx-grpc + ${vertx.version} + org.apache.curator @@ -581,6 +593,13 @@ flexible messaging model and an intuitive client API. + + io.grpc + grpc-util + + 1.60.0 + + org.apache.bookkeeper bookkeeper-common diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index c9da4011938ca..4e0a5d0e4aaf2 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -101,6 +101,12 @@ test + + dev.failsafe + failsafe + test + + org.testcontainers mysql diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestRunner.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestRunner.java index e00e8fbe677df..882162b98e684 100644 --- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestRunner.java +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestRunner.java @@ -18,6 +18,7 @@ */ package org.apache.pulsar.tests.integration.io; +import dev.failsafe.RetryPolicy; import java.time.Duration; import java.util.LinkedHashMap; import java.util.Map; @@ -33,7 +34,6 @@ import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; -import net.jodah.failsafe.RetryPolicy; @Slf4j public abstract class PulsarIOTestRunner { @@ -42,11 +42,11 @@ public abstract class PulsarIOTestRunner { final Duration ONE_MINUTE = Duration.ofMinutes(1); final Duration TEN_SECONDS = Duration.ofSeconds(10); - @SuppressWarnings({ "unchecked", "rawtypes" }) - protected final RetryPolicy statusRetryPolicy = new RetryPolicy() + protected final RetryPolicy statusRetryPolicy = RetryPolicy.builder() .withMaxDuration(ONE_MINUTE) .withDelay(TEN_SECONDS) - .onRetry(e -> log.error("Retry ... ")); + .onRetry(e -> log.error("Retry ... ")) + .build(); protected PulsarCluster pulsarCluster; protected String functionRuntimeType; diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarIOSinkRunner.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarIOSinkRunner.java index b6500e36a8424..28a65e55ffdc5 100644 --- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarIOSinkRunner.java +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarIOSinkRunner.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import dev.failsafe.Failsafe; import java.util.LinkedHashMap; import java.util.Map; @@ -46,7 +47,6 @@ import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; -import net.jodah.failsafe.Failsafe; @Slf4j public class PulsarIOSinkRunner extends PulsarIOTestRunner { diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarIOSourceRunner.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarIOSourceRunner.java index d1e5049bdcf8e..105c31cc88ca7 100644 --- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarIOSourceRunner.java +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarIOSourceRunner.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import dev.failsafe.Failsafe; import java.util.Map; import org.apache.commons.lang3.StringUtils; @@ -45,7 +46,6 @@ import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; -import net.jodah.failsafe.Failsafe; @Slf4j public class PulsarIOSourceRunner extends PulsarIOTestRunner { diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarIODebeziumSourceRunner.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarIODebeziumSourceRunner.java index da1e7597ea636..2b953f8956c2d 100644 --- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarIODebeziumSourceRunner.java +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarIODebeziumSourceRunner.java @@ -19,6 +19,9 @@ package org.apache.pulsar.tests.integration.io.sources.debezium; import com.google.common.base.Preconditions; +import dev.failsafe.Failsafe; +import lombok.Cleanup; +import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.client.api.SubscriptionInitialPosition; @@ -28,10 +31,6 @@ import org.apache.pulsar.tests.integration.topologies.PulsarCluster; import org.testcontainers.containers.GenericContainer; -import lombok.Cleanup; -import lombok.extern.slf4j.Slf4j; -import net.jodah.failsafe.Failsafe; - @Slf4j public class PulsarIODebeziumSourceRunner extends PulsarIOSourceRunner { From 3b7f7d0b17e9fde72b7ad9d6d739d942ef18d153 Mon Sep 17 00:00:00 2001 From: Zixuan Liu Date: Tue, 3 Jun 2025 16:25:05 +0800 Subject: [PATCH 13/24] [fix][build] Fixed netty-iouring version Signed-off-by: Zixuan Liu --- pom.xml | 23 +++++++++++++++++++++++ pulsar-common/pom.xml | 17 +++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/pom.xml b/pom.xml index 6af40e3ffdd72..c4fa95b803e92 100644 --- a/pom.xml +++ b/pom.xml @@ -682,6 +682,29 @@ flexible messaging model and an intuitive client API. ${jcommander.version} + + io.netty.incubator + netty-incubator-transport-classes-io_uring + ${netty-iouring.version} + + + io.netty.incubator + netty-incubator-transport-native-io_uring + ${netty-iouring.version} + + + io.netty.incubator + netty-incubator-transport-native-io_uring + ${netty-iouring.version} + linux-x86_64 + + + io.netty.incubator + netty-incubator-transport-native-io_uring + ${netty-iouring.version} + linux-aarch_64 + + com.google.guava guava diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml index b3c331613e5bf..6c0eee293ccd8 100644 --- a/pulsar-common/pom.xml +++ b/pulsar-common/pom.xml @@ -137,6 +137,23 @@ netty-tcnative-boringssl-static + + io.netty.incubator + netty-incubator-transport-classes-io_uring + + + + io.netty.incubator + netty-incubator-transport-native-io_uring + linux-x86_64 + + + + io.netty.incubator + netty-incubator-transport-native-io_uring + linux-aarch_64 + + io.netty netty-codec-haproxy From fdca51694f0f1e5e1d3d17a6bad67238f119ea85 Mon Sep 17 00:00:00 2001 From: Zixuan Liu Date: Tue, 3 Jun 2025 16:15:31 +0800 Subject: [PATCH 14/24] [fix][build] Fix jetcd version Signed-off-by: Zixuan Liu --- jetcd-core-shaded/pom.xml | 2 +- pom.xml | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml index 18dabf28b87f9..54d1d82e29c2f 100644 --- a/jetcd-core-shaded/pom.xml +++ b/jetcd-core-shaded/pom.xml @@ -26,7 +26,7 @@ org.apache.pulsar pulsar - 3.0.6-SNAPSHOT + 2.10.7-SNAPSHOT jetcd-core-shaded diff --git a/pom.xml b/pom.xml index c4fa95b803e92..621e9eb2e21c7 100644 --- a/pom.xml +++ b/pom.xml @@ -235,6 +235,8 @@ flexible messaging model and an intuitive client API. 1.0.3 3.3.2 + 3.3.2 + 3.6.0 3.4.0 @@ -274,6 +276,7 @@ flexible messaging model and an intuitive client API. 2.3.0 3.4.0 3.0.0 + 3.6.0 1.0.0 1.5.0 3.1.2 @@ -353,6 +356,19 @@ flexible messaging model and an intuitive client API. ${mockito.version} + + dev.failsafe + failsafe + ${failsafe.version} + + + + io.grpc + grpc-util + + 1.60.0 + + org.mockito mockito-inline @@ -1949,6 +1965,11 @@ flexible messaging model and an intuitive client API. + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + org.apache.maven.plugins maven-compiler-plugin From 2ffad2c9127efc3dbfc4c2bd494cb02dea6614e3 Mon Sep 17 00:00:00 2001 From: Massimiliano Mirelli Date: Wed, 24 May 2023 18:20:42 +0800 Subject: [PATCH 15/24] [improve][bk] Add integration test with bookie http server enabled (#20149) Signed-off-by: tison Co-authored-by: tison (cherry picked from commit 3f2978d32223d61f04db1de330f5b167a63925ae) Signed-off-by: Zixuan Liu --- ...eeperInstallWithHttpServerEnabledTest.java | 84 +++++++++++++++++++ .../integration/topologies/PulsarCluster.java | 38 +++++---- .../topologies/PulsarClusterSpec.java | 11 +++ .../topologies/PulsarClusterTestBase.java | 4 + 4 files changed, 123 insertions(+), 14 deletions(-) create mode 100644 tests/integration/src/test/java/org/apache/pulsar/tests/integration/bookkeeper/BookkeeperInstallWithHttpServerEnabledTest.java diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/bookkeeper/BookkeeperInstallWithHttpServerEnabledTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/bookkeeper/BookkeeperInstallWithHttpServerEnabledTest.java new file mode 100644 index 0000000000000..04db0c1cb9e4c --- /dev/null +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/bookkeeper/BookkeeperInstallWithHttpServerEnabledTest.java @@ -0,0 +1,84 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.tests.integration.bookkeeper; + +import lombok.extern.slf4j.Slf4j; +import org.apache.pulsar.tests.integration.docker.ContainerExecResult; +import org.apache.pulsar.tests.integration.topologies.PulsarCluster; +import org.apache.pulsar.tests.integration.topologies.PulsarClusterSpec; +import org.apache.pulsar.tests.integration.topologies.PulsarClusterTestBase; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import java.util.stream.Stream; + +import static java.util.stream.Collectors.joining; +import static org.testng.Assert.assertEquals; + +/** + * Test bookkeeper setup with http server enabled. + */ +@Slf4j +public class BookkeeperInstallWithHttpServerEnabledTest extends PulsarClusterTestBase { + + @BeforeClass(alwaysRun = true) + @Override + public final void setupCluster() throws Exception { + incrementSetupNumber(); + + final String clusterName = Stream.of(this.getClass().getSimpleName(), randomName(5)) + .filter(s -> !s.isEmpty()) + .collect(joining("-")); + bookkeeperEnvs.put("httpServerEnabled", "true"); + bookieAdditionalPorts.add(8000); + PulsarClusterSpec spec = PulsarClusterSpec.builder() + .numBookies(2) + .numBrokers(1) + .bookkeeperEnvs(bookkeeperEnvs) + .bookieAdditionalPorts(bookieAdditionalPorts) + .clusterName(clusterName) + .build(); + + log.info("Setting up cluster {} with {} bookies, {} brokers", + spec.clusterName(), spec.numBookies(), spec.numBrokers()); + + pulsarCluster = PulsarCluster.forSpec(spec); + pulsarCluster.start(); + + log.info("Cluster {} is setup", spec.clusterName()); + } + + @AfterClass(alwaysRun = true) + @Override + public final void tearDownCluster() throws Exception { + super.tearDownCluster(); + } + + @Test + public void testBookieHttpServerIsRunning() throws Exception { + ContainerExecResult result = pulsarCluster.getAnyBookie().execCmd( + PulsarCluster.CURL, + "-X", + "GET", + "http://localhost:8000/heartbeat"); + assertEquals(result.getExitCode(), 0); + assertEquals(result.getStdout(), "OK\n"); + } +} diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java index 0889bee187d28..5bc7df0f1cb45 100644 --- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java @@ -149,20 +149,26 @@ private PulsarCluster(PulsarClusterSpec spec, CSContainer csContainer, boolean s // create bookies bookieContainers.putAll( - runNumContainers("bookie", spec.numBookies(), (name) -> new BKContainer(clusterName, name) - .withNetwork(network) - .withNetworkAliases(appendClusterName(name)) - .withEnv("zkServers", appendClusterName(ZKContainer.NAME)) - .withEnv("useHostNameAsBookieID", "true") - // Disable fsyncs for tests since they're slow within the containers - .withEnv("journalSyncData", "false") - .withEnv("journalMaxGroupWaitMSec", "0") - .withEnv("clusterName", clusterName) - .withEnv("PULSAR_PREFIX_diskUsageWarnThreshold", "0.95") - .withEnv("diskUsageThreshold", "0.99") - .withEnv("PULSAR_PREFIX_diskUsageLwmThreshold", "0.97") - .withEnv("nettyMaxFrameSizeBytes", "" + spec.maxMessageSize) - ) + runNumContainers("bookie", spec.numBookies(), (name) -> { + BKContainer bookieContainer = new BKContainer(clusterName, name) + .withNetwork(network) + .withNetworkAliases(appendClusterName(name)) + .withEnv("zkServers", appendClusterName(ZKContainer.NAME)) + .withEnv("useHostNameAsBookieID", "true") + // Disable fsyncs for tests since they're slow within the containers + .withEnv("journalSyncData", "false") + .withEnv("journalMaxGroupWaitMSec", "0") + .withEnv("clusterName", clusterName) + .withEnv("diskUsageThreshold", "0.99") + .withEnv("nettyMaxFrameSizeBytes", String.valueOf(spec.maxMessageSize)); + if (spec.bookkeeperEnvs != null) { + bookieContainer.withEnv(spec.bookkeeperEnvs); + } + if (spec.bookieAdditionalPorts != null) { + spec.bookieAdditionalPorts.forEach(bookieContainer::addExposedPort); + } + return bookieContainer; + }) ); // create brokers @@ -699,4 +705,8 @@ public void dumpFunctionLogs(String name) { private String appendClusterName(String name) { return sharedCsContainer ? clusterName + "-" + name : name; } + + public BKContainer getAnyBookie() { + return getAnyContainer(bookieContainers, "bookie"); + } } diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterSpec.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterSpec.java index eed604205bdce..bea58194a2eb5 100644 --- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterSpec.java +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterSpec.java @@ -19,6 +19,7 @@ package org.apache.pulsar.tests.integration.topologies; import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -144,6 +145,11 @@ public class PulsarClusterSpec { */ Map brokerEnvs; + /** + * Specify envs for bookkeeper. + */ + Map bookkeeperEnvs; + /** * Specify mount files. */ @@ -156,4 +162,9 @@ public class PulsarClusterSpec { @Default int maxMessageSize = Commands.DEFAULT_MAX_MESSAGE_SIZE; + + /** + * Additional ports to expose on bookie containers. + */ + List bookieAdditionalPorts; } diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterTestBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterTestBase.java index 34994f75216d4..a0459931330c6 100644 --- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterTestBase.java +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterTestBase.java @@ -19,6 +19,8 @@ package org.apache.pulsar.tests.integration.topologies; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import java.util.function.Supplier; import lombok.extern.slf4j.Slf4j; @@ -32,6 +34,8 @@ @Slf4j public abstract class PulsarClusterTestBase extends PulsarTestBase { protected final Map brokerEnvs = new HashMap<>(); + protected final Map bookkeeperEnvs = new HashMap<>(); + protected final List bookieAdditionalPorts = new LinkedList<>(); @Override protected final void setup() throws Exception { From 3bc7b1c99abb90da68946b2f6446166d1e9294a2 Mon Sep 17 00:00:00 2001 From: Qiang Zhao Date: Tue, 3 Jun 2025 18:39:24 +0800 Subject: [PATCH 16/24] [fix][misc] Bump GRPC version to 1.55.3 to fix CVE (#21057) (cherry picked from commit 6ff83b6f8ab34bcb9045a2c249c8b14608dd965d) Signed-off-by: Zixuan Liu --- distribution/server/src/assemble/LICENSE.bin.txt | 4 ++-- pom.xml | 9 ++------- pulsar-sql/presto-distribution/LICENSE | 6 +++--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index b9ce1c1cbc4ec..1cd0336e2be21 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -322,7 +322,7 @@ The Apache Software License, Version 2.0 - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.14.2.jar * Caffeine -- com.github.ben-manes.caffeine-caffeine-2.9.1.jar * Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar - * Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-2.0.1.jar + * Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-2.9.0.jar * Bitbucket -- org.bitbucket.b_c-jose4j-0.9.4.jar * Gson - com.google.code.gson-gson-2.8.9.jar @@ -493,7 +493,7 @@ The Apache Software License, Version 2.0 - io.grpc-grpc-servlet-jakarta-1.55.3.jar - io.grpc-grpc-util-1.60.0.jar * Perfmark - - io.perfmark-perfmark-api-0.19.0.jar + - io.perfmark-perfmark-api-0.26.0.jar * OpenCensus - io.opencensus-opencensus-api-0.28.0.jar - io.opencensus-opencensus-contrib-http-util-0.28.0.jar diff --git a/pom.xml b/pom.xml index 621e9eb2e21c7..f0b3158901fb4 100644 --- a/pom.xml +++ b/pom.xml @@ -150,9 +150,9 @@ flexible messaging model and an intuitive client API. 1.17 3.19.6 ${protobuf3.version} - 1.45.1 + 1.55.3 1.41.0 - 0.19.0 + 0.26.0 ${grpc.version} 2.8.9 1.2.1 @@ -502,11 +502,6 @@ flexible messaging model and an intuitive client API. vertx-web ${vertx.version} - - io.vertx - vertx-grpc - ${vertx.version} - org.apache.curator diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 97cea3bc66995..70307db6e0f2f 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -266,7 +266,7 @@ The Apache Software License, Version 2.0 - grpc-context-1.55.3.jar - grpc-core-1.55.3.jar - grpc-grpclb-1.55.3.jar - - grpc-netty-shaded-1.55.3.jar + - grpc-netty-1.55.3.jar - grpc-protobuf-1.55.3.jar - grpc-protobuf-lite-1.55.3.jar - grpc-stub-1.55.3.jar @@ -487,7 +487,7 @@ The Apache Software License, Version 2.0 * Swagger - swagger-annotations-1.6.10.jar * Perfmark - - perfmark-api-0.19.0.jar + - perfmark-api-0.26.0.jar * Annotations - auto-service-annotations-1.0.jar * RxJava @@ -498,7 +498,7 @@ Protocol Buffers License * Protocol Buffers - protobuf-java-3.19.6.jar - protobuf-java-util-3.19.6.jar - - proto-google-common-protos-2.0.1.jar + - proto-google-common-protos-2.9.0.jar BSD 3-clause "New" or "Revised" License * RE2J TD -- re2j-td-1.4.jar From f362285fc18cbeb217699b5b4470aa602bc43f34 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Wed, 7 Dec 2022 08:26:29 +0800 Subject: [PATCH 17/24] [improve][misc] Allow custom Netty DnsServerAddressStreamProviders (#18646) Co-authored-by: tison (cherry picked from commit cfe643bc9d45e74271df6f4d16d46087572e285b) Signed-off-by: Zixuan Liu --- pulsar-client/pom.xml | 10 ++++++++++ src/rename-netty-native-libs.sh | 2 ++ 2 files changed, 12 insertions(+) diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml index 13987177b7ad4..5d90dc980deb1 100644 --- a/pulsar-client/pom.xml +++ b/pulsar-client/pom.xml @@ -83,6 +83,16 @@ io.netty netty-resolver-dns + + io.netty + netty-resolver-dns-native-macos + osx-aarch_64 + + + io.netty + netty-resolver-dns-native-macos + osx-x86_64 + org.apache.commons diff --git a/src/rename-netty-native-libs.sh b/src/rename-netty-native-libs.sh index 9674d9c66c030..ad182d26974ba 100755 --- a/src/rename-netty-native-libs.sh +++ b/src/rename-netty-native-libs.sh @@ -32,6 +32,8 @@ FILES_TO_RENAME=( 'libnetty_tcnative_linux_aarch_64.so liborg_apache_pulsar_shade_netty_tcnative_linux_aarch_64.so' 'libnetty_tcnative_osx_x86_64.jnilib liborg_apache_pulsar_shade_netty_tcnative_osx_x86_64.jnilib' 'libnetty_tcnative_osx_aarch_64.jnilib liborg_apache_pulsar_shade_netty_tcnative_osx_aarch_64.jnilib' + 'libnetty_resolver_dns_native_macos_aarch_64.jnilib liborg_apache_pulsar_shade_netty_resolver_dns_native_macos_aarch_64.jnilib' + 'libnetty_resolver_dns_native_macos_x86_64.jnilib liborg_apache_pulsar_shade_netty_resolver_dns_native_macos_x86_64.jnilib' ) echo "----- Renaming epoll lib in $JAR_PATH ------" From a78c25db805f1f9d85f623659a45dbad936019bf Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 21 Jun 2024 04:39:58 +0800 Subject: [PATCH 18/24] [cleanup][misc] Remove classifier from netty-transport-native-unix-common dependency (#22951) (cherry picked from commit 6692bc8e327ea6958149ea0fb207691f4bce907d) Signed-off-by: Zixuan Liu # Conflicts: # distribution/server/src/assemble/LICENSE.bin.txt # pulsar-common/pom.xml # pulsar-sql/presto-distribution/LICENSE --- pulsar-common/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml index 6c0eee293ccd8..b3b02516effba 100644 --- a/pulsar-common/pom.xml +++ b/pulsar-common/pom.xml @@ -85,14 +85,13 @@ io.netty - netty-transport-native-unix-common - linux-x86_64 + netty-transport-native-epoll + linux-aarch_64 io.netty - netty-transport-native-epoll - linux-aarch_64 + netty-transport-native-unix-common From 864ea796dde8579f70b9f20cc02dcfe3bb41e352 Mon Sep 17 00:00:00 2001 From: Zixuan Liu Date: Tue, 3 Jun 2025 21:19:31 +0800 Subject: [PATCH 19/24] [fix][build] Fix license Signed-off-by: Zixuan Liu --- .../server/src/assemble/LICENSE.bin.txt | 1 - pulsar-sql/presto-distribution/LICENSE | 62 +++++++++---------- src/check-binary-license.sh | 2 +- 3 files changed, 30 insertions(+), 35 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 1cd0336e2be21..4594c13f455b1 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -537,7 +537,6 @@ The Apache Software License, Version 2.0 - io.vertx-vertx-core-4.5.15.jar - io.vertx-vertx-web-4.5.15.jar - io.vertx-vertx-web-common-4.5.15.jar - - io.vertx-vertx-grpc-4.5.15.jar * Apache ZooKeeper - org.apache.zookeeper-zookeeper-3.9.3.jar - org.apache.zookeeper-zookeeper-jute-3.9.3.jar diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 70307db6e0f2f..b9ceef48124d2 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -231,33 +231,34 @@ The Apache Software License, Version 2.0 - commons-compress-1.26.0.jar - commons-lang3-3.11.jar * Netty - - netty-buffer-4.1.117.Final.jar - - netty-codec-4.1.117.Final.jar - - netty-codec-dns-4.1.117.Final.jar - - netty-codec-http-4.1.117.Final.jar - - netty-codec-haproxy-4.1.117.Final.jar - - netty-codec-socks-4.1.117.Final.jar - - netty-handler-proxy-4.1.117.Final.jar - - netty-common-4.1.117.Final.jar - - netty-handler-4.1.117.Final.jar + - netty-3.10.6.Final.jar + - netty-buffer-4.1.121.Final.jar + - netty-codec-4.1.121.Final.jar + - netty-codec-dns-4.1.121.Final.jar + - netty-codec-http-4.1.121.Final.jar + - netty-codec-haproxy-4.1.121.Final.jar + - netty-codec-socks-4.1.121.Final.jar + - netty-handler-proxy-4.1.121.Final.jar + - netty-common-4.1.121.Final.jar + - netty-handler-4.1.121.Final.jar - netty-reactive-streams-2.0.6.jar - - netty-resolver-4.1.117.Final.jar - - netty-resolver-dns-4.1.117.Final.jar - - netty-resolver-dns-classes-macos-4.1.117.Final.jar - - netty-resolver-dns-native-macos-4.1.117.Final-osx-aarch_64.jar - - netty-resolver-dns-native-macos-4.1.117.Final-osx-x86_64.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-transport-4.1.117.Final.jar - - netty-transport-classes-epoll-4.1.117.Final.jar - - netty-transport-native-epoll-4.1.117.Final-linux-aarch_64.jar - - netty-transport-native-epoll-4.1.117.Final-linux-x86_64.jar - - netty-transport-native-unix-common-4.1.117.Final.jar + - netty-resolver-4.1.121.Final.jar + - netty-resolver-dns-4.1.121.Final.jar + - netty-resolver-dns-classes-macos-4.1.121.Final.jar + - netty-resolver-dns-native-macos-4.1.121.Final-osx-aarch_64.jar + - netty-resolver-dns-native-macos-4.1.121.Final-osx-x86_64.jar + - netty-tcnative-boringssl-static-2.0.70.Final.jar + - netty-tcnative-boringssl-static-2.0.70.Final-linux-aarch_64.jar + - netty-tcnative-boringssl-static-2.0.70.Final-linux-x86_64.jar + - netty-tcnative-boringssl-static-2.0.70.Final-osx-aarch_64.jar + - netty-tcnative-boringssl-static-2.0.70.Final-osx-x86_64.jar + - netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar + - netty-tcnative-classes-2.0.70.Final.jar + - netty-transport-4.1.121.Final.jar + - netty-transport-classes-epoll-4.1.121.Final.jar + - netty-transport-native-epoll-4.1.121.Final-linux-aarch_64.jar + - netty-transport-native-epoll-4.1.121.Final-linux-x86_64.jar + - netty-transport-native-unix-common-4.1.121.Final.jar - netty-incubator-transport-classes-io_uring-0.0.26.Final.jar - netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar - netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar @@ -266,16 +267,16 @@ The Apache Software License, Version 2.0 - grpc-context-1.55.3.jar - grpc-core-1.55.3.jar - grpc-grpclb-1.55.3.jar - - grpc-netty-1.55.3.jar - grpc-protobuf-1.55.3.jar - grpc-protobuf-lite-1.55.3.jar + - grpc-netty-shaded-1.55.3.jar - grpc-stub-1.55.3.jar - grpc-util-1.60.0.jar * JEtcd - shaded * Vertx - shaded * Joda Time - joda-time-2.10.5.jar - - failsafe-2.4.4.jar + - failsafe-3.3.2.jar * Jetty - http2-client-9.4.54.v20240208.jar - http2-common-9.4.54.v20240208.jar @@ -488,8 +489,6 @@ The Apache Software License, Version 2.0 - swagger-annotations-1.6.10.jar * Perfmark - perfmark-api-0.26.0.jar - * Annotations - - auto-service-annotations-1.0.jar * RxJava - rxjava-3.0.1.jar * High Performance Primitive Collections for Java @@ -529,9 +528,6 @@ MIT License - jul-to-slf4j-1.7.32.jar * Checker Qual - checker-qual-3.33.0.jar - * Annotations - - animal-sniffer-annotations-1.19.jar - - annotations-4.1.1.4.jar CDDL - 1.0 * OSGi Resource Locator diff --git a/src/check-binary-license.sh b/src/check-binary-license.sh index afe380d5c8ffb..54539c704d6fe 100755 --- a/src/check-binary-license.sh +++ b/src/check-binary-license.sh @@ -96,7 +96,7 @@ done if [ "$NO_PRESTO" -ne 1 ]; then # check pulsar sql jars - 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' | grep -v 'pulsar-package-core' | grep -v 'java-version-trim-agent' | sed 's!.*/!!' | sort) + JARS=$(tar -tf $TARBALL | grep '\.jar' | grep 'lib/presto/' | grep -v jetcd-core-shaded | 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' | grep -v 'pulsar-package-core' | grep -v 'java-version-trim-agent' | 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 bd656090e06e4b26fd0c6c2c61e0757412cb79c0 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 25 Jun 2024 00:54:27 +0800 Subject: [PATCH 20/24] [improve][misc] Replace rename-netty-native-libs.sh script with renaming with maven-shade-plugin (#22957) (cherry picked from commit f728b2ebb9bfe2dfe1f64643640700f762524c40) Signed-off-by: Zixuan Liu --- pom.xml | 8 +-- pulsar-client-admin-shaded/pom.xml | 6 ++ pulsar-client-all/pom.xml | 31 ++-------- pulsar-client-shaded/pom.xml | 31 ++-------- src/rename-netty-native-libs.cmd | 90 ------------------------------ src/rename-netty-native-libs.sh | 68 ---------------------- 6 files changed, 19 insertions(+), 215 deletions(-) delete mode 100644 src/rename-netty-native-libs.cmd delete mode 100755 src/rename-netty-native-libs.sh diff --git a/pom.xml b/pom.xml index f0b3158901fb4..8c0dc6116b7b7 100644 --- a/pom.xml +++ b/pom.xml @@ -294,9 +294,7 @@ flexible messaging model and an intuitive client API. 9.1.0 0.9.44 6.4.0 - - - rename-netty-native-libs.sh + 3.33.0 @@ -2262,10 +2260,6 @@ flexible messaging model and an intuitive client API. Windows - - rename-netty-native-libs.cmd - - diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml index 2121f4edd1f25..3a455226572a5 100644 --- a/pulsar-client-admin-shaded/pom.xml +++ b/pulsar-client-admin-shaded/pom.xml @@ -284,6 +284,12 @@ org.apache.bookkeeper org.apache.pulsar.shade.org.apache.bookkeeper + + + (META-INF/native/(lib)?)(netty.+\.(so|jnilib|dll))$ + $1org_apache_pulsar_shade_$3 + true + diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml index fbd1b2d5cc9c4..c30ae0849ab20 100644 --- a/pulsar-client-all/pom.xml +++ b/pulsar-client-all/pom.xml @@ -364,6 +364,12 @@ org.tukaani org.apache.pulsar.shade.org.tukaani + + + (META-INF/native/(lib)?)(netty.+\.(so|jnilib|dll))$ + $1org_apache_pulsar_shade_$3 + true + @@ -373,31 +379,6 @@ - - - - exec-maven-plugin - org.codehaus.mojo - - - rename-epoll-library - package - - exec - - - ${project.parent.basedir}/src/${rename.netty.native.libs} - - ${project.artifactId} - - - - - diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index 9f01e96d6ee60..013e4aa7450b0 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -297,6 +297,12 @@ org.apache.bookkeeper org.apache.pulsar.shade.org.apache.bookkeeper + + + (META-INF/native/(lib)?)(netty.+\.(so|jnilib|dll))$ + $1org_apache_pulsar_shade_$3 + true + @@ -320,31 +326,6 @@ - - - - exec-maven-plugin - org.codehaus.mojo - - - rename-epoll-library - package - - exec - - - ${project.parent.basedir}/src/${rename.netty.native.libs} - - ${project.artifactId} - - - - - diff --git a/src/rename-netty-native-libs.cmd b/src/rename-netty-native-libs.cmd deleted file mode 100644 index 3f6c97be830c5..0000000000000 --- a/src/rename-netty-native-libs.cmd +++ /dev/null @@ -1,90 +0,0 @@ -@REM -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM - -@echo off - -set ARTIFACT_ID=%1 -set JAR_PATH=%cd%/target/%ARTIFACT_ID%.jar -set FILE_PREFIX=META-INF/native - -:: echo %JAR_PATH% -:: echo %FILE_PREFIX% - -ECHO. -echo ----- Renaming epoll lib in %JAR_PATH% ------ -set TMP_DIR=%temp%\tmp_pulsar - -rd %TMP_DIR% /s /q -mkdir %TMP_DIR% - -set UNZIP_CMD=unzip -q %JAR_PATH% -d %TMP_DIR% -call %UNZIP_CMD% - -:: echo %UNZIP_CMD% -:: echo %TMP_DIR% - -cd /d %TMP_DIR%/%FILE_PREFIX% - -:: Loop through the number of groups -SET Obj_Length=6 -SET Obj[0].FROM=libnetty_transport_native_epoll_x86_64.so -SET Obj[0].TO=liborg_apache_pulsar_shade_netty_transport_native_epoll_x86_64.so -SET Obj[1].FROM=libnetty_transport_native_epoll_aarch_64.so -SET Obj[1].TO=liborg_apache_pulsar_shade_netty_transport_native_epoll_aarch_64.so -SET Obj[2].FROM=libnetty_tcnative_linux_x86_64.so -SET Obj[2].TO=liborg_apache_pulsar_shade_netty_tcnative_linux_x86_64.so -SET Obj[3].FROM=libnetty_tcnative_linux_aarch_64.so -SET Obj[3].TO=liborg_apache_pulsar_shade_netty_tcnative_linux_aarch_64.so -SET Obj[4].FROM=libnetty_tcnative_osx_x86_64.jnilib -SET Obj[4].TO=liborg_apache_pulsar_shade_netty_tcnative_osx_x86_64.jnilib -SET Obj[5].FROM=libnetty_tcnative_osx_aarch_64.jnilib -SET Obj[5].TO=liborg_apache_pulsar_shade_netty_tcnative_osx_aarch_64.jnilib -SET Obj_Index=0 - -:LoopStart -IF %Obj_Index% EQU %Obj_Length% GOTO END - -SET Obj_Current.FROM=0 -SET Obj_Current.TO=0 - -FOR /F "usebackq delims==. tokens=1-3" %%I IN (`SET Obj[%Obj_Index%]`) DO ( - SET Obj_Current.%%J=%%K.so -) - -echo "Renaming %Obj_Current.FROM% -> %Obj_Current.TO%" -call ren %Obj_Current.FROM% %Obj_Current.TO% - -SET /A Obj_Index=%Obj_Index% + 1 - -GOTO LoopStart -:: Loop end - -:END -cd /d %TMP_DIR% - -:: Overwrite the original ZIP archive -rd %JAR_PATH% /s /q -set ZIP_CMD=zip -q -r %JAR_PATH% . -:: echo %ZIP_CMD% -call %ZIP_CMD% -:: echo %TMP_DIR% -rd %TMP_DIR% /s /q - -exit /b 0 -:: echo.&pause&goto:eof \ No newline at end of file diff --git a/src/rename-netty-native-libs.sh b/src/rename-netty-native-libs.sh deleted file mode 100755 index ad182d26974ba..0000000000000 --- a/src/rename-netty-native-libs.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env bash -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -set -e - -ARTIFACT_ID=$1 -JAR_PATH="$PWD/target/$ARTIFACT_ID.jar" - -FILE_PREFIX='META-INF/native' - -FILES_TO_RENAME=( - 'libnetty_transport_native_epoll_x86_64.so liborg_apache_pulsar_shade_netty_transport_native_epoll_x86_64.so' - 'libnetty_transport_native_epoll_aarch_64.so liborg_apache_pulsar_shade_netty_transport_native_epoll_aarch_64.so' - 'libnetty_tcnative_linux_x86_64.so liborg_apache_pulsar_shade_netty_tcnative_linux_x86_64.so' - 'libnetty_tcnative_linux_aarch_64.so liborg_apache_pulsar_shade_netty_tcnative_linux_aarch_64.so' - 'libnetty_tcnative_osx_x86_64.jnilib liborg_apache_pulsar_shade_netty_tcnative_osx_x86_64.jnilib' - 'libnetty_tcnative_osx_aarch_64.jnilib liborg_apache_pulsar_shade_netty_tcnative_osx_aarch_64.jnilib' - 'libnetty_resolver_dns_native_macos_aarch_64.jnilib liborg_apache_pulsar_shade_netty_resolver_dns_native_macos_aarch_64.jnilib' - 'libnetty_resolver_dns_native_macos_x86_64.jnilib liborg_apache_pulsar_shade_netty_resolver_dns_native_macos_x86_64.jnilib' -) - -echo "----- Renaming epoll lib in $JAR_PATH ------" -TMP_DIR=`mktemp -d` -CUR_DIR=$(pwd) -cd ${TMP_DIR} -# exclude `META-INF/LICENSE` -unzip -q $JAR_PATH -x "META-INF/LICENSE" -# include `META-INF/LICENSE` as LICENSE.netty. -# This approach is to get around the issue that MacOS is not able to recognize the difference between `META-INF/LICENSE` and `META-INF/license/`. -unzip -p $JAR_PATH META-INF/LICENSE > META-INF/LICENSE.netty -cd ${CUR_DIR} - -pushd $TMP_DIR - -for line in "${FILES_TO_RENAME[@]}"; do - read -r -a A <<< "$line" - FROM=${A[0]} - TO=${A[1]} - - if [ -f $FILE_PREFIX/$FROM ]; then - echo "Renaming $FROM -> $TO" - mv $FILE_PREFIX/$FROM $FILE_PREFIX/$TO - fi -done - -# Overwrite the original ZIP archive -rm $JAR_PATH -zip -q -r $JAR_PATH . -popd - -rm -rf $TMP_DIR From 99d3b907f6f0b7c12279778ae20d2e139c768cbf Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Wed, 16 Nov 2022 08:31:47 +0800 Subject: [PATCH 21/24] [improve][build] Remove broker-shaded artifacts (#3560) (cherry picked from commit cc63c6d6fc5e58f6fd00acb676c8f4684c94b672) Signed-off-by: Zixuan Liu --- pom.xml | 1 - pulsar-broker-shaded/pom.xml | 377 ----------------------------------- 2 files changed, 378 deletions(-) delete mode 100644 pulsar-broker-shaded/pom.xml diff --git a/pom.xml b/pom.xml index 8c0dc6116b7b7..e45f1982f4652 100644 --- a/pom.xml +++ b/pom.xml @@ -2281,7 +2281,6 @@ flexible messaging model and an intuitive client API. pulsar-common pulsar-broker-common pulsar-broker - pulsar-broker-shaded pulsar-client-api pulsar-client pulsar-client-shaded diff --git a/pulsar-broker-shaded/pom.xml b/pulsar-broker-shaded/pom.xml deleted file mode 100644 index 873b7e392ce3f..0000000000000 --- a/pulsar-broker-shaded/pom.xml +++ /dev/null @@ -1,377 +0,0 @@ - - - - 4.0.0 - - - org.apache.pulsar - pulsar - 2.10.7-SNAPSHOT - .. - - - pulsar-broker-shaded - jar - Pulsar Shaded Broker - - - - ${project.groupId} - pulsar-broker - ${project.parent.version} - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - prepare-package - - unpack - - - - - org.asynchttpclient - async-http-client - ${asynchttpclient.version} - jar - true - org/asynchttpclient/config/ahc-default.properties - ${project.build.directory}/classes - - - - - - - - - maven-antrun-plugin - - - shade-ahc-properties - prepare-package - - run - - - - - - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - ${shadePluginPhase} - - shade - - - true - true - false - - - - org.apache.pulsar:* - org.apache.bookkeeper*:* - commons-*:* - org.apache.commons:* - org.asynchttpclient:* - org.reactivestreams:reactive-streams - com.typesafe.netty:netty-reactive-streams - org.javassist:javassist - com.google.*:* - com.fasterxml.jackson.*:* - io.netty:* - org.apache.pulsar:pulsar-common - org.apache.bookkeeper:circe-checksum - com.yahoo.datasketches:sketches-core - - javax.ws.rs:* - javax.websocket:* - org.glassfish.hk2*:* - org.eclipse.jetty*:* - net.java.dev.jna:* - com.carrotsearch:* - io.prometheus:* - io.perfmark:* - com.github.ben-manes.caffeine:* - org.glassfish.jersey.*:* - org.rocksdb:* - org.apache.bookkeeper:* - org.apache.zookeeper:* - jline:* - javax.servlet:* - - com.beust:* - io.swagger:* - joda-time:* - org.yaml:snakeyaml - org.hdrhistogram:* - com.github.zafarkhaja:java-semver - org.apache.avro:avro - - com.thoughtworks.paranamer:paranamer - org.apache.commons:commons-compress - org.tukaani:xz - - - - - org.apache.pulsar:pulsar-client-original - - ** - - - - org/bouncycastle/** - - - - - - org.asynchttpclient - org.apache.pulsar.shade.org.asynchttpclient - - - org.apache.commons - org.apache.pulsar.shade.org.apache.commons - - - com.google - org.apache.pulsar.shade.com.google - - - com.fasterxml.jackson - org.apache.pulsar.shade.com.fasterxml.jackson - - - io.netty - org.apache.pulsar.shade.io.netty - - - org.apache.pulsar.common - org.apache.pulsar.shade.org.apache.pulsar.common - - - org.apache.pulsar.policies - org.apache.pulsar.shade.org.apache.pulsar.policies - - - org.apache.pulsar.checksum - org.apache.pulsar.shade.org.apache.pulsar.checksum - - - com.yahoo.datasketches - org.apache.pulsar.shade.com.yahoo.datasketches - - - com.yahoo.sketches - org.apache.pulsar.shade.com.yahoo.sketches - - - - org.apache.zookeeper - org.apache.pulsar.shade.org.apache.zookeeper - - - org.apache.jute - org.apache.pulsar.shade.org.apache.jute - - - com.typesafe - org.apache.pulsar.shade.com.typesafe - - - org.eclipse.jetty - org.apache.pulsar.shade.org.eclipse.jetty - - - javax.websocket - org.apache.pulsar.shade.javax.websocket - - - org.glassfish - org.apache.pulsar.shade.org.glassfish - - - org.apache.bookkeeper - org.apache.pulsar.shade.org.apache.bookkeeper - - - org.rocksdb - org.apache.pulsar.shade.org.rocksdb - - - com.sun.jna - org.apache.pulsar.shade.com.sun.jna - - - com.carrotsearch - org.apache.pulsar.shade.com.carrotsearch - - - javax.servlet - org.apache.pulsar.shade.javax.servlet - - - com.github - org.apache.pulsar.shade.com.github - - - jline - org.apache.pulsar.shade.jline - - - com.sun - org.apache.pulsar.shade.com.sun - - - jersey - org.apache.pulsar.shade.jersey - - - javax.ws - org.apache.pulsar.shade.javax.ws - - - javax.inject - org.apache.pulsar.shade.javax.inject - - - org.jvnet - org.apache.pulsar.shade.org.jvnet - - - com.beust - org.apache.pulsar.shade.com.beust - - - com.wordnik - org.apache.pulsar.shade.com.worknik - - - io.prometheus - org.apache.pulsar.shade.io.prometheus - - - io.swagger - org.apache.pulsar.shade.io.swagger - - - org.joda - org.apache.pulsar.shade.org.joda - - - org.yaml - org.apache.pulsar.shade.org.yaml - - - org.HdrHistogram - org.apache.pulsar.shade.org.HdrHistogram - - - com.ea - org.apache.pulsar.shade.com.ea - - - javassist - org.apache.pulsar.shade.javassist - - - org.reactivestreams - org.apache.pulsar.shade.org.reactivestreams - - - org.aopalliance - org.apache.pulsar.shade.org.aopalliance - - - com.wordnik - org.apache.pulsar.shade.com.worknik - - - org.apache.avro - org.apache.pulsar.shade.org.apache.avro - - - - org.codehaus.jackson - org.apache.pulsar.shade.org.codehaus.jackson - - - com.thoughtworks.paranamer - org.apache.pulsar.shade.com.thoughtworks.paranamer - - - org.tukaani - org.apache.pulsar.shade.org.tukaani - - - - - - - - - exec-maven-plugin - org.codehaus.mojo - - - rename-epoll-library - package - - exec - - - ${project.parent.basedir}/src/${rename.netty.native.libs} - - ${project.artifactId} - - - - - - - - From d69d98178ccedb225e85b5d447af4366fe34e1da Mon Sep 17 00:00:00 2001 From: Zixuan Liu Date: Wed, 4 Jun 2025 16:45:59 +0800 Subject: [PATCH 22/24] [improve][build] Add .mvn Signed-off-by: Zixuan Liu --- .mvn/jvm.config | 1 + .mvn/wrapper/maven-wrapper.properties | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 .mvn/jvm.config create mode 100644 .mvn/wrapper/maven-wrapper.properties diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 0000000000000..432ae52c53050 --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1 @@ +-Xss1500k \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000000..d58dfb70bab56 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip From c84738baf21041f7d5e3b4c8457218ea27dea8cc Mon Sep 17 00:00:00 2001 From: Zixuan Liu Date: Wed, 4 Jun 2025 16:57:59 +0800 Subject: [PATCH 23/24] [fix][test] Fix testNamespaceResourceGroup Signed-off-by: Zixuan Liu --- .../org/apache/pulsar/broker/admin/ResourceGroupsTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/ResourceGroupsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/ResourceGroupsTest.java index bdf1c3bdecbc9..4f20c1b360556 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/ResourceGroupsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/ResourceGroupsTest.java @@ -27,6 +27,7 @@ import org.apache.pulsar.common.policies.data.ClusterData; import org.apache.pulsar.common.policies.data.ResourceGroup; import org.apache.pulsar.common.policies.data.TenantInfoImpl; +import org.awaitility.Awaitility; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -167,8 +168,9 @@ public void testNamespaceResourceGroup() throws Exception { } // remove resourcegroup from namespace admin.namespaces().removeNamespaceResourceGroup(testNameSpace); - resourcegroups.deleteResourceGroup("test-resourcegroup-three"); - + Awaitility.await().untilAsserted(() -> { + resourcegroups.deleteResourceGroup("test-resourcegroup-three"); + }); } private void prepareData() throws PulsarAdminException { From 1a73c01862844ca482d7e2151dc617957dce2714 Mon Sep 17 00:00:00 2001 From: Zixuan Liu Date: Wed, 4 Jun 2025 17:03:30 +0800 Subject: [PATCH 24/24] [fix][test] Move testDeleteUselessLogDataWhenSubCursorMoved test group Signed-off-by: Zixuan Liu --- .../broker/transaction/pendingack/PendingAckPersistentTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckPersistentTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckPersistentTest.java index 1eb04ca1ccf0c..e80d0554299d0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckPersistentTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckPersistentTest.java @@ -365,7 +365,7 @@ private void testDeleteTopicThenDeletePendingAckManagedLedger() throws Exception assertFalse(topics.contains(topic)); } - @Test + @Test(groups = "quarantine") public void testDeleteUselessLogDataWhenSubCursorMoved() throws Exception { getPulsarServiceList().get(0).getConfig().setTransactionPendingAckLogIndexMinLag(5); getPulsarServiceList().get(0).getConfiguration().setManagedLedgerDefaultMarkDeleteRateLimit(5);