From 781ac9a70252b823076693bd70c344c0ac036278 Mon Sep 17 00:00:00 2001 From: lilai Date: Tue, 28 Nov 2023 14:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djackson-databind=E3=80=81gson?= =?UTF-8?q?=E3=80=81protobuf-java=E7=BB=84=E4=BB=B6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=BC=8F=E6=B4=9E=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lilai --- pom.xml | 2 +- .../sermant-agentcore-implement/pom.xml | 2 +- sermant-backend/pom.xml | 4 ++-- sermant-injector/pom.xml | 2 +- .../dubbo-2-7-integration-consumer/pom.xml | 4 ++++ .../dubbo-2-7-integration-controller/pom.xml | 4 ++++ .../dubbo-2-7-integration-provider/pom.xml | 4 ++++ sermant-integration-tests/dubbo-test/pom.xml | 12 ++++++++++++ sermant-integration-tests/scripts/AgentLoader.java | 2 -- .../sermant-flowcontrol/flowcontrol-service/pom.xml | 2 +- .../dubbo-registry-service/pom.xml | 2 +- .../spring-cloud-registry-plugin/pom.xml | 13 +++++++++++++ .../spring-cloud-registry-service/pom.xml | 2 +- .../springboot-registry-service/pom.xml | 2 +- .../tag-transmission-grpc-plugin/pom.xml | 2 +- 15 files changed, 47 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index d16117d775..a101259ca7 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 4.4.13 1.5.1 4.1.94.Final - 3.17.3 + 3.19.6 1.2.83 1.4.01 2.12.1 diff --git a/sermant-agentcore/sermant-agentcore-implement/pom.xml b/sermant-agentcore/sermant-agentcore-implement/pom.xml index 1fe410b604..44c0b79917 100644 --- a/sermant-agentcore/sermant-agentcore-implement/pom.xml +++ b/sermant-agentcore/sermant-agentcore-implement/pom.xml @@ -29,7 +29,7 @@ 3.3.2 1.6.7 2.1.0 - 2.13.4.1 + 2.13.4.2 diff --git a/sermant-backend/pom.xml b/sermant-backend/pom.xml index 44de8a2677..26c07ca539 100644 --- a/sermant-backend/pom.xml +++ b/sermant-backend/pom.xml @@ -17,7 +17,7 @@ UTF-8 4.1.86.Final 2.6.1 - 3.9.1 + 3.19.6 1.18.22 1.2.83 2.6 @@ -29,7 +29,7 @@ 4.3.1 2.0.9 0.5.8 - 2.13.4.1 + 2.13.4.2 ${project.basedir}/src/main/webapp/frontend diff --git a/sermant-injector/pom.xml b/sermant-injector/pom.xml index 3867547a17..e19352df27 100644 --- a/sermant-injector/pom.xml +++ b/sermant-injector/pom.xml @@ -15,7 +15,7 @@ 8 8 2.11.0 - 2.7.1 + 2.7.4 diff --git a/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-consumer/pom.xml b/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-consumer/pom.xml index ae26620211..a99179e79c 100644 --- a/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-consumer/pom.xml +++ b/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-consumer/pom.xml @@ -53,6 +53,10 @@ org.apache.dubbo dubbo + + com.google.code.gson + gson + org.apache.curator curator-framework diff --git a/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-controller/pom.xml b/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-controller/pom.xml index 1194ca568c..73cab772e0 100644 --- a/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-controller/pom.xml +++ b/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-controller/pom.xml @@ -38,6 +38,10 @@ org.apache.dubbo dubbo + + com.google.code.gson + gson + org.apache.curator curator-framework diff --git a/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-provider/pom.xml b/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-provider/pom.xml index 0558ab92cf..8f4ab23160 100644 --- a/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-provider/pom.xml +++ b/sermant-integration-tests/dubbo-test/dubbo-2-7-integration-provider/pom.xml @@ -53,6 +53,10 @@ org.apache.dubbo dubbo + + com.google.code.gson + gson + org.apache.curator curator-framework diff --git a/sermant-integration-tests/dubbo-test/pom.xml b/sermant-integration-tests/dubbo-test/pom.xml index 767d0512cf..b37692d8a0 100644 --- a/sermant-integration-tests/dubbo-test/pom.xml +++ b/sermant-integration-tests/dubbo-test/pom.xml @@ -48,6 +48,7 @@ 2.6.12 4.0.1 0.2 + 2.8.9 @@ -67,6 +68,17 @@ org.apache.dubbo dubbo ${dubbo.version} + + + com.google.code.gson + gson + + + + + com.google.code.gson + gson + ${gson.version} com.alibaba diff --git a/sermant-integration-tests/scripts/AgentLoader.java b/sermant-integration-tests/scripts/AgentLoader.java index 217c86f268..837fd84604 100644 --- a/sermant-integration-tests/scripts/AgentLoader.java +++ b/sermant-integration-tests/scripts/AgentLoader.java @@ -14,8 +14,6 @@ * limitations under the License. */ -package com.huaweicloud.sermant.script; - import com.sun.tools.attach.AgentInitializationException; import com.sun.tools.attach.AgentLoadException; import com.sun.tools.attach.AttachNotSupportedException; diff --git a/sermant-plugins/sermant-flowcontrol/flowcontrol-service/pom.xml b/sermant-plugins/sermant-flowcontrol/flowcontrol-service/pom.xml index 1cbb83e3f6..9d368dc7ac 100644 --- a/sermant-plugins/sermant-flowcontrol/flowcontrol-service/pom.xml +++ b/sermant-plugins/sermant-flowcontrol/flowcontrol-service/pom.xml @@ -37,7 +37,7 @@ service false 1.7.1 - 2.13.4.1 + 2.13.4.2 2.13.4 diff --git a/sermant-plugins/sermant-service-registry/dubbo-registry-service/pom.xml b/sermant-plugins/sermant-service-registry/dubbo-registry-service/pom.xml index 2e1495e979..6d18fe3719 100644 --- a/sermant-plugins/sermant-service-registry/dubbo-registry-service/pom.xml +++ b/sermant-plugins/sermant-service-registry/dubbo-registry-service/pom.xml @@ -20,7 +20,7 @@ UTF-8 2.7.15 2.6.12 - 2.13.4.1 + 2.13.4.2 2.22.2 service false diff --git a/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/pom.xml b/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/pom.xml index 55ad24cd5b..25a6b688bd 100644 --- a/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/pom.xml +++ b/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/pom.xml @@ -21,6 +21,7 @@ 2.2.1.RELEASE 10.0.0 1.3.0 + 2.8.9 @@ -71,6 +72,18 @@ spring-cloud-starter-consul-discovery ${spring-cloud.version} provided + + + com.google.code.gson + gson + + + + + com.google.code.gson + gson + ${gson.version} + provided org.springframework.boot diff --git a/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/pom.xml b/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/pom.xml index 4bead8f688..7a38f2ce51 100644 --- a/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/pom.xml +++ b/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/pom.xml @@ -17,7 +17,7 @@ 2.3.0 2.1.0.RELEASE 1.7.35 - 2.13.4.1 + 2.13.4.2 diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/pom.xml b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/pom.xml index f14f4eddd7..f9122f3d32 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/pom.xml +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/pom.xml @@ -19,7 +19,7 @@ UTF-8 service 3.1.0 - 2.13.4.1 + 2.13.4.2 31.1-jre diff --git a/sermant-plugins/sermant-tag-transmission/tag-transmission-grpc-plugin/pom.xml b/sermant-plugins/sermant-tag-transmission/tag-transmission-grpc-plugin/pom.xml index 80990e244d..a7079bbcc9 100644 --- a/sermant-plugins/sermant-tag-transmission/tag-transmission-grpc-plugin/pom.xml +++ b/sermant-plugins/sermant-tag-transmission/tag-transmission-grpc-plugin/pom.xml @@ -17,7 +17,7 @@ false plugin 1.52.1 - 3.18.0 + 3.19.6