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 2021/11/29 04:01:44 UTC
[skywalking-java] branch main updated: Upgrade grpc-java to 1.42.1 and protoc to 3.19.1 to allow using native Mac osx-aarch_64 artifacts (#74)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new 005e334 Upgrade grpc-java to 1.42.1 and protoc to 3.19.1 to allow using native Mac osx-aarch_64 artifacts (#74)
005e334 is described below
commit 005e334dbcb47c1bbe1640c0b27325d52eebee29
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Nov 29 11:59:17 2021 +0800
Upgrade grpc-java to 1.42.1 and protoc to 3.19.1 to allow using native Mac osx-aarch_64 artifacts (#74)
---
CHANGES.md | 1 +
dist-material/LICENSE | 6 +++---
pom.xml | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 9152043..7f1222f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Release Notes.
* Add ConsumerWrapper/FunctionWrapper to support CompletableFuture.x.thenAcceptAsync/thenApplyAsync.
* Build CLI from Docker instead of source codes, add alpine based Docker image.
* Support set instance properties in json format.
+* Upgrade grpc-java to 1.42.1 and protoc to 3.19.1 to allow using native Mac osx-aarch_64 artifacts.
#### Documentation
diff --git a/dist-material/LICENSE b/dist-material/LICENSE
index 18c665c..c277831 100755
--- a/dist-material/LICENSE
+++ b/dist-material/LICENSE
@@ -216,9 +216,9 @@ 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.11.18: http://bytebuddy.net/ , Apache 2.0
- Google: grpc-java 1.32.1: https://github.com/grpc/grpc-java, Apache 2.0
+ Google: grpc-java 1.42.1: https://github.com/grpc/grpc-java, Apache 2.0
Google: gson 2.8.6: https://github.com/google/gson , Apache 2.0
- Google: proto-google-common-protos 1.17.0: https://github.com/googleapis/googleapis , Apache 2.0
+ Google: proto-google-common-protos 2.0.1: https://github.com/googleapis/googleapis , 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
netty 4.1.65: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0
@@ -229,4 +229,4 @@ BSD licenses
The following components are provided under a BSD license. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
- asm 9.2:https://gitlab.ow2.org , BSD-3-Clause
\ No newline at end of file
+ asm 9.2:https://gitlab.ow2.org , BSD-3-Clause
diff --git a/pom.xml b/pom.xml
index 9928c93..0c7be8f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -87,12 +87,12 @@
<!-- core lib dependency -->
<bytebuddy.version>1.11.18</bytebuddy.version>
- <grpc.version>1.32.1</grpc.version>
+ <grpc.version>1.42.1</grpc.version>
<gson.version>2.8.6</gson.version>
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
- <com.google.protobuf.protoc.version>3.12.0</com.google.protobuf.protoc.version>
- <protoc-gen-grpc-java.plugin.version>1.32.1</protoc-gen-grpc-java.plugin.version>
+ <com.google.protobuf.protoc.version>3.17.3</com.google.protobuf.protoc.version>
+ <protoc-gen-grpc-java.plugin.version>1.42.1</protoc-gen-grpc-java.plugin.version>
<netty-tcnative-boringssl-static.version>2.0.39.Final</netty-tcnative-boringssl-static.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<objenesis.version>3.1</objenesis.version>