Revert upgrade to Netty 4.1.25.Final (#31282)

This reverts upgrading to Netty 4.1.25.Final until we have a cleaner
solution to dealing with the object cleaner thread.

Author: jasontedor

modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWithAuthTests.java

@@ -19,7 +19,6 @@
 
 package org.elasticsearch.index.reindex;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
 import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.ElasticsearchSecurityException;
 import org.elasticsearch.ElasticsearchStatusException;
@@ -42,7 +41,6 @@
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.NodeEnvironment;
-import org.elasticsearch.index.reindex.test.ObjectCleanerThreadThreadFilter;
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.rest.RestStatus;
@@ -66,7 +64,6 @@
 import static org.elasticsearch.index.reindex.ReindexTestCase.matcher;
 import static org.hamcrest.Matchers.containsString;
 
-@ThreadLeakFilters(filters = {ObjectCleanerThreadThreadFilter.class})
 public class ReindexFromRemoteWithAuthTests extends ESSingleNodeTestCase {
     private TransportAddress address;
 

modules/reindex/src/test/java/org/elasticsearch/index/reindex/RetryTests.java

@@ -19,7 +19,6 @@
 
 package org.elasticsearch.index.reindex;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
 import org.elasticsearch.action.ActionFuture;
 import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
 import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
@@ -34,7 +33,6 @@
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.reindex.test.ObjectCleanerThreadThreadFilter;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -58,7 +56,6 @@
  * Integration test for retry behavior. Useful because retrying relies on the way that the
  * rest of Elasticsearch throws exceptions and unit tests won't verify that.
  */
-@ThreadLeakFilters(filters = {ObjectCleanerThreadThreadFilter.class})
 public class RetryTests extends ESIntegTestCase {
 
     private static final int DOC_COUNT = 20;

modules/reindex/src/test/java/org/elasticsearch/index/reindex/test/ObjectCleanerThreadThreadFilter.java

@@ -34,13 +34,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr
 
 dependencies {
     // network stack
-    compile "io.netty:netty-buffer:4.1.25.Final"
-    compile "io.netty:netty-codec:4.1.25.Final"
-    compile "io.netty:netty-codec-http:4.1.25.Final"
-    compile "io.netty:netty-common:4.1.25.Final"
-    compile "io.netty:netty-handler:4.1.25.Final"
-    compile "io.netty:netty-resolver:4.1.25.Final"
-    compile "io.netty:netty-transport:4.1.25.Final"
+    compile "io.netty:netty-buffer:4.1.16.Final"
+    compile "io.netty:netty-codec:4.1.16.Final"
+    compile "io.netty:netty-codec-http:4.1.16.Final"
+    compile "io.netty:netty-common:4.1.16.Final"
+    compile "io.netty:netty-handler:4.1.16.Final"
+    compile "io.netty:netty-resolver:4.1.16.Final"
+    compile "io.netty:netty-transport:4.1.16.Final"
 }
 
 dependencyLicenses {
@@ -161,6 +161,6 @@ thirdPartyAudit.excludes = [
 
         'org.conscrypt.AllocatedBuffer',
         'org.conscrypt.BufferAllocator',
-        'org.conscrypt.Conscrypt',
+        'org.conscrypt.Conscrypt$Engines',
         'org.conscrypt.HandshakeListener'
 ]

modules/transport-netty4/build.gradle

@@ -0,0 +1 @@
+63b5fa95c74785e16f2c30ce268bc222e35c8cb5

modules/transport-netty4/licenses/netty-buffer-4.1.16.Final.jar.sha1

@@ -0,0 +1 @@
+d84a1f21768b7309c2954521cf5a1f46c2309eb1

modules/transport-netty4/licenses/netty-buffer-4.1.25.Final.jar.sha1

@@ -0,0 +1 @@
+d64312378b438dfdad84267c599a053327c6f02a