kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump up Armeria version to fix CVE (#8236)

This commit is contained in:
kezhenxu94 2021-12-03 13:09:47 +08:00 committed by GitHub
parent cbdf8aabae
commit b3536445bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -11,6 +11,7 @@ Release Notes.
#### OAP Server #### OAP Server
* Fix potential NPE in OAL string match and a bug when right-hand-side variable includes double quotes. * Fix potential NPE in OAL string match and a bug when right-hand-side variable includes double quotes.
* Bump up Armeria version to fix CVE.
#### UI #### UI

4
dist-material/release-docs/LICENSE
View File

@ -324,9 +324,9 @@ The text of each license is the standard Apache 2.0 license.
simpleclient_httpserver 0.12.0 from prometheus https://github.com/prometheus/client_java Apache 2.0 simpleclient_httpserver 0.12.0 from prometheus https://github.com/prometheus/client_java Apache 2.0
jetcd 0.5.3, https://github.com/etcd-io/jetcd, Apache 2.0 jetcd 0.5.3, https://github.com/etcd-io/jetcd, Apache 2.0
failasfe 2.3.4, https://github.com/jhalterman/failsafe, Apache 2.0 failasfe 2.3.4, https://github.com/jhalterman/failsafe, Apache 2.0
Armeria 1.12.0, http://github.com/line/armeria, Apache 2.0 Armeria 1.13.4, http://github.com/line/armeria, Apache 2.0
Brotli4j 1.6.0, https://github.com/hyperxpro/Brotli4j, Apache 2.0 Brotli4j 1.6.0, https://github.com/hyperxpro/Brotli4j, Apache 2.0
micrometer 1.7.4, https://github.com/micrometer-metrics/micrometer, Apache 2.0 micrometer 1.7.6, https://github.com/micrometer-metrics/micrometer, Apache 2.0
iotdb-session 0.12.3: https://github.com/apache/iotdb, Apache 2.0 iotdb-session 0.12.3: https://github.com/apache/iotdb, Apache 2.0
iotdb-thrift 0.12.3: https://github.com/apache/iotdb, Apache 2.0 iotdb-thrift 0.12.3: https://github.com/apache/iotdb, Apache 2.0
service-rpc 0.12.3: https://github.com/apache/iotdb, Apache 2.0 service-rpc 0.12.3: https://github.com/apache/iotdb, Apache 2.0

2
oap-server-bom/pom.xml
View File

@ -73,7 +73,7 @@
<postgresql.version>42.2.18</postgresql.version> <postgresql.version>42.2.18</postgresql.version>
<jetcd.version>0.5.3</jetcd.version> <jetcd.version>0.5.3</jetcd.version>
<testcontainers.version>1.15.3</testcontainers.version> <testcontainers.version>1.15.3</testcontainers.version>
<armeria.version>1.12.0</armeria.version> <armeria.version>1.13.4</armeria.version>
<awaitility.version>3.0.0</awaitility.version> <awaitility.version>3.0.0</awaitility.version>
<httpcore.version>4.4.13</httpcore.version> <httpcore.version>4.4.13</httpcore.version>
<commons-compress.version>1.21</commons-compress.version> <commons-compress.version>1.21</commons-compress.version>

4
tools/dependencies/known-oap-backend-dependencies.txt
View File

@ -7,7 +7,7 @@ antlr4-runtime-4.7.1.jar
aopalliance-1.0.jar aopalliance-1.0.jar
apollo-client-1.8.0.jar apollo-client-1.8.0.jar
apollo-core-1.8.0.jar apollo-core-1.8.0.jar
armeria-1.12.0.jar armeria-1.13.4.jar
audience-annotations-0.5.0.jar audience-annotations-0.5.0.jar
bcpkix-jdk15on-1.69.jar bcpkix-jdk15on-1.69.jar
bcprov-ext-jdk15on-1.69.jar bcprov-ext-jdk15on-1.69.jar
@ -99,7 +99,7 @@ log4j-over-slf4j-1.7.30.jar
log4j-slf4j-impl-2.14.1.jar log4j-slf4j-impl-2.14.1.jar
logging-interceptor-3.13.1.jar logging-interceptor-3.13.1.jar
lz4-java-1.6.0.jar lz4-java-1.6.0.jar
micrometer-core-1.7.4.jar micrometer-core-1.7.6.jar
moshi-1.5.0.jar moshi-1.5.0.jar
msgpack-core-0.8.16.jar msgpack-core-0.8.16.jar
mvel2-2.4.8.Final.jar mvel2-2.4.8.Final.jar