Update Netty 4.1.51 -> 4.1.52, netty-tcnative 2.0.31 -> 2.0.32 (#1145)

apple · Sep 10, 2020 · c2b33da · c2b33da
1 parent bed2706
commit c2b33da
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@
 group=io.servicetalk
 version=0.32.0-SNAPSHOT
 
-nettyVersion=4.1.51.Final
-tcnativeVersion=2.0.31.Final
+nettyVersion=4.1.52.Final
+tcnativeVersion=2.0.32.Final
 jsr305Version=3.0.2
 
 log4jVersion=2.13.3

diff --git a/...netty-internal/src/test/java/io/servicetalk/tcp/netty/internal/AbstractTcpServerTest.java b/...netty-internal/src/test/java/io/servicetalk/tcp/netty/internal/AbstractTcpServerTest.java
@@ -17,7 +17,6 @@
 
 import io.servicetalk.buffer.api.Buffer;
 import io.servicetalk.concurrent.api.Completable;
-import io.servicetalk.concurrent.api.Executors;
 import io.servicetalk.concurrent.internal.ServiceTalkTestTimeout;
 import io.servicetalk.test.resources.DefaultTestCerts;
 import io.servicetalk.transport.api.ConnectionAcceptor;
@@ -27,7 +26,6 @@
 import io.servicetalk.transport.netty.internal.AddressUtils;
 import io.servicetalk.transport.netty.internal.ClientSecurityConfig;
 import io.servicetalk.transport.netty.internal.ExecutionContextRule;
-import io.servicetalk.transport.netty.internal.IoThreadFactory;
 import io.servicetalk.transport.netty.internal.NettyConnection;
 import io.servicetalk.transport.netty.internal.NoopTransportObserver;
 import io.servicetalk.transport.netty.internal.ServerSecurityConfig;
@@ -41,23 +39,18 @@
 import java.net.InetSocketAddress;
 import java.util.function.Function;
 
-import static io.servicetalk.buffer.netty.BufferAllocators.DEFAULT_ALLOCATOR;
 import static io.servicetalk.transport.api.ConnectionAcceptor.ACCEPT_ALL;
-import static io.servicetalk.transport.netty.NettyIoExecutors.createIoExecutor;
+import static io.servicetalk.transport.netty.internal.ExecutionContextRule.cached;
 
 public abstract class AbstractTcpServerTest {
 
     @Rule
     public final Timeout timeout = new ServiceTalkTestTimeout();
 
     @ClassRule
-    public static final ExecutionContextRule SERVER_CTX = new ExecutionContextRule(() -> DEFAULT_ALLOCATOR,
-            () -> createIoExecutor(new IoThreadFactory("server-io-executor")),
-            Executors::newCachedThreadExecutor);
+    public static final ExecutionContextRule SERVER_CTX = cached("server-io", "server-executor");
     @ClassRule
-    public static final ExecutionContextRule CLIENT_CTX = new ExecutionContextRule(() -> DEFAULT_ALLOCATOR,
-            () -> createIoExecutor(new IoThreadFactory("client-io-executor")),
-            Executors::newCachedThreadExecutor);
+    public static final ExecutionContextRule CLIENT_CTX = cached("client-io", "client-executor");
 
     private ConnectionAcceptor connectionAcceptor = ACCEPT_ALL;
     private Function<NettyConnection<Buffer, Buffer>, Completable> service =

diff --git a/...ternal/src/test/java/io/servicetalk/tcp/netty/internal/AbstractTransportObserverTest.java b/...ternal/src/test/java/io/servicetalk/tcp/netty/internal/AbstractTransportObserverTest.java
@@ -89,6 +89,7 @@ static ClientSecurityConfig defaultClientSecurityConfig(SslProvider provider) {
         config.disableHostnameVerification();
         config.trustManager(DefaultTestCerts::loadMutualAuthCaPem);
         config.provider(provider);
+        config.protocols("TLSv1.2");
         return config;
     }
 
@@ -103,6 +104,7 @@ static ServerSecurityConfig defaultServerSecurityConfig(SslProvider provider) {
         ServerSecurityConfig config = new ServerSecurityConfig();
         config.keyManager(DefaultTestCerts::loadServerPem, DefaultTestCerts::loadServerKey);
         config.provider(provider);
+        config.protocols("TLSv1.2");
         return config;
     }