From c46e58eb4e7a1c1e0e545947dd2acac821ad3d66 Mon Sep 17 00:00:00 2001 From: sundapeng Date: Mon, 27 Nov 2023 12:10:39 +0000 Subject: [PATCH 1/4] Upgrade Netty to 4.1.93.Final --- 0003-netty-to-4.1.93.patch | 272 +++++++++++++++++++++++++++++++++++++ pulsar.spec | 9 +- 2 files changed, 278 insertions(+), 3 deletions(-) create mode 100644 0003-netty-to-4.1.93.patch diff --git a/0003-netty-to-4.1.93.patch b/0003-netty-to-4.1.93.patch new file mode 100644 index 0000000..2be140c --- /dev/null +++ b/0003-netty-to-4.1.93.patch @@ -0,0 +1,272 @@ +From f4147f807c2ec9b64c66cd74f871a2e6d6959ab3 Mon Sep 17 00:00:00 2001 +From: Lari Hotari +Date: Mon, 29 May 2023 09:58:07 +0300 +Subject: [PATCH] [improve][misc] Upgrade Netty to 4.1.93.Final + +- Upgrade Netty to 4.1.93.Final and io_uring transport to 0.0.21.Final + - includes netty-tcnative 2.0.61.Final + +Highlights: +- Upgrade to latest netty-tcnative to fix memory leak in 4.1.93.Final + https://github.com/netty/netty/pull/13375 +- native SSL implementation fixes in 4.1.91.Final + https://twitter.com/normanmaurer/status/1642884593522032640 +- performance improvements in 4.1.90.Final and 4.1.92.Final + https://twitter.com/normanmaurer/status/1635671472566837248 + https://twitter.com/normanmaurer/status/1650816576885538816 + +Release notes: +https://netty.io/news/2023/03/14/4-1-90-Final.html +https://netty.io/news/2023/04/03/4-1-91-Final.html +https://netty.io/news/2023/04/25/4-1-92-Final.html +https://netty.io/news/2023/05/25/4-1-93-Final.html +--- + buildtools/pom.xml | 2 +- + .../server/src/assemble/LICENSE.bin.txt | 62 +++++++++---------- + .../shell/src/assemble/LICENSE.bin.txt | 58 ++++++++--------- + pom.xml | 4 +- + pulsar-sql/presto-distribution/LICENSE | 60 +++++++++--------- + 5 files changed, 93 insertions(+), 93 deletions(-) + +diff --git a/buildtools/pom.xml b/buildtools/pom.xml +index 9e4ac022024e1..5a391777f2567 100644 +--- a/buildtools/pom.xml ++++ b/buildtools/pom.xml +@@ -47,7 +47,7 @@ + 4.1 + 8.37 + 3.1.2 +- 4.1.89.Final ++ 4.1.93.Final + 4.2.3 + 31.0.1-jre + 1.10.12 +diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt +index 220f0ac0758b8..487e4e96b6a66 100644 +--- a/distribution/server/src/assemble/LICENSE.bin.txt ++++ b/distribution/server/src/assemble/LICENSE.bin.txt +@@ -289,37 +289,37 @@ The Apache Software License, Version 2.0 + - org.apache.commons-commons-lang3-3.11.jar + - org.apache.commons-commons-text-1.10.0.jar + * Netty +- - io.netty-netty-buffer-4.1.89.Final.jar +- - io.netty-netty-codec-4.1.89.Final.jar +- - io.netty-netty-codec-dns-4.1.89.Final.jar +- - io.netty-netty-codec-http-4.1.89.Final.jar +- - io.netty-netty-codec-http2-4.1.89.Final.jar +- - io.netty-netty-codec-socks-4.1.89.Final.jar +- - io.netty-netty-codec-haproxy-4.1.89.Final.jar +- - io.netty-netty-common-4.1.89.Final.jar +- - io.netty-netty-handler-4.1.89.Final.jar +- - io.netty-netty-handler-proxy-4.1.89.Final.jar +- - io.netty-netty-resolver-4.1.89.Final.jar +- - io.netty-netty-resolver-dns-4.1.89.Final.jar +- - io.netty-netty-resolver-dns-classes-macos-4.1.89.Final.jar +- - io.netty-netty-resolver-dns-native-macos-4.1.89.Final-osx-aarch_64.jar +- - io.netty-netty-resolver-dns-native-macos-4.1.89.Final-osx-x86_64.jar +- - io.netty-netty-transport-4.1.89.Final.jar +- - io.netty-netty-transport-classes-epoll-4.1.89.Final.jar +- - io.netty-netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar +- - io.netty-netty-transport-native-epoll-4.1.89.Final.jar +- - io.netty-netty-transport-native-unix-common-4.1.89.Final.jar +- - io.netty-netty-transport-native-unix-common-4.1.89.Final-linux-x86_64.jar +- - io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar +- - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar +- - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar +- - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar +- - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar +- - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar +- - io.netty-netty-tcnative-classes-2.0.56.Final.jar +- - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.18.Final.jar +- - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar +- - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar ++ - io.netty-netty-buffer-4.1.93.Final.jar ++ - io.netty-netty-codec-4.1.93.Final.jar ++ - io.netty-netty-codec-dns-4.1.93.Final.jar ++ - io.netty-netty-codec-http-4.1.93.Final.jar ++ - io.netty-netty-codec-http2-4.1.93.Final.jar ++ - io.netty-netty-codec-socks-4.1.93.Final.jar ++ - io.netty-netty-codec-haproxy-4.1.93.Final.jar ++ - io.netty-netty-common-4.1.93.Final.jar ++ - io.netty-netty-handler-4.1.93.Final.jar ++ - io.netty-netty-handler-proxy-4.1.93.Final.jar ++ - io.netty-netty-resolver-4.1.93.Final.jar ++ - io.netty-netty-resolver-dns-4.1.93.Final.jar ++ - io.netty-netty-resolver-dns-classes-macos-4.1.93.Final.jar ++ - io.netty-netty-resolver-dns-native-macos-4.1.93.Final-osx-aarch_64.jar ++ - io.netty-netty-resolver-dns-native-macos-4.1.93.Final-osx-x86_64.jar ++ - io.netty-netty-transport-4.1.93.Final.jar ++ - io.netty-netty-transport-classes-epoll-4.1.93.Final.jar ++ - io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar ++ - io.netty-netty-transport-native-epoll-4.1.93.Final.jar ++ - io.netty-netty-transport-native-unix-common-4.1.93.Final.jar ++ - io.netty-netty-transport-native-unix-common-4.1.93.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.incubator-netty-incubator-transport-classes-io_uring-0.0.21.Final.jar ++ - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar ++ - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar + * Prometheus client + - io.prometheus.jmx-collector-0.16.1.jar + - io.prometheus-simpleclient-0.16.0.jar +diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt +index 711890809f1bf..c04ac2b7d0363 100644 +--- a/distribution/shell/src/assemble/LICENSE.bin.txt ++++ b/distribution/shell/src/assemble/LICENSE.bin.txt +@@ -348,35 +348,35 @@ The Apache Software License, Version 2.0 + - commons-text-1.10.0.jar + - commons-compress-1.21.jar + * Netty +- - netty-buffer-4.1.89.Final.jar +- - netty-codec-4.1.89.Final.jar +- - netty-codec-dns-4.1.89.Final.jar +- - netty-codec-http-4.1.89.Final.jar +- - netty-codec-socks-4.1.89.Final.jar +- - netty-codec-haproxy-4.1.89.Final.jar +- - netty-common-4.1.89.Final.jar +- - netty-handler-4.1.89.Final.jar +- - netty-handler-proxy-4.1.89.Final.jar +- - netty-resolver-4.1.89.Final.jar +- - netty-resolver-dns-4.1.89.Final.jar +- - netty-transport-4.1.89.Final.jar +- - netty-transport-classes-epoll-4.1.89.Final.jar +- - netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar +- - netty-transport-native-unix-common-4.1.89.Final.jar +- - netty-transport-native-unix-common-4.1.89.Final-linux-x86_64.jar +- - netty-tcnative-boringssl-static-2.0.56.Final.jar +- - netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar +- - netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar +- - netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar +- - netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar +- - netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar +- - netty-tcnative-classes-2.0.56.Final.jar +- - netty-incubator-transport-classes-io_uring-0.0.18.Final.jar +- - netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar +- - netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar +- - netty-resolver-dns-classes-macos-4.1.89.Final.jar +- - netty-resolver-dns-native-macos-4.1.89.Final-osx-aarch_64.jar +- - netty-resolver-dns-native-macos-4.1.89.Final-osx-x86_64.jar ++ - netty-buffer-4.1.93.Final.jar ++ - netty-codec-4.1.93.Final.jar ++ - netty-codec-dns-4.1.93.Final.jar ++ - netty-codec-http-4.1.93.Final.jar ++ - netty-codec-socks-4.1.93.Final.jar ++ - netty-codec-haproxy-4.1.93.Final.jar ++ - netty-common-4.1.93.Final.jar ++ - netty-handler-4.1.93.Final.jar ++ - netty-handler-proxy-4.1.93.Final.jar ++ - netty-resolver-4.1.93.Final.jar ++ - netty-resolver-dns-4.1.93.Final.jar ++ - netty-transport-4.1.93.Final.jar ++ - netty-transport-classes-epoll-4.1.93.Final.jar ++ - netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar ++ - netty-transport-native-unix-common-4.1.93.Final.jar ++ - netty-transport-native-unix-common-4.1.93.Final-linux-x86_64.jar ++ - netty-tcnative-boringssl-static-2.0.61.Final.jar ++ - netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar ++ - netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar ++ - 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-incubator-transport-classes-io_uring-0.0.21.Final.jar ++ - netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar ++ - netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar ++ - netty-resolver-dns-classes-macos-4.1.93.Final.jar ++ - netty-resolver-dns-native-macos-4.1.93.Final-osx-aarch_64.jar ++ - netty-resolver-dns-native-macos-4.1.93.Final-osx-x86_64.jar + * Prometheus client + - simpleclient-0.16.0.jar + - simpleclient_log4j2-0.16.0.jar +diff --git a/pom.xml b/pom.xml +index b45debcc9db25..c1a126b1161c0 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -140,8 +140,8 @@ flexible messaging model and an intuitive client API. + 1.1.8.4 + 4.1.12.1 + 5.1.0 +- 4.1.89.Final +- 0.0.18.Final ++ 4.1.93.Final ++ 0.0.21.Final + 9.4.48.v20220622 + 2.5.2 + 2.34 +diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE +index a85d1bc363c1b..2a13985ac4ed5 100644 +--- a/pulsar-sql/presto-distribution/LICENSE ++++ b/pulsar-sql/presto-distribution/LICENSE +@@ -231,37 +231,37 @@ The Apache Software License, Version 2.0 + - commons-compress-1.21.jar + - commons-lang3-3.11.jar + * Netty +- - netty-buffer-4.1.89.Final.jar +- - netty-codec-4.1.89.Final.jar +- - netty-codec-dns-4.1.89.Final.jar +- - netty-codec-http-4.1.89.Final.jar +- - netty-codec-haproxy-4.1.89.Final.jar +- - netty-codec-socks-4.1.89.Final.jar +- - netty-handler-proxy-4.1.89.Final.jar +- - netty-common-4.1.89.Final.jar +- - netty-handler-4.1.89.Final.jar ++ - netty-buffer-4.1.93.Final.jar ++ - netty-codec-4.1.93.Final.jar ++ - netty-codec-dns-4.1.93.Final.jar ++ - netty-codec-http-4.1.93.Final.jar ++ - netty-codec-haproxy-4.1.93.Final.jar ++ - netty-codec-socks-4.1.93.Final.jar ++ - netty-handler-proxy-4.1.93.Final.jar ++ - netty-common-4.1.93.Final.jar ++ - netty-handler-4.1.93.Final.jar + - netty-reactive-streams-2.0.6.jar +- - netty-resolver-4.1.89.Final.jar +- - netty-resolver-dns-4.1.89.Final.jar +- - netty-resolver-dns-classes-macos-4.1.89.Final.jar +- - netty-resolver-dns-native-macos-4.1.89.Final-osx-aarch_64.jar +- - netty-resolver-dns-native-macos-4.1.89.Final-osx-x86_64.jar +- - netty-tcnative-boringssl-static-2.0.56.Final.jar +- - netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar +- - netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar +- - netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar +- - netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar +- - netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar +- - netty-tcnative-classes-2.0.56.Final.jar +- - netty-transport-4.1.89.Final.jar +- - netty-transport-classes-epoll-4.1.89.Final.jar +- - netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar +- - netty-transport-native-unix-common-4.1.89.Final.jar +- - netty-transport-native-unix-common-4.1.89.Final-linux-x86_64.jar +- - netty-codec-http2-4.1.89.Final.jar +- - netty-incubator-transport-classes-io_uring-0.0.18.Final.jar +- - netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar +- - netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar ++ - netty-resolver-4.1.93.Final.jar ++ - netty-resolver-dns-4.1.93.Final.jar ++ - netty-resolver-dns-classes-macos-4.1.93.Final.jar ++ - netty-resolver-dns-native-macos-4.1.93.Final-osx-aarch_64.jar ++ - netty-resolver-dns-native-macos-4.1.93.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.93.Final.jar ++ - netty-transport-classes-epoll-4.1.93.Final.jar ++ - netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar ++ - netty-transport-native-unix-common-4.1.93.Final.jar ++ - netty-transport-native-unix-common-4.1.93.Final-linux-x86_64.jar ++ - netty-codec-http2-4.1.93.Final.jar ++ - netty-incubator-transport-classes-io_uring-0.0.21.Final.jar ++ - netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar ++ - netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar + * GRPC + - grpc-api-1.45.1.jar + - grpc-context-1.45.1.jar diff --git a/pulsar.spec b/pulsar.spec index e4b21ab..863a8b1 100644 --- a/pulsar.spec +++ b/pulsar.spec @@ -1,6 +1,6 @@ %define debug_package %{nil} %define pulsar_ver 2.10.4 -%define pkg_ver 1 +%define pkg_ver 3 %define _prefix /opt/pulsar Summary: Cloud-Native, Distributed Messaging and Streaming Name: pulsar @@ -12,6 +12,7 @@ URL: https://pulsar.apache.org Source0: https://archive.apache.org/dist/pulsar/pulsar-2.10.4/apache-pulsar-2.10.4-src.tar.gz Patch0001: 0001-use-huawei-repository.patch Patch0002: 0002-resolve-cve-2023-32697.patch +Patch0003: 0003-netty-to-4.1.93.patch BuildRoot: /root/rpmbuild/BUILDROOT/ BuildRequires: java-1.8.0-openjdk-devel,maven,systemd Requires: java-1.8.0-openjdk,systemd @@ -51,7 +52,9 @@ getent passwd pulsar >/dev/null || useradd -r -g pulsar -d / -s /sbin/nologin pu exit 0 %changelog +* Mon Sep 27 2023 Dapeng Sun - 2.10.4-3 +- upgrade netty to 4.1.93 +* Fri Aug 24 2023 Jialing Wang - 2.10.4-2 +- resovle Cve-2023-32697 * Fri Aug 11 2023 Jialing Wang - 2.10.4-1 - init puslar spec -* Fri Aug 24 2023 Jialing Wang - 2.10.4-2 -- resovle Cve-2023-32697 \ No newline at end of file -- Gitee From 550b0192a889a9b30019abd6b026367d4616e6e2 Mon Sep 17 00:00:00 2001 From: sundapeng Date: Tue, 28 Nov 2023 00:44:30 +0000 Subject: [PATCH 2/4] fix pulsar.spec --- pulsar.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pulsar.spec b/pulsar.spec index 863a8b1..43bad1c 100644 --- a/pulsar.spec +++ b/pulsar.spec @@ -27,6 +27,7 @@ Pulsar is a distributed pub-sub messaging platform with a very flexible messagin %patch0001 -p1 %patch0002 -p1 +%patch0003 -p1 %build mvn clean install -Pcore-modules,-main -DskipTests @@ -52,7 +53,7 @@ getent passwd pulsar >/dev/null || useradd -r -g pulsar -d / -s /sbin/nologin pu exit 0 %changelog -* Mon Sep 27 2023 Dapeng Sun - 2.10.4-3 +* Mon Nov 27 2023 Dapeng Sun - 2.10.4-3 - upgrade netty to 4.1.93 * Fri Aug 24 2023 Jialing Wang - 2.10.4-2 - resovle Cve-2023-32697 -- Gitee From 5092c5a31efeef71e03234e6554a76d6ec1b8a53 Mon Sep 17 00:00:00 2001 From: sundapeng Date: Tue, 28 Nov 2023 02:34:48 +0000 Subject: [PATCH 3/4] remove unnecessary dependencies --- 0003-netty-to-4.1.93.patch | 229 ++++++++++--------------------------- pulsar.spec | 2 - 2 files changed, 59 insertions(+), 172 deletions(-) diff --git a/0003-netty-to-4.1.93.patch b/0003-netty-to-4.1.93.patch index 2be140c..c3e9822 100644 --- a/0003-netty-to-4.1.93.patch +++ b/0003-netty-to-4.1.93.patch @@ -1,75 +1,42 @@ -From f4147f807c2ec9b64c66cd74f871a2e6d6959ab3 Mon Sep 17 00:00:00 2001 -From: Lari Hotari -Date: Mon, 29 May 2023 09:58:07 +0300 -Subject: [PATCH] [improve][misc] Upgrade Netty to 4.1.93.Final - -- Upgrade Netty to 4.1.93.Final and io_uring transport to 0.0.21.Final - - includes netty-tcnative 2.0.61.Final - -Highlights: -- Upgrade to latest netty-tcnative to fix memory leak in 4.1.93.Final - https://github.com/netty/netty/pull/13375 -- native SSL implementation fixes in 4.1.91.Final - https://twitter.com/normanmaurer/status/1642884593522032640 -- performance improvements in 4.1.90.Final and 4.1.92.Final - https://twitter.com/normanmaurer/status/1635671472566837248 - https://twitter.com/normanmaurer/status/1650816576885538816 - -Release notes: -https://netty.io/news/2023/03/14/4-1-90-Final.html -https://netty.io/news/2023/04/03/4-1-91-Final.html -https://netty.io/news/2023/04/25/4-1-92-Final.html -https://netty.io/news/2023/05/25/4-1-93-Final.html ---- - buildtools/pom.xml | 2 +- - .../server/src/assemble/LICENSE.bin.txt | 62 +++++++++---------- - .../shell/src/assemble/LICENSE.bin.txt | 58 ++++++++--------- - pom.xml | 4 +- - pulsar-sql/presto-distribution/LICENSE | 60 +++++++++--------- - 5 files changed, 93 insertions(+), 93 deletions(-) - diff --git a/buildtools/pom.xml b/buildtools/pom.xml -index 9e4ac022024e1..5a391777f2567 100644 +index 0197f03326..62485b524b 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml -@@ -47,7 +47,7 @@ - 4.1 - 8.37 - 3.1.2 -- 4.1.89.Final -+ 4.1.93.Final - 4.2.3 - 31.0.1-jre - 1.10.12 +@@ -131,7 +131,7 @@ + + io.netty + netty-common +- 4.1.86.Final ++ 4.1.93.Final + test + + diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt -index 220f0ac0758b8..487e4e96b6a66 100644 +index 1ce81c7344..f420acf935 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt -@@ -289,37 +289,37 @@ The Apache Software License, Version 2.0 +@@ -352,31 +352,37 @@ The Apache Software License, Version 2.0 + - org.apache.commons-commons-compress-1.21.jar - org.apache.commons-commons-lang3-3.11.jar - - org.apache.commons-commons-text-1.10.0.jar * Netty -- - io.netty-netty-buffer-4.1.89.Final.jar -- - io.netty-netty-codec-4.1.89.Final.jar -- - io.netty-netty-codec-dns-4.1.89.Final.jar -- - io.netty-netty-codec-http-4.1.89.Final.jar -- - io.netty-netty-codec-http2-4.1.89.Final.jar -- - io.netty-netty-codec-socks-4.1.89.Final.jar -- - io.netty-netty-codec-haproxy-4.1.89.Final.jar -- - io.netty-netty-common-4.1.89.Final.jar -- - io.netty-netty-handler-4.1.89.Final.jar -- - io.netty-netty-handler-proxy-4.1.89.Final.jar -- - io.netty-netty-resolver-4.1.89.Final.jar -- - io.netty-netty-resolver-dns-4.1.89.Final.jar -- - io.netty-netty-resolver-dns-classes-macos-4.1.89.Final.jar -- - io.netty-netty-resolver-dns-native-macos-4.1.89.Final-osx-aarch_64.jar -- - io.netty-netty-resolver-dns-native-macos-4.1.89.Final-osx-x86_64.jar -- - io.netty-netty-transport-4.1.89.Final.jar -- - io.netty-netty-transport-classes-epoll-4.1.89.Final.jar -- - io.netty-netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar -- - io.netty-netty-transport-native-epoll-4.1.89.Final.jar -- - io.netty-netty-transport-native-unix-common-4.1.89.Final.jar -- - io.netty-netty-transport-native-unix-common-4.1.89.Final-linux-x86_64.jar +- - io.netty-netty-buffer-4.1.87.Final.jar +- - io.netty-netty-codec-4.1.87.Final.jar +- - io.netty-netty-codec-dns-4.1.87.Final.jar +- - io.netty-netty-codec-http-4.1.87.Final.jar +- - io.netty-netty-codec-http2-4.1.87.Final.jar +- - io.netty-netty-codec-socks-4.1.87.Final.jar +- - io.netty-netty-codec-haproxy-4.1.87.Final.jar +- - io.netty-netty-common-4.1.87.Final.jar +- - io.netty-netty-handler-4.1.87.Final.jar +- - io.netty-netty-handler-proxy-4.1.87.Final.jar +- - io.netty-netty-resolver-4.1.87.Final.jar +- - io.netty-netty-resolver-dns-4.1.87.Final.jar +- - io.netty-netty-transport-4.1.87.Final.jar +- - io.netty-netty-transport-classes-epoll-4.1.87.Final.jar +- - io.netty-netty-transport-native-epoll-4.1.87.Final-linux-x86_64.jar +- - io.netty-netty-transport-native-epoll-4.1.87.Final.jar +- - io.netty-netty-transport-native-unix-common-4.1.87.Final.jar +- - io.netty-netty-transport-native-unix-common-4.1.87.Final-linux-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar - - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar @@ -77,9 +44,6 @@ index 220f0ac0758b8..487e4e96b6a66 100644 - - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar - - io.netty-netty-tcnative-classes-2.0.56.Final.jar -- - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.18.Final.jar -- - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar -- - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar + - io.netty-netty-buffer-4.1.93.Final.jar + - io.netty-netty-codec-4.1.93.Final.jar + - io.netty-netty-codec-dns-4.1.93.Final.jar @@ -112,109 +76,40 @@ index 220f0ac0758b8..487e4e96b6a66 100644 + - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar + - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar * Prometheus client - - io.prometheus.jmx-collector-0.16.1.jar - - io.prometheus-simpleclient-0.16.0.jar -diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt -index 711890809f1bf..c04ac2b7d0363 100644 ---- a/distribution/shell/src/assemble/LICENSE.bin.txt -+++ b/distribution/shell/src/assemble/LICENSE.bin.txt -@@ -348,35 +348,35 @@ The Apache Software License, Version 2.0 - - commons-text-1.10.0.jar - - commons-compress-1.21.jar - * Netty -- - netty-buffer-4.1.89.Final.jar -- - netty-codec-4.1.89.Final.jar -- - netty-codec-dns-4.1.89.Final.jar -- - netty-codec-http-4.1.89.Final.jar -- - netty-codec-socks-4.1.89.Final.jar -- - netty-codec-haproxy-4.1.89.Final.jar -- - netty-common-4.1.89.Final.jar -- - netty-handler-4.1.89.Final.jar -- - netty-handler-proxy-4.1.89.Final.jar -- - netty-resolver-4.1.89.Final.jar -- - netty-resolver-dns-4.1.89.Final.jar -- - netty-transport-4.1.89.Final.jar -- - netty-transport-classes-epoll-4.1.89.Final.jar -- - netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar -- - netty-transport-native-unix-common-4.1.89.Final.jar -- - netty-transport-native-unix-common-4.1.89.Final-linux-x86_64.jar -- - netty-tcnative-boringssl-static-2.0.56.Final.jar -- - netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar -- - netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar -- - netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar -- - netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar -- - netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar -- - netty-tcnative-classes-2.0.56.Final.jar -- - netty-incubator-transport-classes-io_uring-0.0.18.Final.jar -- - netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar -- - netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar -- - netty-resolver-dns-classes-macos-4.1.89.Final.jar -- - netty-resolver-dns-native-macos-4.1.89.Final-osx-aarch_64.jar -- - netty-resolver-dns-native-macos-4.1.89.Final-osx-x86_64.jar -+ - netty-buffer-4.1.93.Final.jar -+ - netty-codec-4.1.93.Final.jar -+ - netty-codec-dns-4.1.93.Final.jar -+ - netty-codec-http-4.1.93.Final.jar -+ - netty-codec-socks-4.1.93.Final.jar -+ - netty-codec-haproxy-4.1.93.Final.jar -+ - netty-common-4.1.93.Final.jar -+ - netty-handler-4.1.93.Final.jar -+ - netty-handler-proxy-4.1.93.Final.jar -+ - netty-resolver-4.1.93.Final.jar -+ - netty-resolver-dns-4.1.93.Final.jar -+ - netty-transport-4.1.93.Final.jar -+ - netty-transport-classes-epoll-4.1.93.Final.jar -+ - netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar -+ - netty-transport-native-unix-common-4.1.93.Final.jar -+ - netty-transport-native-unix-common-4.1.93.Final-linux-x86_64.jar -+ - netty-tcnative-boringssl-static-2.0.61.Final.jar -+ - netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar -+ - netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar -+ - 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-incubator-transport-classes-io_uring-0.0.21.Final.jar -+ - netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar -+ - netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar -+ - netty-resolver-dns-classes-macos-4.1.93.Final.jar -+ - netty-resolver-dns-native-macos-4.1.93.Final-osx-aarch_64.jar -+ - netty-resolver-dns-native-macos-4.1.93.Final-osx-x86_64.jar - * Prometheus client - - simpleclient-0.16.0.jar - - simpleclient_log4j2-0.16.0.jar + - io.prometheus-simpleclient-0.5.0.jar + - io.prometheus-simpleclient_common-0.5.0.jar diff --git a/pom.xml b/pom.xml -index b45debcc9db25..c1a126b1161c0 100644 +index 69adebd4df..ab743c4d29 100644 --- a/pom.xml +++ b/pom.xml -@@ -140,8 +140,8 @@ flexible messaging model and an intuitive client API. - 1.1.8.4 - 4.1.12.1 +@@ -110,8 +110,8 @@ flexible messaging model and an intuitive client API. + 1.1.7 + 3.2.5 5.1.0 -- 4.1.89.Final -- 0.0.18.Final +- 4.1.87.Final +- 0.0.17.Final + 4.1.93.Final + 0.0.21.Final 9.4.48.v20220622 2.5.2 2.34 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE -index a85d1bc363c1b..2a13985ac4ed5 100644 +index 4087b9e83e..33e93f8fba 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE -@@ -231,37 +231,37 @@ The Apache Software License, Version 2.0 - - commons-compress-1.21.jar +@@ -232,31 +232,37 @@ The Apache Software License, Version 2.0 - commons-lang3-3.11.jar * Netty -- - netty-buffer-4.1.89.Final.jar -- - netty-codec-4.1.89.Final.jar -- - netty-codec-dns-4.1.89.Final.jar -- - netty-codec-http-4.1.89.Final.jar -- - netty-codec-haproxy-4.1.89.Final.jar -- - netty-codec-socks-4.1.89.Final.jar -- - netty-handler-proxy-4.1.89.Final.jar -- - netty-common-4.1.89.Final.jar -- - netty-handler-4.1.89.Final.jar + - netty-3.10.6.Final.jar +- - netty-buffer-4.1.87.Final.jar +- - netty-codec-4.1.87.Final.jar +- - netty-codec-dns-4.1.87.Final.jar +- - netty-codec-http-4.1.87.Final.jar +- - netty-codec-haproxy-4.1.87.Final.jar +- - netty-codec-socks-4.1.87.Final.jar +- - netty-handler-proxy-4.1.87.Final.jar +- - netty-common-4.1.87.Final.jar +- - netty-handler-4.1.87.Final.jar + - netty-buffer-4.1.93.Final.jar + - netty-codec-4.1.93.Final.jar + - netty-codec-dns-4.1.93.Final.jar @@ -225,11 +120,8 @@ index a85d1bc363c1b..2a13985ac4ed5 100644 + - netty-common-4.1.93.Final.jar + - netty-handler-4.1.93.Final.jar - netty-reactive-streams-2.0.6.jar -- - netty-resolver-4.1.89.Final.jar -- - netty-resolver-dns-4.1.89.Final.jar -- - netty-resolver-dns-classes-macos-4.1.89.Final.jar -- - netty-resolver-dns-native-macos-4.1.89.Final-osx-aarch_64.jar -- - netty-resolver-dns-native-macos-4.1.89.Final-osx-x86_64.jar +- - netty-resolver-4.1.87.Final.jar +- - netty-resolver-dns-4.1.87.Final.jar - - netty-tcnative-boringssl-static-2.0.56.Final.jar - - netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar - - netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar @@ -237,15 +129,12 @@ index a85d1bc363c1b..2a13985ac4ed5 100644 - - netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar - - netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar - - netty-tcnative-classes-2.0.56.Final.jar -- - netty-transport-4.1.89.Final.jar -- - netty-transport-classes-epoll-4.1.89.Final.jar -- - netty-transport-native-epoll-4.1.89.Final-linux-x86_64.jar -- - netty-transport-native-unix-common-4.1.89.Final.jar -- - netty-transport-native-unix-common-4.1.89.Final-linux-x86_64.jar -- - netty-codec-http2-4.1.89.Final.jar -- - netty-incubator-transport-classes-io_uring-0.0.18.Final.jar -- - netty-incubator-transport-native-io_uring-0.0.18.Final-linux-x86_64.jar -- - netty-incubator-transport-native-io_uring-0.0.18.Final-linux-aarch_64.jar +- - netty-transport-4.1.87.Final.jar +- - netty-transport-classes-epoll-4.1.87.Final.jar +- - netty-transport-native-epoll-4.1.87.Final-linux-x86_64.jar +- - netty-transport-native-unix-common-4.1.87.Final.jar +- - netty-transport-native-unix-common-4.1.87.Final-linux-x86_64.jar +- - netty-codec-http2-4.1.87.Final.jar + - netty-resolver-4.1.93.Final.jar + - netty-resolver-dns-4.1.93.Final.jar + - netty-resolver-dns-classes-macos-4.1.93.Final.jar diff --git a/pulsar.spec b/pulsar.spec index 43bad1c..a39fc90 100644 --- a/pulsar.spec +++ b/pulsar.spec @@ -14,8 +14,6 @@ Patch0001: 0001-use-huawei-repository.patch Patch0002: 0002-resolve-cve-2023-32697.patch Patch0003: 0003-netty-to-4.1.93.patch BuildRoot: /root/rpmbuild/BUILDROOT/ -BuildRequires: java-1.8.0-openjdk-devel,maven,systemd -Requires: java-1.8.0-openjdk,systemd Provides: apache-pulsar Provides: mvn(org.apche.pulsar:pulsar) -- Gitee From f0eed14c7003ed2c2e9925938de79f1848df35fe Mon Sep 17 00:00:00 2001 From: sundapeng Date: Tue, 28 Nov 2023 02:55:16 +0000 Subject: [PATCH 4/4] add mvn --- pulsar.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pulsar.spec b/pulsar.spec index a39fc90..e219e6b 100644 --- a/pulsar.spec +++ b/pulsar.spec @@ -14,6 +14,8 @@ Patch0001: 0001-use-huawei-repository.patch Patch0002: 0002-resolve-cve-2023-32697.patch Patch0003: 0003-netty-to-4.1.93.patch BuildRoot: /root/rpmbuild/BUILDROOT/ +BuildRequires: maven,systemd +Requires: systemd Provides: apache-pulsar Provides: mvn(org.apche.pulsar:pulsar) -- Gitee