You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wa...@apache.org on 2022/06/21 06:41:20 UTC
[skywalking] branch master updated: Upgrade Armeria to 1.16.0, Kubernetes Java client to 15.0.1 (#9251)
This is an automated email from the ASF dual-hosted git repository.
wankai 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 bc462f0702 Upgrade Armeria to 1.16.0, Kubernetes Java client to 15.0.1 (#9251)
bc462f0702 is described below
commit bc462f070257baa9a00c5d1f73d959fe0dde0d99
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Jun 21 14:41:11 2022 +0800
Upgrade Armeria to 1.16.0, Kubernetes Java client to 15.0.1 (#9251)
---
dist-material/release-docs/LICENSE | 24 +++++++--------
docs/en/changes/changes.md | 2 ++
oap-server-bom/pom.xml | 4 +--
.../known-oap-backend-dependencies.txt | 34 +++++++++++-----------
4 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
index 23465250ae..76b1e4172f 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -288,7 +288,7 @@ The text of each license is the standard Apache 2.0 license.
HikariCP 3.1.0: https://github.com/brettwooldridge/HikariCP, Apache 2.0
zipkin 2.23.16: https://github.com/openzipkin/zipkin, Apache 2.0
sharding-jdbc-core 2.0.3: https://github.com/sharding-sphere/sharding-sphere, Apache 2.0
- kubernetes-client 14.0.0: https://github.com/kubernetes-client/java, Apache 2.0
+ kubernetes-client 15.0.1: https://github.com/kubernetes-client/java, Apache 2.0
proto files from istio/istio: https://github.com/istio/istio Apache 2.0
proto files from istio/api: https://github.com/istio/api Apache 2.0
nacos 1.4.2: https://github.com/alibaba/nacos, Apache 2.0
@@ -308,9 +308,9 @@ The text of each license is the standard Apache 2.0 license.
javaassist 3.25.0-GA: https://github.com/jboss-javassist/javassist Apache 2.0
jackson-module-afterburner 2.12.2: https://github.com/FasterXML/jackson-modules-base, Apache 2.0
perfmark-api 0.23.0: https://github.com/perfmark/perfmark, Apache 2.0
- logging-interceptor 4.9.1: https://github.com/square/okhttp/tree/master/okhttp-logging-interceptor, Apache 2.0
- swagger-annotations 1.6.3: https://mvnrepository.com/artifact/io.swagger.core.v3/swagger-annotations, Apache 2.0
- jose4j 0.7.9: https://mvnrepository.com/artifact/org.bitbucket.b_c/jose4j, Apache 2.0
+ logging-interceptor 4.9.2: https://github.com/square/okhttp/tree/master/okhttp-logging-interceptor, Apache 2.0
+ swagger-annotations 1.6.5: https://mvnrepository.com/artifact/io.swagger/swagger-annotations, Apache 2.0
+ jose4j 0.7.11: https://mvnrepository.com/artifact/org.bitbucket.b_c/jose4j, Apache 2.0
vavr 0.10.3: https://github.com/vavr-io/vavr, Apache 2.0
kafka-clients 2.4.1: https://github.com/apache/kafka, Apache 2.0
lz4-java 1.6.0: https://github.com/jpountz/lz4-java, Apache 2.0
@@ -318,12 +318,12 @@ The text of each license is the standard Apache 2.0 license.
slf4j-api 1.7.30: http://www.slf4j.org, Apache 2.0
mvel 2.4.8: https://github.com/mvel/mvel, Apache 2.0
okio 1.17.2: https://github.com/square/okio Apache 2.0
- simpleclient_httpserver 0.12.0 from prometheus https://github.com/prometheus/client_java Apache 2.0
+ simpleclient_httpserver 0.15.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
failasfe 2.3.4, https://github.com/jhalterman/failsafe, Apache 2.0
- Armeria 1.14.1, http://github.com/line/armeria, Apache 2.0
- Brotli4j 1.6.0, https://github.com/hyperxpro/Brotli4j, Apache 2.0
- micrometer 1.8.2, https://github.com/micrometer-metrics/micrometer, Apache 2.0
+ Armeria 1.16.0, http://github.com/line/armeria, Apache 2.0
+ Brotli4j 1.7.1, https://github.com/hyperxpro/Brotli4j, Apache 2.0
+ micrometer 1.8.5, https://github.com/micrometer-metrics/micrometer, Apache 2.0
j2objc 1.3: https://github.com/google/j2objc Apache 2.0
evictor 1.0.0: https://github.com/stoyanr/Evictor Apache 2.0
@@ -337,10 +337,10 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
slf4j 1.7.25: https://www.slf4j.org/ , MIT
GraphQL java 8.0: https://github.com/graphql-java/graphql-java , MIT
GraphQL Java Tools 5.2.3: https://github.com/graphql-java/graphql-java-tools , MIT
- bcpkix-jdk15on 1.69: http://www.bouncycastle.org/licence.html , MIT
- bcprov-jdk15on 1.69: http://www.bouncycastle.org/licence.html , MIT
- bcprov-ext-jdk15on 1.69: http://www.bouncycastle.org/licence.html , MIT
- bcutil-ext-jdk15on 1.69: http://www.bouncycastle.org/licence.html , MIT
+ bcpkix-jdk15on 1.70: http://www.bouncycastle.org/licence.html , MIT
+ bcprov-jdk15on 1.70: http://www.bouncycastle.org/licence.html , MIT
+ bcprov-ext-jdk15on 1.70: http://www.bouncycastle.org/licence.html , MIT
+ bcutil-ext-jdk15on 1.70: http://www.bouncycastle.org/licence.html , MIT
checker-qual 2.8.1: https://github.com/typetools/checker-framework, MIT
========================================================================
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index b180cdeadb..982f3dcd9c 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -2,6 +2,8 @@
#### Project
+* Upgrade Armeria to 1.16.0, Kubernetes Java client to 15.0.1.
+
#### OAP Server
* Add more entities for Zipkin to improve performance.
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index 190930b0ee..ae3b659e71 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -46,7 +46,7 @@
<commons-codec.version>1.11</commons-codec.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-io.version>2.7</commons-io.version>
- <kubernetes.version>14.0.0</kubernetes.version>
+ <kubernetes.version>15.0.1</kubernetes.version>
<hikaricp.version>3.1.0</hikaricp.version>
<zipkin.version>2.23.16</zipkin.version>
<jackson-core.version>2.13.2</jackson-core.version>
@@ -71,7 +71,7 @@
<postgresql.version>42.3.3</postgresql.version>
<jetcd.version>0.5.3</jetcd.version>
<testcontainers.version>1.15.3</testcontainers.version>
- <armeria.version>1.14.1</armeria.version>
+ <armeria.version>1.16.0</armeria.version>
<awaitility.version>3.0.0</awaitility.version>
<httpcore.version>4.4.13</httpcore.version>
<commons-compress.version>1.21</commons-compress.version>
diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt
index d673d660c1..be23011d11 100755
--- a/tools/dependencies/known-oap-backend-dependencies.txt
+++ b/tools/dependencies/known-oap-backend-dependencies.txt
@@ -7,22 +7,22 @@ antlr4-runtime-4.9.2.jar
aopalliance-1.0.jar
apollo-client-1.8.0.jar
apollo-core-1.8.0.jar
-armeria-1.14.1.jar
-armeria-graphql-1.14.1.jar
-armeria-graphql-protocol-1.14.1.jar
-armeria-protobuf-1.14.1.jar
+armeria-1.16.0.jar
+armeria-graphql-1.16.0.jar
+armeria-graphql-protocol-1.16.0.jar
+armeria-protobuf-1.16.0.jar
audience-annotations-0.5.0.jar
banyandb-java-client-0.1.0.jar
-bcpkix-jdk15on-1.69.jar
-bcprov-ext-jdk15on-1.69.jar
-bcprov-jdk15on-1.69.jar
-bcutil-jdk15on-1.69.jar
-brotli4j-1.6.0.jar
+bcpkix-jdk15on-1.70.jar
+bcprov-ext-jdk15on-1.70.jar
+bcprov-jdk15on-1.70.jar
+bcutil-jdk15on-1.70.jar
+brotli4j-1.7.1.jar
checker-qual-3.12.0.jar
classmate-1.5.1.jar
-client-java-14.0.0.jar
-client-java-api-14.0.0.jar
-client-java-proto-14.0.0.jar
+client-java-15.0.1.jar
+client-java-api-15.0.1.jar
+client-java-proto-15.0.1.jar
commons-beanutils-1.9.4.jar
commons-codec-1.11.jar
commons-collections4-4.4.jar
@@ -79,7 +79,7 @@ jetcd-common-0.5.3.jar
jetcd-core-0.5.3.jar
jetcd-resolver-0.5.3.jar
joda-time-2.10.5.jar
-jose4j-0.7.9.jar
+jose4j-0.7.11.jar
jsr305-3.0.2.jar
kafka-clients-2.4.1.jar
kotlin-reflect-1.5.0.jar
@@ -96,9 +96,9 @@ log4j-api-2.17.1.jar
log4j-core-2.17.1.jar
log4j-over-slf4j-1.7.30.jar
log4j-slf4j-impl-2.17.1.jar
-logging-interceptor-4.9.1.jar
+logging-interceptor-4.9.2.jar
lz4-java-1.6.0.jar
-micrometer-core-1.8.2.jar
+micrometer-core-1.8.5.jar
mvel2-2.4.8.Final.jar
nacos-api-1.4.2.jar
nacos-client-1.4.2.jar
@@ -143,11 +143,11 @@ retrofit-2.5.0.jar
simpleclient-0.6.0.jar
simpleclient_common-0.6.0.jar
simpleclient_hotspot-0.6.0.jar
-simpleclient_httpserver-0.12.0.jar
+simpleclient_httpserver-0.15.0.jar
slf4j-api-1.7.30.jar
snakeyaml-1.28.jar
snappy-java-1.1.7.3.jar
-swagger-annotations-1.6.3.jar
+swagger-annotations-1.6.5.jar
vavr-0.10.3.jar
vavr-match-0.10.3.jar
zipkin-2.23.16.jar