Skip to content

Commit 1577563

Browse files
authored
Bump Armeria to 1.32.0 and some transitive dependencies (#13096)
1 parent 32807c8 commit 1577563

File tree

4 files changed

+31
-23
lines changed

4 files changed

+31
-23
lines changed

Diff for: .licenserc.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ dependency:
108108
version: 2.13.4
109109
license: Apache-2.0
110110
- name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
111-
version: 2.17.1
111+
version: 2.18.2
112112
license: Apache-2.0
113113
- name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8
114-
version: 2.17.1
114+
version: 2.18.2
115115
license: Apache-2.0
116116
- name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
117117
version: 2.15.2
@@ -138,7 +138,7 @@ dependency:
138138
version: 0.6.13
139139
license: Apache-2.0
140140
- name: com.aayushatharva.brotli4j:service
141-
version: 1.16.0
141+
version: 1.18.0
142142
license: Apache-2.0
143143
- name: io.vertx:vertx-grpc
144144
version: 4.5.9

Diff for: dist-material/release-docs/LICENSE

+18-18
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ The following components are provided under the Apache-2.0 License. See project
210210
The text of each license is the standard Apache 2.0 license.
211211
https://mvnrepository.com/artifact/build.buf.protoc-gen-validate/pgv-java-stub/0.6.13 Apache-2.0
212212
https://mvnrepository.com/artifact/build.buf.protoc-gen-validate/protoc-gen-validate/0.6.13 Apache-2.0
213-
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/brotli4j/1.16.0 Apache-2.0
214-
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/service/1.16.0 Apache-2.0
213+
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/brotli4j/1.18.0 Apache-2.0
214+
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/service/1.18.0 Apache-2.0
215215
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-auth-plugin/2.3.2 Apache-2.0
216216
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-client/2.3.2 Apache-2.0
217217
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.
222222
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.16.0 Apache-2.0
223223
https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15.2 Apache-2.0
224224
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-guava/2.12.0 Apache-2.0
225-
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.17.1 Apache-2.0
226-
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.1 Apache-2.0
225+
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.18.2 Apache-2.0
226+
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.18.2 Apache-2.0
227227
https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-kotlin/2.13.4 Apache-2.0
228228
https://mvnrepository.com/artifact/com.fasterxml/classmate/1.5.1 Apache-2.0
229229
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.
238238
https://mvnrepository.com/artifact/com.google.inject/guice/4.1.0 Apache-2.0
239239
https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/2.8 Apache-2.0
240240
https://mvnrepository.com/artifact/com.graphql-java/java-dataloader/3.2.1 Apache-2.0
241-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria/1.29.3 Apache-2.0
242-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql/1.29.3 Apache-2.0
243-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql-protocol/1.29.3 Apache-2.0
244-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-grpc/1.29.3 Apache-2.0
245-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-grpc-protocol/1.29.3 Apache-2.0
246-
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-protobuf/1.29.3 Apache-2.0
241+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria/1.32.0 Apache-2.0
242+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql/1.32.0 Apache-2.0
243+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql-protocol/1.32.0 Apache-2.0
244+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-grpc/1.32.0 Apache-2.0
245+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-grpc-protocol/1.32.0 Apache-2.0
246+
https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-protobuf/1.32.0 Apache-2.0
247247
https://mvnrepository.com/artifact/com.orbitz.consul/consul-client/1.5.3 Apache-2.0
248248
https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp/3.14.9 Apache-2.0
249249
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.
297297
https://mvnrepository.com/artifact/io.grpc/grpc-netty/1.68.1 Apache-2.0
298298
https://mvnrepository.com/artifact/io.grpc/grpc-protobuf/1.68.1 Apache-2.0
299299
https://mvnrepository.com/artifact/io.grpc/grpc-protobuf-lite/1.68.1 Apache-2.0
300-
https://mvnrepository.com/artifact/io.grpc/grpc-services/1.64.0 Apache-2.0
300+
https://mvnrepository.com/artifact/io.grpc/grpc-services/1.70.0 Apache-2.0
301301
https://mvnrepository.com/artifact/io.grpc/grpc-stub/1.68.1 Apache-2.0
302302
https://mvnrepository.com/artifact/io.grpc/grpc-util/1.68.1 Apache-2.0
303-
https://mvnrepository.com/artifact/io.micrometer/micrometer-commons/1.13.0 Apache-2.0
304-
https://mvnrepository.com/artifact/io.micrometer/micrometer-core/1.13.0 Apache-2.0
305-
https://mvnrepository.com/artifact/io.micrometer/micrometer-observation/1.13.0 Apache-2.0
303+
https://mvnrepository.com/artifact/io.micrometer/micrometer-commons/1.14.4 Apache-2.0
304+
https://mvnrepository.com/artifact/io.micrometer/micrometer-core/1.14.4 Apache-2.0
305+
https://mvnrepository.com/artifact/io.micrometer/micrometer-observation/1.14.4 Apache-2.0
306306
https://mvnrepository.com/artifact/io.netty/netty-buffer/4.1.118.Final Apache-2.0
307307
https://mvnrepository.com/artifact/io.netty/netty-codec/4.1.118.Final Apache-2.0
308308
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.
346346
https://mvnrepository.com/artifact/org.apache.groovy/groovy/4.0.15 Apache-2.0
347347
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpasyncclient/4.1.5 Apache-2.0
348348
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/4.5.13 Apache-2.0
349-
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.13 Apache-2.0
350-
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore-nio/4.4.13 Apache-2.0
349+
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.16 Apache-2.0
350+
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore-nio/4.4.16 Apache-2.0
351351
https://mvnrepository.com/artifact/org.apache.kafka/kafka-clients/3.4.0 Apache-2.0
352352
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/2.17.1 Apache-2.0
353353
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
415415
The following components are provided under the CC0-1.0 and BSD-2-Clause License. See project link for details.
416416
The text of each license is also included in licenses/LICENSE-[project].txt.
417417

418-
https://mvnrepository.com/artifact/org.hdrhistogram/HdrHistogram/2.2.1 CC0-1.0 and BSD-2-Clause
418+
https://mvnrepository.com/artifact/org.hdrhistogram/HdrHistogram/2.2.2 CC0-1.0 and BSD-2-Clause
419419

420420
========================================================================
421421
ISC licenses
@@ -552,7 +552,7 @@ The text of each license is also included in licenses/LICENSE-[project].txt.
552552
https://npmjs.com/package/nanoid/v/3.3.8 3.3.8 MIT
553553
https://mvnrepository.com/artifact/org.checkerframework/checker-qual/3.33.0 MIT
554554
https://mvnrepository.com/artifact/org.codehaus.mojo/animal-sniffer-annotations/1.24 MIT
555-
https://mvnrepository.com/artifact/org.curioswitch.curiostack/protobuf-jackson/2.5.0 MIT
555+
https://mvnrepository.com/artifact/org.curioswitch.curiostack/protobuf-jackson/2.7.0 MIT
556556
https://mvnrepository.com/artifact/org.slf4j/slf4j-api/1.7.30 MIT
557557
https://npmjs.com/package/pinia/v/2.0.28 2.0.28 MIT
558558
https://npmjs.com/package/pinia/node_modules/vue-demi/v/0.13.11 0.13.11 MIT

Diff for: docs/en/changes/changes.md

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
* Add a component ID for Virtual thread executor.
8181
* Add more model installation log info for OAP storage initialization.
8282
* BanyanDB: Separate the storage configuration to an independent file: `bydb.yaml`.
83+
* Bump Armeria to 1.32.0 and some transitive dependencies.
8384

8485
#### UI
8586

Diff for: oap-server-bom/pom.xml

+9-2
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
<postgresql.version>42.4.4</postgresql.version>
6868
<jetcd.version>0.6.1</jetcd.version>
6969
<testcontainers.version>1.17.6</testcontainers.version>
70-
<armeria.version>1.29.3</armeria.version>
70+
<armeria.version>1.32.0</armeria.version>
7171
<awaitility.version>3.0.0</awaitility.version>
72-
<httpcore.version>4.4.13</httpcore.version>
72+
<httpcore.version>4.4.16</httpcore.version>
7373
<httpasyncclient.version>4.1.5</httpasyncclient.version>
7474
<commons-compress.version>1.21</commons-compress.version>
7575
<banyandb-java-client.version>0.8.0-rc2</banyandb-java-client.version>
@@ -79,6 +79,7 @@
7979
<commons-net.version>3.9.0</commons-net.version>
8080
<maven-core.version>3.9.0</maven-core.version>
8181
<async-profiler-converter.version>3.0</async-profiler-converter.version>
82+
<micrometer.version>1.14.4</micrometer.version>
8283
</properties>
8384

8485
<dependencyManagement>
@@ -673,6 +674,12 @@
673674
<artifactId>async-profiler-converter</artifactId>
674675
<version>${async-profiler-converter.version}</version>
675676
</dependency>
677+
678+
<dependency>
679+
<groupId>io.micrometer</groupId>
680+
<artifactId>micrometer-core</artifactId>
681+
<version>${micrometer.version}</version>
682+
</dependency>
676683
</dependencies>
677684
</dependencyManagement>
678685
</project>

0 commit comments

Comments
 (0)