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. --> org.apache.commons commons-lang3 - 3.9 + 3.11 commons-io commons-io - 2.6 + 2.8.0 io.grpc grpc-netty - 1.8.0 + ${grpc.version} io.grpc grpc-protobuf - 1.8.0 + ${grpc.version} io.grpc grpc-stub - 1.8.0 + ${grpc.version} io.netty netty-tcnative-boringssl-static - 2.0.7.Final + 2.0.35.Final org.apache.nifi @@ -76,18 +76,13 @@ language governing permissions and limitations under the License. --> nifi-ssl-context-service test - - org.mockito - mockito-core - test - kr.motd.maven os-maven-plugin - 1.5.0.Final + 1.6.2 @@ -102,11 +97,11 @@ language governing permissions and limitations under the License. --> org.xolstice.maven.plugins protobuf-maven-plugin - 0.5.1 + 0.6.1 - com.google.protobuf:protoc:3.5.0:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} ${basedir}/src/main/resources/proto 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 @@ 1.13.0-SNAPSHOT - org.apache.nifi nifi-grpc-bundle 1.13.0-SNAPSHOT pom @@ -33,6 +32,11 @@ nifi-grpc-nar + + 1.34.0 + 3.14.0 + +