From d86880ce7e2e855ca93914020bf3a0d4caf23d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 1 Apr 2022 10:16:10 +0800 Subject: [PATCH] Upgrade depdencies (#8781) * Upgrade OAP dependencies gson(2.9.0), guava(31.1), jackson(2.13.2), protobuf-java(3.18.4). * Remove commons-pool and commons-dbcp from OAP dependencies(Not used before). * Upgrade webapp dependencies gson(2.9.0), spring boot(2.6.5), jackson(2.13.2.2), spring cloud(2021.0.1). --- CHANGES.md | 3 ++ apm-webapp/pom.xml | 8 +++--- dist-material/release-docs/LICENSE | 28 +++++++++---------- oap-server-bom/pom.xml | 18 ++++-------- .../server-library/library-client/pom.xml | 4 --- pom.xml | 2 +- .../known-oap-backend-dependencies.txt | 20 ++++++------- 7 files changed, 36 insertions(+), 47 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 10850c2c09..86b1287422 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -32,6 +32,9 @@ Release Notes. * Improve CI with the GHA new feature "run failed jobs". * Fix `./mvnw compile` not work if `./mvnw install` is not executed at least once. * Add `JD_PRESERVE_LINE_FEEDS=true` in official code style file. +* Upgrade OAP dependencies gson(2.9.0), guava(31.1), jackson(2.13.2), protobuf-java(3.18.4). +* Remove commons-pool and commons-dbcp from OAP dependencies(Not used before). +* Upgrade webapp dependencies gson(2.9.0), spring boot(2.6.5), jackson(2.13.2.2), spring cloud(2021.0.1). #### OAP Server diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml index 83d19551e1..573d1297ac 100644 --- a/apm-webapp/pom.xml +++ b/apm-webapp/pom.xml @@ -31,13 +31,13 @@ 1.8 UTF-8 - 2.4.8 - 2.8.2 + 2.6.5 + 2.9.0 4.5.3 - 2020.0.3 + 2021.0.1 1.12.1 1.2.3 - 2.12.2 + 2.13.2.2 1.28 4.1.68.Final diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index f9e4813c42..8e65709d7e 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -226,25 +226,22 @@ The text of each license is the standard Apache 2.0 license. raphw (byte-buddy) 1.10.19: http://bytebuddy.net/ , Apache 2.0 Google: grpc-java 1.42.1: https://github.com/grpc/grpc-java, Apache 2.0 - Google: guava 28.1: https://github.com/google/guava , Apache 2.0 + Google: guava 31.1: https://github.com/google/guava , Apache 2.0 Google: guice 4.1.0: https://github.com/google/guice , Apache 2.0 - Google: gson 2.8.6: https://github.com/google/gson , Apache 2.0 + Google: gson 2.9.0: https://github.com/google/gson , Apache 2.0 Google: proto-google-common-protos 2.0.1: https://github.com/googleapis/java-common-protos , Apache 2.0 Google: jsr305 3.0.2: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0 Google: flatbuffers-java 1.12.0: https://github.com/google/flatbuffers/ , Apache 2.0 SnakeYAML 1.28: http://www.snakeyaml.org , Apache 2.0 Joda-Time 2.10.5: http://www.joda.org/joda-time/ , Apache 2.0 Joda-Convert 2.2.1: http://www.joda.org/joda-convert/ , Apache 2.0 - Spring Framework 4.3.14.RELEASE: https://github.com/spring-projects/spring-framework, Apache 2.0 - Spring Boot 2.4.8: https://spring.io/, Apache 2.0 - Spring Cloud Gateway 3.0.3: https://spring.io/projects/spring-cloud, Apache-2.0 - Spring Cloud Load Balancer 3.0.3: https://spring.io/projects/spring-cloud, Apache-2.0 - Spring Cloud Config 1.4.1: https://github.com/spring-cloud/spring-cloud-config, Apache-2.0 - Spring Cloud Netflix Zuul 1.3.0: https://github.com/spring-cloud/spring-cloud-netflix, Apache 2.0 + Spring Framework 5.3.17: https://github.com/spring-projects/spring-framework, Apache 2.0 + Spring Boot 2.6.5: https://spring.io/, Apache 2.0 + Spring Cloud Gateway 3.1.1: https://spring.io/projects/spring-cloud, Apache-2.0 + Spring Cloud Load Balancer 3.1.1: https://spring.io/projects/spring-cloud, Apache-2.0 + Spring Web 5.3.15 https://spring.io/, Apache-2.0 Apache: commons-logging 1.2: https://github.com/apache/commons-logging, Apache 2.0 Apache: commons-codec 1.10: https://github.com/apache/commons-codec, Apache 2.0 - Apache: commons-dbcp 1.4: https://github.com/apache/commons-dbcp, Apache 2.0 - Apache: commons-pool 2.4.2: https://github.com/apache/commons-pool, Apache 2.0 Apache: commons-lang 3.6: https://github.com/apache/commons-lang, Apache 2.0 Apache: commons-text 1.8: https://github.com/apache/commons-text, Apache 2.0 Apache: commons-beanutils 1.9.4: https://github.com/apache/commons-beanutils, Apache 2.0 @@ -256,15 +253,16 @@ The text of each license is the standard Apache 2.0 license. Apache: commons-compress 1.21: https://github.com/apache/commons-compress, Apache 2.0 Apache: commons-collections4 4.4: https://mvnrepository.com/artifact/org.apache.commons/commons-collections4, Apache 2.0 Apache: freemarker 2.3.28: https://github.com/apache/freemarker, Apache 2.0 + Apache: Tomcat-embed 9.0.56 https://tomcat.apache.org, Apache 2.0 netty 4.1.68: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0 netty: netty-tcnative-boringssl-static 2.0.43: https://github.com/netty/netty-tcnative, Apache 2.0 annotations 13.0: http://www.jetbrains.org, Apache 2.0 compiler 0.9.6: https://github.com/spullara/mustache.java, Apache 2.0 error_prone_annotations 2.11.0: https://github.com/google/error-prone, Apache 2.0 instrumentation-api 0.4.3: https://github.com/google/instrumentation-java, Apache 2.0 - jackson-annotations 2.8.0: https://github.com/FasterXML/jackson-annotations, Apache 2.0 - jackson-core 2.12.2: https://github.com/FasterXML/jackson-core, Apache 2.0 - jackson-databind 2.12.2: https://github.com/FasterXML/jackson-databind, Apache 2.0 + jackson-annotations 2.13.2: https://github.com/FasterXML/jackson-annotations, Apache 2.0 + jackson-core 2.13.2: https://github.com/FasterXML/jackson-core, Apache 2.0 + jackson-databind 2.13.2.2: https://github.com/FasterXML/jackson-databind, Apache 2.0 jackson-datatype-jdk8 2.9.5: https://github.com/FasterXML/jackson-modules-java8/tree/jackson-modules-java8-2.8.8, Apache 2.0 jackson-module-kotlin 2.13.1: http://kotlinlang.org, Apache 2.0 jackson-module-afterburner 2.12.2: https://github.com/FasterXML/jackson-modules-base, Apache 2.0 @@ -370,8 +368,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt. asm 9.0:https://gitlab.ow2.org , BSD-3-Clause antlr4-runtime 4.9.2: http://www.antlr.org/license.html, BSD-3-Clause - Google: protobuf-java 3.19.2: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause - Google: protobuf-java-util 3.19.2: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause + Google: protobuf-java 3.19.4: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause + Google: protobuf-java-util 3.19.4: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause zstd-jni 1.4.3-1: https://github.com/luben/zstd-jni, BSD-3-Clause postgresql 42.3.2: https://jdbc.postgresql.org/about/license.html, BSD-2-Clause diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index 9bde48c8ba..0dbe6eb2f8 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -39,21 +39,20 @@ 2.1.210 2.10.5 3.5.7 - 28.1-jre + 31.1-jre 1.28 - 3.19.2 - 3.19.2 + 3.19.4 + 3.19.4 1.11 3.12.0 - 1.4 2.0.43.Final 2.6 14.0.0 3.1.0 2.9.1 - 2.12.2 - 2.12.2 - 2.12.2 + 2.13.2 + 2.13.2 + 2.13.2.2 1.4 0.6.0 1.8.0 @@ -287,11 +286,6 @@ grpc-grpclb ${grpc.version} - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - commons-io commons-io diff --git a/oap-server/server-library/library-client/pom.xml b/oap-server/server-library/library-client/pom.xml index 3db144fc35..ed20f436b2 100755 --- a/oap-server/server-library/library-client/pom.xml +++ b/oap-server/server-library/library-client/pom.xml @@ -73,10 +73,6 @@ com.zaxxer HikariCP - - commons-dbcp - commons-dbcp - org.slf4j jcl-over-slf4j diff --git a/pom.xml b/pom.xml index aeb3cc6e0a..55d8770b1a 100755 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 1.43.2 - 2.8.6 + 2.9.0 1.6.2 0.6.1 3.19.2 diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index 341a39a5da..6dec58acc5 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -1,7 +1,7 @@ HdrHistogram-2.1.12.jar HikariCP-3.1.0.jar LatencyUtils-2.0.3.jar -animal-sniffer-annotations-1.18.jar +animal-sniffer-annotations-1.19.jar annotations-13.0.jar antlr4-runtime-4.9.2.jar aopalliance-1.0.jar @@ -17,7 +17,7 @@ bcprov-ext-jdk15on-1.69.jar bcprov-jdk15on-1.69.jar bcutil-jdk15on-1.69.jar brotli4j-1.6.0.jar -checker-qual-2.8.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 @@ -26,11 +26,9 @@ commons-beanutils-1.9.4.jar commons-codec-1.11.jar commons-collections4-4.4.jar commons-compress-1.21.jar -commons-dbcp-1.4.jar commons-io-2.6.jar commons-lang3-3.12.0.jar commons-logging-1.2.jar -commons-pool-1.5.4.jar commons-text-1.4.jar consul-client-1.4.2.jar converter-jackson-2.5.0.jar @@ -56,9 +54,9 @@ grpc-netty-1.43.2.jar grpc-protobuf-1.43.2.jar grpc-protobuf-lite-1.43.2.jar grpc-stub-1.43.2.jar -gson-2.8.6.jar +gson-2.9.0.jar gson-fire-1.8.5.jar -guava-28.1-jre.jar +guava-31.1-jre.jar guice-4.1.0.jar h2-2.1.210.jar httpasyncclient-4.1.3.jar @@ -69,9 +67,9 @@ influxdb-java-2.15.jar iotdb-session-0.12.5.jar iotdb-thrift-0.12.5.jar j2objc-annotations-1.3.jar -jackson-annotations-2.12.2.jar -jackson-core-2.12.2.jar -jackson-databind-2.12.2.jar +jackson-annotations-2.13.2.jar +jackson-core-2.13.2.jar +jackson-databind-2.13.2.2.jar jackson-datatype-guava-2.9.10.jar jackson-datatype-jdk8-2.9.10.jar jackson-module-afterburner-2.12.2.jar @@ -136,8 +134,8 @@ okio-1.17.2.jar perfmark-api-0.23.0.jar postgresql-42.3.2.jar proto-google-common-protos-2.0.1.jar -protobuf-java-3.19.2.jar -protobuf-java-util-3.19.2.jar +protobuf-java-3.19.4.jar +protobuf-java-util-3.19.4.jar reactive-streams-1.0.2.jar retrofit-2.5.0.jar service-rpc-0.12.5.jar