You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/11/18 05:11:58 UTC
[incubator-skywalking] branch master updated: Upgrade gRPC library.
(#1928)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new e727de9 Upgrade gRPC library. (#1928)
e727de9 is described below
commit e727de96b288fba3102a2101bb2d61ca7fc5a60c
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Sun Nov 18 13:11:52 2018 +0800
Upgrade gRPC library. (#1928)
* Upgrade gRPC library.
* License update.
---
apm-dist/release-docs/LICENSE | 10 ++++++----
oap-server/pom.xml | 4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/apm-dist/release-docs/LICENSE b/apm-dist/release-docs/LICENSE
index a1b60a3..410208c 100644
--- a/apm-dist/release-docs/LICENSE
+++ b/apm-dist/release-docs/LICENSE
@@ -226,11 +226,13 @@ The following components are provided under the Apache License. See project link
The text of each license is the standard Apache 2.0 license.
raphw (byte-buddy) 1.9.2: http://bytebuddy.net/ , Apache 2.0
- Google: grpc 1.10.0: https://grpc.io/ , Apache 2.0
- Google: gprc-java 1.10.0: https://github.com/grpc/grpc-java, Apache 2.0
- Google: guava 19.0: https://github.com/google/guava , Apache 2.0
+ Google: grpc 1.14.0: https://grpc.io/ , Apache 2.0
+ 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: gson 2.8.1: https://github.com/google/gson , Apache 2.0
- Google: opencensus-java 0.8.0: https://github.com/census-instrumentation/opencensus-java , Apache 2.0
+ Google: opencensus-java 0.12.3: https://github.com/census-instrumentation/opencensus-java , Apache 2.0
Google: proto-google-common-protos 0.1.9: https://github.com/googleapis/googleapis , Apache 2.0
Google: jsr305 3.0.0: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0
Elasticsearch BV (Elasticsearch) 6.3.2: https://www.elastic.co/products/elasticsearch , Apache 2.0
diff --git a/oap-server/pom.xml b/oap-server/pom.xml
index 81d5b89..20e4648 100644
--- a/oap-server/pom.xml
+++ b/oap-server/pom.xml
@@ -42,13 +42,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j.version>1.7.25</slf4j.version>
<log4j.version>2.9.0</log4j.version>
- <guava.version>19.0</guava.version>
+ <guava.version>20.0</guava.version>
<snakeyaml.version>1.18</snakeyaml.version>
<gson.version>2.8.1</gson.version>
<graphql-java-tools.version>5.2.3</graphql-java-tools.version>
<graphql-java.version>8.0</graphql-java.version>
<zookeeper.version>3.4.10</zookeeper.version>
- <grpc.version>1.10.0</grpc.version>
+ <grpc.version>1.15.1</grpc.version>
<netty-tcnative-boringssl-static.version>2.0.7.Final</netty-tcnative-boringssl-static.version>
<jetty.version>9.4.2.v20170220</jetty.version>
<lombok.version>1.18.0</lombok.version>