From 47addd6a095786c5a682d4b8d04e1a530c124445 Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Fri, 11 Jun 2021 15:29:35 +0800 Subject: [PATCH] Update licenses Signed-off-by: Gao Hongtao --- .github/workflows/docker-ci.yaml | 4 ++-- dist-material/release-docs/LICENSE | 6 +++--- .../known-oap-backend-dependencies-es7.txt | 20 +++++++++---------- .../known-oap-backend-dependencies.txt | 20 +++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml index 33fa7cb7ff..48b994567d 100644 --- a/.github/workflows/docker-ci.yaml +++ b/.github/workflows/docker-ci.yaml @@ -60,7 +60,7 @@ jobs: - name: Build docker image run: export ES_VERSION=${{ matrix.es }} && export TAG=${{ matrix.es }} && (make docker || make docker) - name: Scan OAP image - uses: aquasecurity/trivy-action@v0.0.18 + uses: aquasecurity/trivy-action@0.0.18 with: image-ref: 'skywalking/oap:${{ matrix.es }}' format: 'table' @@ -69,7 +69,7 @@ jobs: vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - name: Scan UI image - uses: aquasecurity/trivy-action@v0.0.18 + uses: aquasecurity/trivy-action@0.0.18 with: image-ref: 'skywalking/ui:${{ matrix.es }}' format: 'table' diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index 9749066902..1727476129 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -310,8 +310,8 @@ The text of each license is the standard Apache 2.0 license. kubernetes-client 12.0.1: 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.3.1: https://github.com/alibaba/nacos, Apache 2.0 - consul-client 1.2.6: https://github.com/rickfast/consul-client, Apache 2.0 + nacos 1.4.2: https://github.com/alibaba/nacos, Apache 2.0 + consul-client 1.4.2: https://github.com/rickfast/consul-client, Apache 2.0 okhttp 3.14.9: https://github.com/square/okhttp, Apache 2.0 prometheus client_java(simpleclient) 0.6.0: https://github.com/prometheus/client_java, Apache 2.0 proto files from istio/istio: https://github.com/istio/istio Apache 2.0 @@ -324,7 +324,7 @@ The text of each license is the standard Apache 2.0 license. json-flatter 0.6.0: https://github.com/wnameless/json-flattener Apache 2.0 Apache: commons-text 1.4: https://github.com/apache/commons-text Apache 2.0 sundrio 0.9.2: https://github.com/sundrio/sundrio Apache 2.0 - Ctripcorp: apollo 1.4.0: https://github.com/ctripcorp/apollo Apache 2.0 + Ctripcorp: apollo 1.8.0: https://github.com/ctripcorp/apollo Apache 2.0 etcd4j 2.18.0: https://github.com/jurmous/etcd4j Apache 2.0 javaassist 3.25.0-GA: https://github.com/jboss-javassist/javassist Apache 2.0 jackson-module-afterburner 2.12.2: https://github.com/FasterXML/jackson-modules-base, Apache 2.0 diff --git a/tools/dependencies/known-oap-backend-dependencies-es7.txt b/tools/dependencies/known-oap-backend-dependencies-es7.txt index 589af098ea..cdf1e09bab 100755 --- a/tools/dependencies/known-oap-backend-dependencies-es7.txt +++ b/tools/dependencies/known-oap-backend-dependencies-es7.txt @@ -5,8 +5,8 @@ animal-sniffer-annotations-1.18.jar annotations-13.0.jar antlr4-runtime-4.7.1.jar aopalliance-1.0.jar -apollo-client-1.4.0.jar -apollo-core-1.4.0.jar +apollo-client-1.8.0.jar +apollo-core-1.8.0.jar audience-annotations-0.5.0.jar bcpkix-jdk15on-1.68.jar bcprov-ext-jdk15on-1.68.jar @@ -25,8 +25,8 @@ commons-lang3-3.7.jar commons-pool-1.5.4.jar commons-text-1.4.jar compiler-0.9.6.jar -consul-client-1.2.6.jar -converter-jackson-2.3.0.jar +consul-client-1.4.2.jar +converter-jackson-2.5.0.jar converter-moshi-2.5.0.jar curator-client-4.3.0.jar curator-framework-4.3.0.jar @@ -72,8 +72,8 @@ jackson-databind-2.12.2.jar jackson-dataformat-cbor-2.10.4.jar jackson-dataformat-smile-2.10.4.jar jackson-dataformat-yaml-2.10.4.jar -jackson-datatype-guava-2.9.5.jar -jackson-datatype-jdk8-2.9.5.jar +jackson-datatype-guava-2.9.10.jar +jackson-datatype-jdk8-2.9.10.jar jackson-module-afterburner-2.12.2.jar jackson-module-kotlin-2.8.8.jar java-dataloader-2.0.2.jar @@ -125,9 +125,9 @@ minimal-json-0.9.5.jar moshi-1.5.0.jar msgpack-core-0.8.16.jar mvel2-2.4.8.Final.jar -nacos-api-1.3.1.jar -nacos-client-1.3.1.jar -nacos-common-1.3.1.jar +nacos-api-1.4.2.jar +nacos-client-1.4.2.jar +nacos-common-1.4.2.jar netty-buffer-4.1.65.Final.jar netty-codec-4.1.65.Final.jar netty-codec-dns-4.1.65.Final.jar @@ -154,7 +154,7 @@ protobuf-java-util-3.12.4.jar rank-eval-client-7.10.2.jar reactive-streams-1.0.2.jar reflectasm-1.11.7.jar -retrofit-2.3.0.jar +retrofit-2.5.0.jar s2-geometry-library-java-1.0.0.jar simpleclient-0.6.0.jar simpleclient_common-0.6.0.jar diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index b146e095b8..50222bceed 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -5,8 +5,8 @@ animal-sniffer-annotations-1.18.jar annotations-13.0.jar antlr4-runtime-4.7.1.jar aopalliance-1.0.jar -apollo-client-1.4.0.jar -apollo-core-1.4.0.jar +apollo-client-1.8.0.jar +apollo-core-1.8.0.jar audience-annotations-0.5.0.jar bcpkix-jdk15on-1.68.jar bcprov-ext-jdk15on-1.68.jar @@ -24,8 +24,8 @@ commons-io-2.6.jar commons-lang3-3.7.jar commons-pool-1.5.4.jar commons-text-1.4.jar -consul-client-1.2.6.jar -converter-jackson-2.3.0.jar +consul-client-1.4.2.jar +converter-jackson-2.5.0.jar converter-moshi-2.5.0.jar curator-client-4.3.0.jar curator-framework-4.3.0.jar @@ -70,8 +70,8 @@ jackson-databind-2.12.2.jar jackson-dataformat-cbor-2.8.10.jar jackson-dataformat-smile-2.8.10.jar jackson-dataformat-yaml-2.8.10.jar -jackson-datatype-guava-2.9.5.jar -jackson-datatype-jdk8-2.9.5.jar +jackson-datatype-guava-2.9.10.jar +jackson-datatype-jdk8-2.9.10.jar jackson-module-afterburner-2.12.2.jar jackson-module-kotlin-2.8.8.jar java-dataloader-2.0.2.jar @@ -122,9 +122,9 @@ minimal-json-0.9.5.jar moshi-1.5.0.jar msgpack-core-0.8.16.jar mvel2-2.4.8.Final.jar -nacos-api-1.3.1.jar -nacos-client-1.3.1.jar -nacos-common-1.3.1.jar +nacos-api-1.4.2.jar +nacos-client-1.4.2.jar +nacos-common-1.4.2.jar netty-buffer-4.1.65.Final.jar netty-codec-4.1.65.Final.jar netty-codec-dns-4.1.65.Final.jar @@ -151,7 +151,7 @@ protobuf-java-util-3.12.4.jar rank-eval-client-6.3.2.jar reactive-streams-1.0.2.jar reflectasm-1.11.7.jar -retrofit-2.3.0.jar +retrofit-2.5.0.jar simpleclient-0.6.0.jar simpleclient_common-0.6.0.jar simpleclient_hotspot-0.6.0.jar -- GitLab