Skip to content

Commit 126efea

Browse files
authored
Upgrade to Netty 4.1.7
This commit upgrades the Netty dependency to version 4.1.7.Final, picking up some important bug fixes. Relates elastic#22587
1 parent bdf836a commit 126efea

17 files changed

+16
-21
lines changed

client/transport/src/test/java/org/elasticsearch/transport/client/PreBuiltTransportClientTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ public class PreBuiltTransportClientTests extends RandomizedTest {
4141

4242
@Test
4343
public void testPluginInstalled() {
44-
// TODO: remove when Netty 4.1.6 is upgraded to Netty 4.1.7 including https://github.com/netty/netty/pull/6068
45-
assumeFalse(Constants.JRE_IS_MINIMUM_JAVA9);
4644
try (TransportClient client = new PreBuiltTransportClient(Settings.EMPTY)) {
4745
Settings settings = client.settings();
4846
assertEquals(Netty4Plugin.NETTY_TRANSPORT_NAME, NetworkModule.HTTP_DEFAULT_TYPE_SETTING.get(settings));

modules/transport-netty4/build.gradle

+7-10
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr
3333

3434
dependencies {
3535
// network stack
36-
compile "io.netty:netty-buffer:4.1.6.Final"
37-
compile "io.netty:netty-codec:4.1.6.Final"
38-
compile "io.netty:netty-codec-http:4.1.6.Final"
39-
compile "io.netty:netty-common:4.1.6.Final"
40-
compile "io.netty:netty-handler:4.1.6.Final"
41-
compile "io.netty:netty-resolver:4.1.6.Final"
42-
compile "io.netty:netty-transport:4.1.6.Final"
36+
compile "io.netty:netty-buffer:4.1.7.Final"
37+
compile "io.netty:netty-codec:4.1.7.Final"
38+
compile "io.netty:netty-codec-http:4.1.7.Final"
39+
compile "io.netty:netty-common:4.1.7.Final"
40+
compile "io.netty:netty-handler:4.1.7.Final"
41+
compile "io.netty:netty-resolver:4.1.7.Final"
42+
compile "io.netty:netty-transport:4.1.7.Final"
4343
}
4444

4545
thirdPartyAudit.excludes = [
@@ -131,9 +131,6 @@ thirdPartyAudit.excludes = [
131131
'io.netty.util.internal.PlatformDependent0',
132132
'io.netty.util.internal.PlatformDependent0$2',
133133
'io.netty.util.internal.PlatformDependent0$3',
134-
'io.netty.util.internal.UnsafeAtomicIntegerFieldUpdater',
135-
'io.netty.util.internal.UnsafeAtomicLongFieldUpdater',
136-
'io.netty.util.internal.UnsafeAtomicReferenceFieldUpdater',
137134
'io.netty.util.internal.chmv8.ConcurrentHashMapV8',
138135
'io.netty.util.internal.chmv8.ConcurrentHashMapV8$1',
139136
'io.netty.util.internal.chmv8.ConcurrentHashMapV8$TreeBin',

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
65e89b4d0737cf1ed3eac2916ebf365f5312294c

modules/transport-netty4/licenses/netty-codec-4.1.6.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b3ecd69e7ab0eb2054b26ad3efb13c34204ffe19

modules/transport-netty4/licenses/netty-codec-http-4.1.6.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9f957998c651e7b73d6dc878f704d81b4c085387

modules/transport-netty4/licenses/netty-common-4.1.6.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
06766071efa0426fb33101d1758a8d0e09d16ac7

modules/transport-netty4/licenses/netty-handler-4.1.6.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6f7dfa01c1af4280c154213b6d548405df352df9

modules/transport-netty4/licenses/netty-resolver-4.1.6.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
077734f94029b47887f6f9392d1fc62729e155aa

modules/transport-netty4/licenses/netty-transport-4.1.6.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
469e86d4dda1dca8b88d2b1faa8e0f078243ba12

modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
* under the License.
1818
*/
1919

20-
grant codeBase "${codebase.netty-common-4.1.6.Final.jar}" {
20+
grant codeBase "${codebase.netty-common-4.1.7.Final.jar}" {
2121
// for reading the system-wide configuration for the backlog of established sockets
2222
permission java.io.FilePermission "/proc/sys/net/core/somaxconn", "read";
2323
};
2424

25-
grant codeBase "${codebase.netty-transport-4.1.6.Final.jar}" {
25+
grant codeBase "${codebase.netty-transport-4.1.7.Final.jar}" {
2626
// Netty NioEventLoop wants to change this, because of https://bugs.openjdk.java.net/browse/JDK-6427854
2727
// the bug says it only happened rarely, and that its fixed, but apparently it still happens rarely!
2828
permission java.util.PropertyPermission "sun.nio.ch.bugLevel", "write";

0 commit comments

Comments
 (0)