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 2024/12/11 02:39:14 UTC
(skywalking-java) branch bump-up created (now 7e03d86fce)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch bump-up
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
at 7e03d86fce Bump gRPC and netty.
This branch includes the following new commits:
new 7e03d86fce Bump gRPC and netty.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(skywalking-java) 01/01: Bump gRPC and netty.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch bump-up
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 7e03d86fce03e1cb69056fb302c131122ad32875
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Dec 11 10:39:05 2024 +0800
Bump gRPC and netty.
---
CHANGES.md | 2 ++
apm-protocol/apm-network/pom.xml | 5 +++++
dist-material/LICENSE | 4 ++--
pom.xml | 10 +++++-----
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 0e7dd67ab7..56c5131421 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,8 @@ Release Notes.
* Support db.instance tag,db.collection tag and AggregateOperation span for mongodb plugin(3.x/4.x)
* Improve CustomizeConfiguration by avoiding repeatedly resolve file config
* Add empty judgment for constructorInterceptPoint
+* Bump up gRPC to 1.68.1
+* Bump up netty to 4.1.115.Final
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/222?closed=1)
diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml
index 195286c43a..3edb1f9c05 100644
--- a/apm-protocol/apm-network/pom.xml
+++ b/apm-protocol/apm-network/pom.xml
@@ -42,6 +42,11 @@
<artifactId>netty-codec-http2</artifactId>
<version>${netty.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
diff --git a/dist-material/LICENSE b/dist-material/LICENSE
index f36ccd2177..d763acd590 100755
--- a/dist-material/LICENSE
+++ b/dist-material/LICENSE
@@ -216,12 +216,12 @@ 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.14.9: http://bytebuddy.net/ , Apache 2.0
- Google: grpc-java 1.53.0: https://github.com/grpc/grpc-java, Apache 2.0
+ Google: grpc-java 1.68.1: https://github.com/grpc/grpc-java, Apache 2.0
Google: gson 2.8.9: https://github.com/google/gson , 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
Google: guava 32.0.1: https://github.com/google/guava , Apache 2.0
- netty 4.1.100: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0
+ netty 4.1.115: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0
async-profiler 3.0: https://github.com/async-profiler/async-profiler/blob/v3.0/LICENSE, Apache 2.0
========================================================================
diff --git a/pom.xml b/pom.xml
index 1ca1ec9c2a..7071bb6d5c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -87,13 +87,13 @@
<!-- core lib dependency -->
<bytebuddy.version>1.14.9</bytebuddy.version>
- <grpc.version>1.53.0</grpc.version>
- <netty.version>4.1.100.Final</netty.version>
+ <grpc.version>1.68.1</grpc.version>
+ <netty.version>4.1.115.Final</netty.version>
<gson.version>2.8.9</gson.version>
- <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
+ <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
- <com.google.protobuf.protoc.version>3.21.7</com.google.protobuf.protoc.version>
- <protoc-gen-grpc-java.plugin.version>1.53.0</protoc-gen-grpc-java.plugin.version>
+ <com.google.protobuf.protoc.version>3.25.5</com.google.protobuf.protoc.version>
+ <protoc-gen-grpc-java.plugin.version>1.68.1</protoc-gen-grpc-java.plugin.version>
<netty-tcnative-boringssl-static.version>2.0.48.Final</netty-tcnative-boringssl-static.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<objenesis.version>3.1</objenesis.version>