From: jitendra007 <jitendra.sharma1@huawei.com>
Date: Fri, 21 Aug 2020 09:11:45 +0000 (+0530)
Subject: Upgraded grpc-netty for vulnerabilities and removed boilerplate code
X-Git-Tag: 6.0.0~7^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b32486bd6b280d1f7349ccaa6f8bec92ad981ab0;p=cli.git

Upgraded grpc-netty for vulnerabilities and removed boilerplate code

Issue-ID: CLI-313

Signed-off-by: jitendra007 <jitendra.sharma1@huawei.com>
Change-Id: I653328c56e49fcaef6dffa3cbd48d89f4a2eafb4
---

diff --git a/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java b/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java
index d50f6143..13d2f97e 100644
--- a/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java
+++ b/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java
@@ -62,7 +62,7 @@ public class OpenInterfaceGrpcClient {
         this(ManagedChannelBuilder.forAddress(host, port)
             // Channels are secure by default (via SSL/TLS). For the example we disable TLS to avoid
             // needing certificates.
-            .usePlaintext(true)
+            .usePlaintext()
             .build());
       }
 
diff --git a/grpc/pom.xml b/grpc/pom.xml
index 84a508f8..91d5d623 100644
--- a/grpc/pom.xml
+++ b/grpc/pom.xml
@@ -31,7 +31,7 @@
   </modules>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <grpc.version>1.8.0</grpc.version>
+    <grpc.version>1.29.0</grpc.version>
   </properties>
   <dependencies>
 <!-- netty-codec-http2 excluded due to Security Issues:- CVE-2019-9512,CVE-2019-9514,CVE-2019-9515,CVE-2019-9518,CVE-2019-16869
@@ -40,40 +40,7 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-netty</artifactId>
       <version>${grpc.version}</version>
-       <exclusions>
-        <exclusion>
-           <groupId>io.netty</groupId>
-            <artifactId>netty-codec-http2</artifactId>
-            </exclusion>
-      </exclusions>
     </dependency>
-
-    <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-codec-http2</artifactId>
-        <version>4.1.46.Final</version>
-        <exclusions>
-            <exclusion>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-codec-http</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-handler</artifactId>
-            </exclusion>
-        </exclusions>
-    </dependency>
-      <dependency>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-codec-http</artifactId>
-          <version>4.1.48.Final</version>
-      </dependency>
-      <dependency>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-handler</artifactId>
-          <version>4.1.19.Final</version>
-      </dependency>
-
       <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-protobuf</artifactId>