From adac49a14d70c51343db8c4193e3074afcda1816 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Fri, 27 May 2022 17:11:54 +0800 Subject: [PATCH] Upgrade netty to fix bug in Ubuntu 22 (#9141) --- apm-webapp/pom.xml | 2 +- dist-material/release-docs/LICENSE | 2 +- pom.xml | 4 +- .../known-oap-backend-dependencies.txt | 56 +++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml index b11023b646..2761c731a9 100644 --- a/apm-webapp/pom.xml +++ b/apm-webapp/pom.xml @@ -39,7 +39,7 @@ 1.2.11 2.13.2.2 1.28 - 4.1.76.Final + 4.1.77.Final ${project.parent.basedir}/skywalking-ui diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index 4907f71fdc..cabac6b751 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -254,7 +254,7 @@ The text of each license is the standard Apache 2.0 license. Apache: freemarker 2.3.31: https://github.com/apache/freemarker, Apache 2.0 Apache: Tomcat-embed 9.0.62 https://tomcat.apache.org, Apache 2.0 Apache: httpclient 4.5.13 https://hc.apache.org/, Apache 2.0 - netty 4.1.76: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0 + netty 4.1.77: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0 netty: netty-tcnative-boringssl-static 2.0.51: https://github.com/netty/netty-tcnative, Apache 2.0 annotations 13.0: http://www.jetbrains.org, Apache 2.0 compiler 0.9.6: https://github.com/spullara/mustache.java, Apache 2.0 diff --git a/pom.xml b/pom.xml index 40b4bc0b72..6730d5d187 100755 --- a/pom.xml +++ b/pom.xml @@ -156,8 +156,8 @@ 1.46.0 - 4.1.76.Final - 2.0.51.Final + 4.1.77.Final + 2.0.52.Final 2.9.0 1.6.2 0.6.1 diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index 55845621b2..8da8936947 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -103,34 +103,34 @@ mvel2-2.4.8.Final.jar nacos-api-1.4.2.jar nacos-client-1.4.2.jar nacos-common-1.4.2.jar -netty-buffer-4.1.76.Final.jar -netty-codec-4.1.76.Final.jar -netty-codec-dns-4.1.76.Final.jar -netty-codec-haproxy-4.1.76.Final.jar -netty-codec-http-4.1.76.Final.jar -netty-codec-http2-4.1.76.Final.jar -netty-codec-socks-4.1.76.Final.jar -netty-common-4.1.76.Final.jar -netty-handler-4.1.76.Final.jar -netty-handler-proxy-4.1.76.Final.jar -netty-resolver-4.1.76.Final.jar -netty-resolver-dns-4.1.76.Final.jar -netty-resolver-dns-native-macos-4.1.76.Final-osx-x86_64.jar -netty-resolver-dns-native-macos-4.1.76.Final-osx-aarch_64.jar -netty-resolver-dns-classes-macos-4.1.76.Final.jar -netty-transport-classes-epoll-4.1.76.Final.jar -netty-transport-4.1.76.Final.jar -netty-transport-native-epoll-4.1.76.Final.jar -netty-transport-native-epoll-4.1.76.Final-linux-x86_64.jar -netty-transport-native-unix-common-4.1.76.Final.jar -netty-transport-native-unix-common-4.1.76.Final-linux-x86_64.jar -netty-tcnative-boringssl-static-2.0.51.Final-linux-aarch_64.jar -netty-tcnative-boringssl-static-2.0.51.Final-linux-x86_64.jar -netty-tcnative-boringssl-static-2.0.51.Final-osx-aarch_64.jar -netty-tcnative-boringssl-static-2.0.51.Final-osx-x86_64.jar -netty-tcnative-boringssl-static-2.0.51.Final-windows-x86_64.jar -netty-tcnative-boringssl-static-2.0.51.Final.jar -netty-tcnative-classes-2.0.51.Final.jar +netty-buffer-4.1.77.Final.jar +netty-codec-4.1.77.Final.jar +netty-codec-dns-4.1.77.Final.jar +netty-codec-haproxy-4.1.77.Final.jar +netty-codec-http-4.1.77.Final.jar +netty-codec-http2-4.1.77.Final.jar +netty-codec-socks-4.1.77.Final.jar +netty-common-4.1.77.Final.jar +netty-handler-4.1.77.Final.jar +netty-handler-proxy-4.1.77.Final.jar +netty-resolver-4.1.77.Final.jar +netty-resolver-dns-4.1.77.Final.jar +netty-resolver-dns-native-macos-4.1.77.Final-osx-x86_64.jar +netty-resolver-dns-native-macos-4.1.77.Final-osx-aarch_64.jar +netty-resolver-dns-classes-macos-4.1.77.Final.jar +netty-transport-classes-epoll-4.1.77.Final.jar +netty-transport-4.1.77.Final.jar +netty-transport-native-epoll-4.1.77.Final.jar +netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar +netty-transport-native-unix-common-4.1.77.Final.jar +netty-transport-native-unix-common-4.1.77.Final-linux-x86_64.jar +netty-tcnative-boringssl-static-2.0.52.Final-linux-aarch_64.jar +netty-tcnative-boringssl-static-2.0.52.Final-linux-x86_64.jar +netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar +netty-tcnative-boringssl-static-2.0.52.Final-osx-x86_64.jar +netty-tcnative-boringssl-static-2.0.52.Final-windows-x86_64.jar +netty-tcnative-boringssl-static-2.0.52.Final.jar +netty-tcnative-classes-2.0.52.Final.jar okhttp-3.14.9.jar okio-1.17.2.jar perfmark-api-0.25.0.jar -- GitLab