Skip to content

Commit 18e971c

Browse files
authored
Bump gRPC and netty. (#737)
1 parent f63a992 commit 18e971c

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Release Notes.
1313
* Support db.instance tag,db.collection tag and AggregateOperation span for mongodb plugin(3.x/4.x)
1414
* Improve CustomizeConfiguration by avoiding repeatedly resolve file config
1515
* Add empty judgment for constructorInterceptPoint
16+
* Bump up gRPC to 1.68.1
17+
* Bump up netty to 4.1.115.Final
1618

1719
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/222?closed=1)
1820

apm-protocol/apm-network/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@
4242
<artifactId>netty-codec-http2</artifactId>
4343
<version>${netty.version}</version>
4444
</dependency>
45+
<dependency>
46+
<groupId>io.grpc</groupId>
47+
<artifactId>grpc-core</artifactId>
48+
<version>${grpc.version}</version>
49+
</dependency>
4550
<dependency>
4651
<groupId>io.grpc</groupId>
4752
<artifactId>grpc-netty</artifactId>

dist-material/LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,12 @@ The following components are provided under the Apache License. See project link
216216
The text of each license is the standard Apache 2.0 license.
217217

218218
raphw (byte-buddy) 1.14.9: http://bytebuddy.net/ , Apache 2.0
219-
Google: grpc-java 1.53.0: https://github.com/grpc/grpc-java, Apache 2.0
219+
Google: grpc-java 1.68.1: https://github.com/grpc/grpc-java, Apache 2.0
220220
Google: gson 2.8.9: https://github.com/google/gson , Apache 2.0
221221
Google: proto-google-common-protos 2.0.1: https://github.com/googleapis/googleapis , Apache 2.0
222222
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
223223
Google: guava 32.0.1: https://github.com/google/guava , Apache 2.0
224-
netty 4.1.100: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0
224+
netty 4.1.115: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0
225225
async-profiler 3.0: https://github.com/async-profiler/async-profiler/blob/v3.0/LICENSE, Apache 2.0
226226

227227
========================================================================

pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@
8787

8888
<!-- core lib dependency -->
8989
<bytebuddy.version>1.14.9</bytebuddy.version>
90-
<grpc.version>1.53.0</grpc.version>
91-
<netty.version>4.1.100.Final</netty.version>
90+
<grpc.version>1.68.1</grpc.version>
91+
<netty.version>4.1.115.Final</netty.version>
9292
<gson.version>2.8.9</gson.version>
93-
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
93+
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
9494
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
95-
<com.google.protobuf.protoc.version>3.21.7</com.google.protobuf.protoc.version>
96-
<protoc-gen-grpc-java.plugin.version>1.53.0</protoc-gen-grpc-java.plugin.version>
95+
<com.google.protobuf.protoc.version>3.25.5</com.google.protobuf.protoc.version>
96+
<protoc-gen-grpc-java.plugin.version>1.68.1</protoc-gen-grpc-java.plugin.version>
9797
<netty-tcnative-boringssl-static.version>2.0.48.Final</netty-tcnative-boringssl-static.version>
9898
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
9999
<objenesis.version>3.1</objenesis.version>

0 commit comments

Comments
 (0)