This is an automated email from the ASF dual-hosted git repository.
wusheng 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 1577563459 Bump Armeria to 1.32.0 and some transitive dependencies
(#13096)
1577563459 is described below
commit 15775634596e4e230f77ca2089f2d1584942b3c6
Author: kezhenxu94 <[email protected]>
AuthorDate: Wed Mar 12 20:29:16 2025 +0800
Bump Armeria to 1.32.0 and some transitive dependencies (#13096)
---
.licenserc.yaml | 6 +++---
dist-material/release-docs/LICENSE | 36 ++++++++++++++++++------------------
docs/en/changes/changes.md | 1 +
oap-server-bom/pom.xml | 11 +++++++++--
4 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/.licenserc.yaml b/.licenserc.yaml
index e66de4502e..76071a5286 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -108,10 +108,10 @@ dependency:
version: 2.13.4
license: Apache-2.0
- name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
- version: 2.17.1
+ version: 2.18.2
license: Apache-2.0
- name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8
- version: 2.17.1
+ version: 2.18.2
license: Apache-2.0
- name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
version: 2.15.2
@@ -138,7 +138,7 @@ dependency:
version: 0.6.13
license: Apache-2.0
- name: com.aayushatharva.brotli4j:service
- version: 1.16.0
+ version: 1.18.0
license: Apache-2.0
- name: io.vertx:vertx-grpc
version: 4.5.9
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index 90a3798576..5a4020033c 100644
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -210,8 +210,8 @@ 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.16.0
Apache-2.0
-
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/service/1.16.0
Apache-2.0
+
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/brotli4j/1.18.0
Apache-2.0
+
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/service/1.18.0
Apache-2.0
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-auth-plugin/2.3.2
Apache-2.0
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-client/2.3.2
Apache-2.0
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-encryption-plugin/2.3.2
Apache-2.0
@@ -222,8 +222,8 @@ The text of each license is the standard Apache 2.0 license.
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.16.0
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.17.1
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.1
Apache-2.0
+
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.18.2
Apache-2.0
+
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.18.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.41.0
Apache-2.0
@@ -238,12 +238,12 @@ 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/2.8
Apache-2.0
https://mvnrepository.com/artifact/com.graphql-java/java-dataloader/3.2.1
Apache-2.0
- https://mvnrepository.com/artifact/com.linecorp.armeria/armeria/1.29.3
Apache-2.0
-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql/1.29.3
Apache-2.0
-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql-protocol/1.29.3
Apache-2.0
-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-grpc/1.29.3
Apache-2.0
-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-grpc-protocol/1.29.3
Apache-2.0
-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-protobuf/1.29.3
Apache-2.0
+ https://mvnrepository.com/artifact/com.linecorp.armeria/armeria/1.32.0
Apache-2.0
+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql/1.32.0
Apache-2.0
+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql-protocol/1.32.0
Apache-2.0
+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-grpc/1.32.0
Apache-2.0
+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-grpc-protocol/1.32.0
Apache-2.0
+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-protobuf/1.32.0
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/3.14.9
Apache-2.0
https://mvnrepository.com/artifact/com.squareup.okio/okio/1.17.2 Apache-2.0
@@ -297,12 +297,12 @@ The text of each license is the standard Apache 2.0
license.
https://mvnrepository.com/artifact/io.grpc/grpc-netty/1.68.1 Apache-2.0
https://mvnrepository.com/artifact/io.grpc/grpc-protobuf/1.68.1 Apache-2.0
https://mvnrepository.com/artifact/io.grpc/grpc-protobuf-lite/1.68.1
Apache-2.0
- https://mvnrepository.com/artifact/io.grpc/grpc-services/1.64.0 Apache-2.0
+ https://mvnrepository.com/artifact/io.grpc/grpc-services/1.70.0 Apache-2.0
https://mvnrepository.com/artifact/io.grpc/grpc-stub/1.68.1 Apache-2.0
https://mvnrepository.com/artifact/io.grpc/grpc-util/1.68.1 Apache-2.0
- https://mvnrepository.com/artifact/io.micrometer/micrometer-commons/1.13.0
Apache-2.0
- https://mvnrepository.com/artifact/io.micrometer/micrometer-core/1.13.0
Apache-2.0
-
https://mvnrepository.com/artifact/io.micrometer/micrometer-observation/1.13.0
Apache-2.0
+ https://mvnrepository.com/artifact/io.micrometer/micrometer-commons/1.14.4
Apache-2.0
+ https://mvnrepository.com/artifact/io.micrometer/micrometer-core/1.14.4
Apache-2.0
+
https://mvnrepository.com/artifact/io.micrometer/micrometer-observation/1.14.4
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-buffer/4.1.118.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec/4.1.118.Final
Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-dns/4.1.118.Final
Apache-2.0
@@ -346,8 +346,8 @@ The text of each license is the standard Apache 2.0 license.
https://mvnrepository.com/artifact/org.apache.groovy/groovy/4.0.15
Apache-2.0
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpasyncclient/4.1.5
Apache-2.0
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/4.5.13
Apache-2.0
-
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.13
Apache-2.0
-
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore-nio/4.4.13
Apache-2.0
+
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.16
Apache-2.0
+
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore-nio/4.4.16
Apache-2.0
https://mvnrepository.com/artifact/org.apache.kafka/kafka-clients/3.4.0
Apache-2.0
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/2.17.1
Apache-2.0
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/2.17.1
Apache-2.0
@@ -415,7 +415,7 @@ CC0-1.0 and BSD-2-Clause licenses
The following components are provided under the CC0-1.0 and BSD-2-Clause
License. See project link for details.
The text of each license is also included in licenses/LICENSE-[project].txt.
- https://mvnrepository.com/artifact/org.hdrhistogram/HdrHistogram/2.2.1
CC0-1.0 and BSD-2-Clause
+ https://mvnrepository.com/artifact/org.hdrhistogram/HdrHistogram/2.2.2
CC0-1.0 and BSD-2-Clause
========================================================================
ISC licenses
@@ -552,7 +552,7 @@ The text of each license is also included in
licenses/LICENSE-[project].txt.
https://npmjs.com/package/nanoid/v/3.3.8 3.3.8 MIT
https://mvnrepository.com/artifact/org.checkerframework/checker-qual/3.33.0 MIT
https://mvnrepository.com/artifact/org.codehaus.mojo/animal-sniffer-annotations/1.24
MIT
-
https://mvnrepository.com/artifact/org.curioswitch.curiostack/protobuf-jackson/2.5.0
MIT
+
https://mvnrepository.com/artifact/org.curioswitch.curiostack/protobuf-jackson/2.7.0
MIT
https://mvnrepository.com/artifact/org.slf4j/slf4j-api/1.7.30 MIT
https://npmjs.com/package/pinia/v/2.0.28 2.0.28 MIT
https://npmjs.com/package/pinia/node_modules/vue-demi/v/0.13.11 0.13.11 MIT
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index a1df1f670b..3ca9bb2c5c 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -80,6 +80,7 @@
* Add a component ID for Virtual thread executor.
* Add more model installation log info for OAP storage initialization.
* BanyanDB: Separate the storage configuration to an independent file:
`bydb.yaml`.
+* Bump Armeria to 1.32.0 and some transitive dependencies.
#### UI
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index 6daee56197..71b927ba1c 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -67,9 +67,9 @@
<postgresql.version>42.4.4</postgresql.version>
<jetcd.version>0.6.1</jetcd.version>
<testcontainers.version>1.17.6</testcontainers.version>
- <armeria.version>1.29.3</armeria.version>
+ <armeria.version>1.32.0</armeria.version>
<awaitility.version>3.0.0</awaitility.version>
- <httpcore.version>4.4.13</httpcore.version>
+ <httpcore.version>4.4.16</httpcore.version>
<httpasyncclient.version>4.1.5</httpasyncclient.version>
<commons-compress.version>1.21</commons-compress.version>
<banyandb-java-client.version>0.8.0-rc2</banyandb-java-client.version>
@@ -79,6 +79,7 @@
<commons-net.version>3.9.0</commons-net.version>
<maven-core.version>3.9.0</maven-core.version>
<async-profiler-converter.version>3.0</async-profiler-converter.version>
+ <micrometer.version>1.14.4</micrometer.version>
</properties>
<dependencyManagement>
@@ -673,6 +674,12 @@
<artifactId>async-profiler-converter</artifactId>
<version>${async-profiler-converter.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-core</artifactId>
+ <version>${micrometer.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
