This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new f9380de877 Bump up Armeria to 1.24.3 (#11139)
f9380de877 is described below
commit f9380de877e7e69d1c1085b5292d59ceb54b1c8b
Author: kezhenxu94 <[email protected]>
AuthorDate: Thu Jul 27 15:00:37 2023 +0800
Bump up Armeria to 1.24.3 (#11139)
---
.licenserc.yaml | 7 +++--
dist-material/release-docs/LICENSE | 54 ++++++++++++++++++++------------------
docs/en/changes/changes.md | 1 +
oap-server-bom/pom.xml | 2 +-
4 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 4c26c31204..b3fde55b03 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -105,7 +105,10 @@ dependency:
version: 2.13.4
license: Apache-2.0
- name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
- version: 2.14.2
+ version: 2.15.2
+ license: Apache-2.0
+ - name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8
+ version: 2.15.2
license: Apache-2.0
- name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
version: 2.15.2
@@ -135,6 +138,6 @@ dependency:
version: 0.6.13
license: Apache-2.0
- name: com.aayushatharva.brotli4j:service
- version: 1.11.0
+ version: 1.12.0
license: Apache-2.0
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index 6050229625..55b78a1711 100644
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -210,20 +210,20 @@ The following components are provided under the
Apache-2.0 License. See project
The text of each license is the standard Apache 2.0 license.
https://mvnrepository.com/artifact/build.buf.protoc-gen-validate/pgv-java-stub/0.6.13
Apache-2.0
https://mvnrepository.com/artifact/build.buf.protoc-gen-validate/protoc-gen-validate/0.6.13
Apache-2.0
-
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/brotli4j/1.11.0
Apache-2.0
-
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/service/1.11.0
Apache-2.0
+
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/brotli4j/1.12.0
Apache-2.0
+
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/service/1.12.0
Apache-2.0
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-api/1.4.2
Apache-2.0
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-client/1.4.2
Apache-2.0
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-common/1.4.2
Apache-2.0
https://mvnrepository.com/artifact/com.ctrip.framework.apollo/apollo-client/1.8.0
Apache-2.0
https://mvnrepository.com/artifact/com.ctrip.framework.apollo/apollo-core/1.8.0
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.14.2
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core/2.14.2
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.14.2
Apache-2.0
+
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.15.2
Apache-2.0
+
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core/2.15.2
Apache-2.0
+
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.15.2
Apache-2.0
https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15.2
Apache-2.0
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-guava/2.12.0
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.14.2
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.2
Apache-2.0
+
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.15.2
Apache-2.0
+
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.2
Apache-2.0
https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-kotlin/2.13.4
Apache-2.0
https://mvnrepository.com/artifact/com.fasterxml/classmate/1.5.1 Apache-2.0
https://mvnrepository.com/artifact/com.google.api.grpc/proto-google-common-protos/2.9.0
Apache-2.0
@@ -237,10 +237,10 @@ The text of each license is the standard Apache 2.0
license.
https://mvnrepository.com/artifact/com.google.inject/guice/4.1.0 Apache-2.0
https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/1.3
Apache-2.0
https://mvnrepository.com/artifact/com.graphql-java/java-dataloader/3.2.0
Apache-2.0
- https://mvnrepository.com/artifact/com.linecorp.armeria/armeria/1.23.1
Apache-2.0
-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql/1.23.1
Apache-2.0
-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql-protocol/1.23.1
Apache-2.0
-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-protobuf/1.23.1
Apache-2.0
+ https://mvnrepository.com/artifact/com.linecorp.armeria/armeria/1.24.3
Apache-2.0
+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql/1.24.3
Apache-2.0
+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql-protocol/1.24.3
Apache-2.0
+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-protobuf/1.24.3
Apache-2.0
https://mvnrepository.com/artifact/com.orbitz.consul/consul-client/1.5.3
Apache-2.0
https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp/4.9.0
Apache-2.0
https://mvnrepository.com/artifact/com.squareup.okio/okio/2.8.0 Apache-2.0
@@ -295,32 +295,34 @@ The text of each license is the standard Apache 2.0
license.
https://mvnrepository.com/artifact/io.grpc/grpc-protobuf/1.53.0 Apache-2.0
https://mvnrepository.com/artifact/io.grpc/grpc-protobuf-lite/1.53.0
Apache-2.0
https://mvnrepository.com/artifact/io.grpc/grpc-stub/1.53.0 Apache-2.0
- https://mvnrepository.com/artifact/io.micrometer/micrometer-commons/1.10.5
Apache-2.0
- https://mvnrepository.com/artifact/io.micrometer/micrometer-core/1.10.5
Apache-2.0
-
https://mvnrepository.com/artifact/io.micrometer/micrometer-observation/1.10.5
Apache-2.0
+ https://mvnrepository.com/artifact/io.micrometer/micrometer-commons/1.11.1
Apache-2.0
+ https://mvnrepository.com/artifact/io.micrometer/micrometer-core/1.11.1
Apache-2.0
+
https://mvnrepository.com/artifact/io.micrometer/micrometer-observation/1.11.1
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-buffer/4.1.86.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec/4.1.86.Final
Apache-2.0
- https://mvnrepository.com/artifact/io.netty/netty-codec-dns/4.1.91.Final
Apache-2.0
-
https://mvnrepository.com/artifact/io.netty/netty-codec-haproxy/4.1.91.Final
Apache-2.0
+ https://mvnrepository.com/artifact/io.netty/netty-codec-dns/4.1.94.Final
Apache-2.0
+
https://mvnrepository.com/artifact/io.netty/netty-codec-haproxy/4.1.94.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-http/4.1.86.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-http2/4.1.86.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-socks/4.1.86.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-common/4.1.86.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-handler/4.1.86.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-handler-proxy/4.1.86.Final
Apache-2.0
- https://mvnrepository.com/artifact/io.netty/netty-resolver/4.1.91.Final
Apache-2.0
-
https://mvnrepository.com/artifact/io.netty/netty-resolver-dns/4.1.91.Final
Apache-2.0
-
https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-classes-macos/4.1.91.Final
Apache-2.0
-
https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-native-macos/4.1.91.Final
Apache-2.0
+ https://mvnrepository.com/artifact/io.netty/netty-resolver/4.1.94.Final
Apache-2.0
+
https://mvnrepository.com/artifact/io.netty/netty-resolver-dns/4.1.94.Final
Apache-2.0
+
https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-classes-macos/4.1.94.Final
Apache-2.0
+
https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-native-macos/4.1.94.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-tcnative-boringssl-static/2.0.52.Final
Apache-2.0
-
https://mvnrepository.com/artifact/io.netty/netty-tcnative-boringssl-static/2.0.59.Final
Apache-2.0
-
https://mvnrepository.com/artifact/io.netty/netty-tcnative-classes/2.0.59.Final
Apache-2.0
- https://mvnrepository.com/artifact/io.netty/netty-transport/4.1.91.Final
Apache-2.0
-
https://mvnrepository.com/artifact/io.netty/netty-transport-classes-epoll/4.1.91.Final
Apache-2.0
+
https://mvnrepository.com/artifact/io.netty/netty-tcnative-boringssl-static/2.0.61.Final
Apache-2.0
+
https://mvnrepository.com/artifact/io.netty/netty-tcnative-classes/2.0.61.Final
Apache-2.0
+ https://mvnrepository.com/artifact/io.netty/netty-transport/4.1.94.Final
Apache-2.0
+
https://mvnrepository.com/artifact/io.netty/netty-transport-classes-epoll/4.1.94.Final
Apache-2.0
+
https://mvnrepository.com/artifact/io.netty/netty-transport-classes-kqueue/4.1.94.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-transport-native-epoll/4.1.45.Final
Apache-2.0
-
https://mvnrepository.com/artifact/io.netty/netty-transport-native-epoll/4.1.91.Final
Apache-2.0
+
https://mvnrepository.com/artifact/io.netty/netty-transport-native-epoll/4.1.94.Final
Apache-2.0
+
https://mvnrepository.com/artifact/io.netty/netty-transport-native-kqueue/4.1.94.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-transport-native-unix-common/4.1.79.Final
Apache-2.0
-
https://mvnrepository.com/artifact/io.netty/netty-transport-native-unix-common/4.1.91.Final
Apache-2.0
+
https://mvnrepository.com/artifact/io.netty/netty-transport-native-unix-common/4.1.94.Final
Apache-2.0
https://mvnrepository.com/artifact/io.perfmark/perfmark-api/0.25.0
Apache-2.0
https://mvnrepository.com/artifact/io.prometheus/simpleclient/0.6.0
Apache-2.0
https://mvnrepository.com/artifact/io.prometheus/simpleclient_common/0.6.0
Apache-2.0
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 35e6f66cc0..27cefe9a4c 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -55,6 +55,7 @@
* Move created the latest index before retrieval indexes by aliases to avoid
the 404 exception. This just prevents some interference from manual operations.
* Add more Go VM metrics, as new skywalking-go agent provided since its 0.2
release.
* Add component ID for Lock (ID=5016).
+* Bump up Armeria to 1.24.3.
#### UI
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index a8b7d5afb0..b2212ca801 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -68,7 +68,7 @@
<postgresql.version>42.4.1</postgresql.version>
<jetcd.version>0.5.3</jetcd.version>
<testcontainers.version>1.17.6</testcontainers.version>
- <armeria.version>1.23.1</armeria.version>
+ <armeria.version>1.24.3</armeria.version>
<awaitility.version>3.0.0</awaitility.version>
<httpcore.version>4.4.13</httpcore.version>
<commons-compress.version>1.21</commons-compress.version>
