diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index 8ca15baeb..94e117c87 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -216,7 +216,7 @@ The following components are provided under the Apache License. See project link The text of each license is also included at licenses/LICENSE-[project].txt. Apache: httpcomponents 4.x.x: http://hc.apache.org/index.html, Apache 2.0 - Apache: fastjson 1.2.47: https://github.com/alibaba/fastjson, Apache 2.0 + Apache: fastjson 1.2.58: https://github.com/alibaba/fastjson, Apache 2.0 Apache: netty-tcnative-boringssl-static 2.0.26: https://github.com/netty/netty-tcnative, Apache 2.0 ======================================================================== @@ -310,7 +310,7 @@ The text of each license is the standard Apache 2.0 license. consul-client 1.2.6: https://github.com/rickfast/consul-client, Apache 2.0 okhttp 3.9.0: https://github.com/square/okhttp, Apache 2.0 prometheus client_java 0.6.0: https://github.com/prometheus/client_java, Apache 2.0 - nacos 1.0.0: https://github.com/alibaba/nacos, Apache 2.0 + nacos 1.2.0: https://github.com/alibaba/nacos, 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 proto files from envoyproxy/data-plane-api: https://github.com/envoyproxy/data-plane-api Apache 2.0 diff --git a/dist-material/release-docs/NOTICE b/dist-material/release-docs/NOTICE index 9ea8d9113..8fc161eb8 100755 --- a/dist-material/release-docs/NOTICE +++ b/dist-material/release-docs/NOTICE @@ -840,7 +840,7 @@ above as far as the program is concerned. ------ =========================================================================== -nacos-1.0.0 Notice +nacos-1.2.0 Notice =========================================================================== Nacos Copyright 2018-2019 The Apache Software Foundation diff --git a/oap-server/pom.xml b/oap-server/pom.xml index e04ad5a68..2261e3011 100755 --- a/oap-server/pom.xml +++ b/oap-server/pom.xml @@ -78,7 +78,7 @@ 0.6.0 1.4.0 0.30.0 - 1.0.0 + 1.2.0 4.0.1 2.12.0 2.17.0 diff --git a/tools/dependencies/known-oap-backend-dependencies-es7.txt b/tools/dependencies/known-oap-backend-dependencies-es7.txt index 5eda48591..d7bb441f7 100755 --- a/tools/dependencies/known-oap-backend-dependencies-es7.txt +++ b/tools/dependencies/known-oap-backend-dependencies-es7.txt @@ -38,7 +38,7 @@ elasticsearch-x-content-7.0.0.jar error_prone_annotations-2.3.2.jar etcd4j-2.17.0.jar failureaccess-1.0.1.jar -fastjson-1.2.47.jar +fastjson-1.2.58.jar freemarker-2.3.28.jar graphql-java-8.0.jar graphql-java-tools-5.2.3.jar @@ -116,9 +116,9 @@ lucene-spatial-extras-8.0.0.jar lucene-spatial3d-8.0.0.jar lucene-suggest-8.0.0.jar minimal-json-0.9.5.jar -nacos-api-1.0.0.jar -nacos-client-1.0.0.jar -nacos-common-1.0.0.jar +nacos-api-1.2.0.jar +nacos-client-1.2.0.jar +nacos-common-1.2.0.jar netty-3.10.5.Final.jar netty-buffer-4.1.42.Final.jar netty-codec-4.1.42.Final.jar diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index 58061ef28..752cf1139 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -37,7 +37,7 @@ elasticsearch-x-content-6.3.2.jar error_prone_annotations-2.3.2.jar etcd4j-2.17.0.jar failureaccess-1.0.1.jar -fastjson-1.2.47.jar +fastjson-1.2.58.jar freemarker-2.3.28.jar graphql-java-8.0.jar graphql-java-tools-5.2.3.jar @@ -114,9 +114,9 @@ lucene-spatial-extras-7.3.1.jar lucene-spatial3d-7.3.1.jar lucene-suggest-7.3.1.jar minimal-json-0.9.5.jar -nacos-api-1.0.0.jar -nacos-client-1.0.0.jar -nacos-common-1.0.0.jar +nacos-api-1.2.0.jar +nacos-client-1.2.0.jar +nacos-common-1.2.0.jar netty-3.10.5.Final.jar netty-buffer-4.1.42.Final.jar netty-codec-4.1.42.Final.jar