You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/11/13 08:24:34 UTC

[skywalking] branch master updated: Upgrade Kubernetes Java client to 14.0.0, supports GCP token refreshing and fixes some bugs (#8122)

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 b63008c  Upgrade Kubernetes Java client to 14.0.0, supports GCP token refreshing and fixes some bugs (#8122)
b63008c is described below

commit b63008c61e1fcb1d69b25a8be7ce99f1d987a175
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sat Nov 13 16:24:19 2021 +0800

    Upgrade Kubernetes Java client to 14.0.0, supports GCP token refreshing and fixes some bugs (#8122)
---
 CHANGES.md                                            |  1 +
 dist-material/release-docs/LICENSE                    |  8 ++++----
 oap-server-bom/pom.xml                                |  2 +-
 tools/dependencies/known-oap-backend-dependencies.txt | 12 ++++++------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6bdc589..8fd8127 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -47,6 +47,7 @@ Release Notes.
   value and current value equals the default value logically, the whole row wouldn't be pushed into database.
 * Fix `max` function in OAL doesn't support negative long.
 * Add `MicroBench` module to make it easier for developers to write JMH test.
+* Upgrade Kubernetes Java client to 14.0.0, supports GCP token refreshing and fixes some bugs.
 
 #### UI
 
diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
index 15cdb91..d54bdc3 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -287,7 +287,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.9.1: 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 13.0.0: https://github.com/kubernetes-client/java, Apache 2.0
+    kubernetes-client 14.0.0: 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
@@ -310,8 +310,8 @@ The text of each license is the standard Apache 2.0 license.
     moshi 1.5.0: https://github.com/square/moshi, Apache 2.0
     logging-interceptor 3.13.1: https://github.com/square/okhttp/tree/master/okhttp-logging-interceptor, Apache 2.0
     msgpack-core 0.8.16: https://github.com/msgpack/msgpack-java, Apache 2.0
-    swagger-annotations 1.6.2: https://mvnrepository.com/artifact/io.swagger.core.v3/swagger-annotations, Apache 2.0
-    jose4j 0.7.8: https://mvnrepository.com/artifact/org.bitbucket.b_c/jose4j, 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
     converter-moshi 2.5.0: https://mvnrepository.com/artifact/com.squareup.retrofit2/converter-moshi, 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
@@ -321,7 +321,7 @@ The text of each license is the standard Apache 2.0 license.
     mvel 2.4.8: https://github.com/mvel/mvel, Apache 2.0
     okio 1.17.2: https://github.com/square/okio Apache 2.0
     caffeine 2.6.2: https://github.com/ben-manes/caffeine Apache 2.0
-    simpleclient_httpserver 0.11 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
     failasfe 2.3.4, https://github.com/jhalterman/failsafe, Apache 2.0
     Armeria 1.12.0, http://github.com/line/armeria, Apache 2.0
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index a0c51cf..a805446 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -47,7 +47,7 @@
         <netty-tcnative-boringssl-static.version>2.0.43.Final</netty-tcnative-boringssl-static.version>
         <jetty.version>9.4.40.v20210413</jetty.version>
         <commons-io.version>2.6</commons-io.version>
-        <kubernetes.version>13.0.0</kubernetes.version>
+        <kubernetes.version>14.0.0</kubernetes.version>
         <hikaricp.version>3.1.0</hikaricp.version>
         <zipkin.version>2.9.1</zipkin.version>
         <jackson-core.version>2.12.2</jackson-core.version>
diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt
index 03e2366..971709f 100755
--- a/tools/dependencies/known-oap-backend-dependencies.txt
+++ b/tools/dependencies/known-oap-backend-dependencies.txt
@@ -15,9 +15,9 @@ bcprov-jdk15on-1.69.jar
 bcutil-jdk15on-1.69.jar
 brotli4j-1.6.0.jar
 checker-qual-2.8.1.jar
-client-java-13.0.0.jar
-client-java-api-13.0.0.jar
-client-java-proto-13.0.0.jar
+client-java-14.0.0.jar
+client-java-api-14.0.0.jar
+client-java-proto-14.0.0.jar
 commons-beanutils-1.9.4.jar
 commons-codec-1.11.jar
 commons-collections4-4.4.jar
@@ -84,7 +84,7 @@ jetty-servlet-9.4.40.v20210413.jar
 jetty-util-9.4.40.v20210413.jar
 jetty-util-ajax-9.4.40.v20210413.jar
 joda-time-2.10.5.jar
-jose4j-0.7.8.jar
+jose4j-0.7.9.jar
 jsr305-3.0.2.jar
 kafka-clients-2.4.1.jar
 kotlin-reflect-1.1.1.jar
@@ -135,11 +135,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.11.0.jar
+simpleclient_httpserver-0.12.0.jar
 slf4j-api-1.7.30.jar
 snakeyaml-1.28.jar
 snappy-java-1.1.7.3.jar
-swagger-annotations-1.6.2.jar
+swagger-annotations-1.6.3.jar
 vavr-0.10.3.jar
 vavr-match-0.10.3.jar
 zipkin-2.9.1.jar