From 8a2876aad04abf332ff7401db67dea37f6ab1695 Mon Sep 17 00:00:00 2001
From: ascrutae <nzt48.xin@gmail.com>
Date: Sat, 1 Jul 2017 00:17:07 +0800
Subject: [PATCH] upgrade netty version and fix miss dependency classes issue

---
 apm-network/pom.xml                | 22 +++++++++++++++++++++-
 apm-sniffer/apm-agent-core/pom.xml |  1 -
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/apm-network/pom.xml b/apm-network/pom.xml
index c4a2b581a..be4db2912 100644
--- a/apm-network/pom.xml
+++ b/apm-network/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <grpc.version>1.4.0</grpc.version>
-
+        <netty.version>4.1.12.Final</netty.version>
         <compiler.version>1.6</compiler.version>
     </properties>
 
@@ -23,6 +23,16 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty</artifactId>
             <version>${grpc.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-codec-http2</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-handler-proxy</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
@@ -34,6 +44,16 @@
             <artifactId>grpc-stub</artifactId>
             <version>${grpc.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http2</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler-proxy</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index 3c3c4938e..f94d04f96 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -111,7 +111,6 @@
                                     <exclude>net.bytebuddy:byte-buddy:jar:</exclude>
                                     <exclude>com.google.errorprone:error_prone_annotations:jar:</exclude>
                                     <exclude>com.google.code.findbugs:jsr305:jar:</exclude>
-                                    <exclude>com.google.instrumentation:instrumentation-api:jar:</exclude>
                                 </excludes>
                             </artifactSet>
                             <relocations>
-- 
GitLab