Merge "[FAB-16669] WIP: Use native Java 11 ALPN support"

Author: mbwhite

fabric-chaincode-protos/build.gradle

@@ -47,7 +47,7 @@ buildscript {
 dependencies {
     compile 'com.google.protobuf:protobuf-java:3.9.1'
     compile 'com.google.protobuf:protobuf-java-util:3.9.1'
-    compile 'io.grpc:grpc-netty-shaded:1.23.0'
+    compile 'io.grpc:grpc-netty:1.23.0'
     compile 'io.grpc:grpc-protobuf:1.23.0'
     compile 'io.grpc:grpc-stub:1.23.0'
     // Required if using Java 11+ as no longer bundled in the core libraries

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeBase.java

@@ -36,10 +36,10 @@
 import org.hyperledger.fabric.shim.impl.Handler;
 
 import io.grpc.ManagedChannelBuilder;
-import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
-import io.grpc.netty.shaded.io.grpc.netty.NegotiationType;
-import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
-import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NegotiationType;
+import io.grpc.netty.NettyChannelBuilder;
+import io.netty.handler.ssl.SslContext;
 
 public abstract class ChaincodeBase implements Chaincode {