From 50639855161a2f4c3999a134fc487c9d6aa262ef Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Wed, 29 Nov 2023 00:58:35 +0800
Subject: [PATCH] Bump up grpc (#650)

---
 CHANGES.md                                         |  2 +-
 .../apm-sdk-plugin/rocketMQ-5.x-plugin/pom.xml     | 14 +++++++++++++-
 dist-material/LICENSE                              |  2 +-
 pom.xml                                            |  4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 7dcf73cb1..a98f8a644 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,7 +14,6 @@ Release Notes.
 * Optimize spring-cloud-gateway 2.1.x, 3.x witness class.
 * Support report MongoDB instance info in Mongodb 4.x plugin.
 * To compatible upper and lower case Oracle TNS url parse.
-* Fix config length limitation.
 * Support collecting ZGC memory pool metrics. Require OAP 9.7.0 to support these new metrics.
 * Upgrade netty-codec-http2 to 4.1.100.Final
 * Add a netty-http 4.1.x plugin to trace HTTP requests.
@@ -25,6 +24,7 @@ Release Notes.
 * Add JDK21 plugin tests for Spring 6.
 * Bump Lombok to 1.18.30 to adopt JDK21 compiling.
 * Fix PostgreSQL Jdbc URL parsing exception.
+* Bump up grpc version.
 
 #### Documentation
 * Fix JDK requirement in the compiling docs.
diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-5.x-plugin/pom.xml
index b22e90350..1bedbe93b 100644
--- a/apm-sniffer/apm-sdk-plugin/rocketMQ-5.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-5.x-plugin/pom.xml
@@ -40,6 +40,18 @@
 			<version>${rocketmq-client.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.skywalking</groupId>
+			<artifactId>apm-agent-core</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>io.grpc</groupId>
+					<artifactId>grpc-netty</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -50,4 +62,4 @@
 		</plugins>
 	</build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/dist-material/LICENSE b/dist-material/LICENSE
index 982dfe0ae..a5c6f781c 100755
--- a/dist-material/LICENSE
+++ b/dist-material/LICENSE
@@ -216,7 +216,7 @@ 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.50.0: https://github.com/grpc/grpc-java, Apache 2.0
+    Google: grpc-java 1.53.0: 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
diff --git a/pom.xml b/pom.xml
index e521e3815..e40545b23 100755
--- a/pom.xml
+++ b/pom.xml
@@ -87,13 +87,13 @@
 
         <!-- core lib dependency -->
         <bytebuddy.version>1.14.9</bytebuddy.version>
-        <grpc.version>1.50.0</grpc.version>
+        <grpc.version>1.53.0</grpc.version>
         <netty.version>4.1.100.Final</netty.version>
         <gson.version>2.8.9</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.21.7</com.google.protobuf.protoc.version>
-        <protoc-gen-grpc-java.plugin.version>1.50.0</protoc-gen-grpc-java.plugin.version>
+        <protoc-gen-grpc-java.plugin.version>1.53.0</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>