From 179914d7b9b7f343640a31d9c9a27845a321e6e9 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Mon, 30 Sep 2019 13:29:03 +0800 Subject: [PATCH] Upgrade guava version to support higher JDK version (#3541) * Upgrade guava version to support higher JDK version * Adjust license version * Update doc --- apm-dist/release-docs/LICENSE | 4 ++-- docs/en/setup/backend/backend-ui-setup.md | 2 +- oap-server/pom.xml | 8 +++++++- tools/dependencies/known-oap-backend-dependencies.txt | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/apm-dist/release-docs/LICENSE b/apm-dist/release-docs/LICENSE index 219c3e44a..81045f271 100755 --- a/apm-dist/release-docs/LICENSE +++ b/apm-dist/release-docs/LICENSE @@ -231,7 +231,7 @@ The text of each license is the standard Apache 2.0 license. Google: grpc 1.15.1: https://grpc.io/ , Apache 2.0 Google: gprc-java 1.14.0: https://github.com/grpc/grpc-java, Apache 2.0 Google: gprc-java 1.15.1: https://github.com/grpc/grpc-java, Apache 2.0 - Google: guava 20.0: https://github.com/google/guava , Apache 2.0 + Google: guava 23.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.1: https://github.com/google/gson , Apache 2.0 Google: opencensus-java 0.12.3: https://github.com/census-instrumentation/opencensus-java , Apache 2.0 @@ -275,7 +275,7 @@ The text of each license is the standard Apache 2.0 license. netty 5.5.0: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0 annotations 13.0: http://www.jetbrains.org, Apache 2.0 compiler 0.9.3: https://github.com/spullara/mustache.java, Apache 2.0 - error_prone_annotations 2.0.19: https://github.com/google/error-prone, Apache 2.0 + error_prone_annotations 2.0.18: https://github.com/google/error-prone, Apache 2.0 hppc 0.7.1: https://github.com/carrotsearch/hppc, 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 diff --git a/docs/en/setup/backend/backend-ui-setup.md b/docs/en/setup/backend/backend-ui-setup.md index 7c2f8e548..7fa0bcce7 100644 --- a/docs/en/setup/backend/backend-ui-setup.md +++ b/docs/en/setup/backend/backend-ui-setup.md @@ -9,7 +9,7 @@ server and UI startup. 1. **Webapp env**, in `webapp` folder. UI frontend jar file is in here and its `webapp.yml` setting file. ## Quick start -Requirement: **JDK8** +Requirement: **JDK8 to JDK12 are tested**, other versions are not tested and may or may not work. Before you do quick start, you should know, quick start is to run skywalking backend and UI for preview or demonstration. In here, performance and long-term running are not our goals. diff --git a/oap-server/pom.xml b/oap-server/pom.xml index 94fbf058a..e2ad820d6 100755 --- a/oap-server/pom.xml +++ b/oap-server/pom.xml @@ -48,7 +48,7 @@ UTF-8 1.7.25 2.9.0 - 20.0 + 23.1-jre 1.18 2.8.1 5.2.3 @@ -222,6 +222,12 @@ com.google.guava guava ${guava.version} + + + com.google.j2objc + j2objc-annotations + + org.yaml diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index a6f386e08..d730f9aa1 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -1,5 +1,5 @@ aggs-matrix-stats-client-6.3.2.jar -animal-sniffer-annotations-1.17.jar +animal-sniffer-annotations-1.14.jar annotations-13.0.jar antlr4-runtime-4.7.1.jar aopalliance-1.0.jar @@ -33,7 +33,7 @@ elasticsearch-rest-client-6.3.2.jar elasticsearch-rest-high-level-client-6.3.2.jar elasticsearch-secure-sm-6.3.2.jar elasticsearch-x-content-6.3.2.jar -error_prone_annotations-2.2.0.jar +error_prone_annotations-2.0.18.jar etcd4j-2.17.0.jar fastjson-1.2.47.jar freemarker-2.3.28.jar @@ -47,7 +47,7 @@ grpc-protobuf-1.15.1.jar grpc-protobuf-lite-1.15.1.jar grpc-stub-1.15.1.jar gson-2.8.1.jar -guava-20.0.jar +guava-23.1-jre.jar guice-4.1.0.jar h2-1.4.196.jar HdrHistogram-2.1.9.jar