Skip to content

Commit

Permalink
Bump gRPC and netty. (#737)
Browse files Browse the repository at this point in the history
  • Loading branch information
wu-sheng authored Dec 11, 2024
1 parent f63a992 commit 18e971c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 5 additions & 0 deletions apm-protocol/apm-network/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions dist-material/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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

========================================================================
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 18e971c

Please sign in to comment.