summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam <kanagaraj.manickam@huawei.com>2020-09-01 03:50:51 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-01 03:50:51 +0000
commit44b22b049eb949b3102ef2a207c89a60deceff04 (patch)
treebf1ec41330c0a05f4572a8b0907eca4182f4e295
parent057e9a7c16d117606303312d779c54d9c4dad7aa (diff)
parentb32486bd6b280d1f7349ccaa6f8bec92ad981ab0 (diff)
Merge "Upgraded grpc-netty for vulnerabilities and removed boilerplate code"
-rw-r--r--grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java2
-rw-r--r--grpc/pom.xml35
2 files changed, 2 insertions, 35 deletions
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>