From 8d2fd39bdb790fa2c5f3adaea69092b582d3d7ac Mon Sep 17 00:00:00 2001
From: Peter Turcsanyi <35004384+turcsanyip@users.noreply.github.com>
Date: Wed, 9 Dec 2020 15:37:01 +0100
Subject: [PATCH] NIFI-8066: Bump GRPC dependency versions (#4716)

---
 .../nifi-grpc-processors/pom.xml              | 25 ++++++++-----------
 .../nifi/processors/grpc/InvokeGRPC.java      |  2 +-
 .../nifi/processors/grpc/TestGRPCClient.java  |  2 +-
 nifi-nar-bundles/nifi-grpc-bundle/pom.xml     |  6 ++++-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml
index 14cd430ef6..11cb58cd98 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml
@@ -38,32 +38,32 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
+            <version>3.11</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.8.0</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty</artifactId>
-            <version>1.8.0</version>
+            <version>${grpc.version}</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-protobuf</artifactId>
-            <version>1.8.0</version>
+            <version>${grpc.version}</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
-            <version>1.8.0</version>
+            <version>${grpc.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative-boringssl-static</artifactId>
-            <version>2.0.7.Final</version>
+            <version>2.0.35.Final</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -76,18 +76,13 @@ language governing permissions and limitations under the License. -->
             <artifactId>nifi-ssl-context-service</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <extensions>
             <extension>
                 <groupId>kr.motd.maven</groupId>
                 <artifactId>os-maven-plugin</artifactId>
-                <version>1.5.0.Final</version>
+                <version>1.6.2</version>
             </extension>
         </extensions>
 
@@ -102,11 +97,11 @@ language governing permissions and limitations under the License. -->
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.1</version>
+                <version>0.6.1</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.5.0:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                     <protoSourceRoot>${basedir}/src/main/resources/proto</protoSourceRoot>
                 </configuration>
                 <executions>
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/main/java/org/apache/nifi/processors/grpc/InvokeGRPC.java b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/main/java/org/apache/nifi/processors/grpc/InvokeGRPC.java
index 1b9d087aed..28cae927ef 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/main/java/org/apache/nifi/processors/grpc/InvokeGRPC.java
+++ b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/main/java/org/apache/nifi/processors/grpc/InvokeGRPC.java
@@ -268,7 +268,7 @@ public class InvokeGRPC extends AbstractProcessor {
             nettyChannelBuilder.sslContext(sslContextBuilder.build());
 
         } else {
-            nettyChannelBuilder.usePlaintext(true);
+            nettyChannelBuilder.usePlaintext();
         }
 
         final ManagedChannel channel = nettyChannelBuilder.build();
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestGRPCClient.java b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestGRPCClient.java
index 1dccbb9092..28e94c6ff6 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestGRPCClient.java
+++ b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestGRPCClient.java
@@ -125,7 +125,7 @@ public class TestGRPCClient {
             sslContextBuilder = GrpcSslContexts.configure(sslContextBuilder);
             channelBuilder = channelBuilder.sslContext(sslContextBuilder.build());
         } else {
-            channelBuilder.usePlaintext(true);
+            channelBuilder.usePlaintext();
         }
         return channelBuilder.build();
     }
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/pom.xml b/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
index 38beaf79ba..4ed65ef594 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
@@ -22,7 +22,6 @@
         <version>1.13.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-grpc-bundle</artifactId>
     <version>1.13.0-SNAPSHOT</version>
     <packaging>pom</packaging>
@@ -33,6 +32,11 @@
         <module>nifi-grpc-nar</module>
     </modules>
 
+    <properties>
+        <grpc.version>1.34.0</grpc.version>
+        <protoc.version>3.14.0</protoc.version>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>