From bc8fb2b7219c1dd264489c774bd0d40096d13e41 Mon Sep 17 00:00:00 2001
From: Tomas Langer <tomas.langer@gmail.com>
Date: Fri, 3 Apr 2020 19:31:23 +0200
Subject: [PATCH] Upgrade grpc to follow Netty version used by Helidon. (#1614)

* Upgrade grpc to follow Netty version used by Helidon.
---
 .../helidon/config/etcd/internal/client/v3/EtcdV3Client.java   | 2 +-
 dependencies/pom.xml                                           | 2 +-
 grpc/io.grpc/src/main/java/module-info.java                    | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v3/EtcdV3Client.java b/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v3/EtcdV3Client.java
index 2854bcd78..612b41d16 100644
--- a/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v3/EtcdV3Client.java
+++ b/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v3/EtcdV3Client.java
@@ -63,7 +63,7 @@ public class EtcdV3Client implements EtcdClient {
      */
     public EtcdV3Client(URI uri) {
         ManagedChannelBuilder mcb = ManagedChannelBuilder.forAddress(uri.getHost(), uri.getPort());
-        this.channel = mcb.usePlaintext(true).build();
+        this.channel = mcb.usePlaintext().build();
 
         kvStub = KVGrpc.newBlockingStub(channel);
         watchStub = WatchGrpc.newStub(channel);
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 1a375b712..8a4a32237 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -49,7 +49,7 @@
         <version.lib.failsafe>2.3.1</version.lib.failsafe>
         <version.lib.google-api-client>1.30.5</version.lib.google-api-client>
         <version.lib.graalvm>19.2.0</version.lib.graalvm>
-        <version.lib.grpc>1.25.0</version.lib.grpc>
+        <version.lib.grpc>1.27.1</version.lib.grpc>
         <version.lib.guava>28.1-jre</version.lib.guava>
         <version.lib.h2>1.4.199</version.lib.h2>
         <version.lib.hamcrest>1.3</version.lib.hamcrest>
diff --git a/grpc/io.grpc/src/main/java/module-info.java b/grpc/io.grpc/src/main/java/module-info.java
index 244bdb679..ebded4c86 100644
--- a/grpc/io.grpc/src/main/java/module-info.java
+++ b/grpc/io.grpc/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ module io.grpc {
     requires java.naming;
 
     requires static com.google.common;
-    requires static error.prone.annotations;
 
     uses io.grpc.ManagedChannelProvider;
     uses io.grpc.NameResolverProvider;