Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Upgrade netty from 4.1.73.Final to 4.1.78.Final #3778

Merged
merged 1 commit into from
Jul 5, 2022
Merged

[Backport 2.x] Upgrade netty from 4.1.73.Final to 4.1.78.Final #3778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ asm = 9.3
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 5.5.0

netty = 4.1.73.Final
netty = 4.1.78.Final
joda = 2.10.12

# client dependencies
Expand Down
10 changes: 8 additions & 2 deletions modules/transport-netty4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ thirdPartyAudit {
'com.aayushatharva.brotli4j.Brotli4jLoader',
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Status',
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Wrapper',
'com.aayushatharva.brotli4j.encoder.Encoder',
'com.aayushatharva.brotli4j.encoder.Encoders',
'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',
// classes are missing
Expand All @@ -141,11 +141,16 @@ thirdPartyAudit {

// from io.netty.handler.ssl.OpenSslEngine (netty)
'io.netty.internal.tcnative.Buffer',
'io.netty.internal.tcnative.CertificateCompressionAlgo',
'io.netty.internal.tcnative.Library',
'io.netty.internal.tcnative.SSL',
'io.netty.internal.tcnative.SSLContext',
'io.netty.internal.tcnative.SSLPrivateKeyMethod',

// from io.netty.channel.unix (netty)
'io.netty.channel.unix.FileDescriptor',
'io.netty.channel.unix.UnixChannel',

// from io.netty.handler.ssl.util.BouncyCastleSelfSignedCertGenerator (netty)
'org.bouncycastle.cert.X509v3CertificateBuilder',
'org.bouncycastle.cert.jcajce.JcaX509CertificateConverter',
Expand Down Expand Up @@ -227,7 +232,8 @@ thirdPartyAudit {
'io.netty.util.internal.PlatformDependent0$1',
'io.netty.util.internal.PlatformDependent0$2',
'io.netty.util.internal.PlatformDependent0$3',
'io.netty.util.internal.PlatformDependent0$5',
'io.netty.util.internal.PlatformDependent0$4',
'io.netty.util.internal.PlatformDependent0$6',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
Expand Down
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-buffer-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-buffer-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6c0c2d805a2c8ea30223677d8219235f9ec14c38
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-codec-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-codec-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e8486c8923fc0914df4562a8e0923462e885f88a
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-codec-http-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-codec-http-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b636591e973418479f2d08e881b12be61845aa6f
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-common-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-common-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d6f560098050f88ba11750aa856edd955e4a7707
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-handler-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-handler-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7e902b6018378bb700ec9364b1d0fba6eefd99fd
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-resolver-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-resolver-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
691170d70a979757d50f60e16121ced5f411a9b8
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-transport-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-transport-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b1639d431e43622d6cbfdd45c30d3fb810fa9101
2 changes: 1 addition & 1 deletion modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void testBadRequest() throws IOException {
() -> client().performRequest(new Request(randomFrom("GET", "POST", "PUT"), path))
);
assertThat(e.getResponse().getStatusLine().getStatusCode(), equalTo(BAD_REQUEST.getStatus()));
assertThat(e, hasToString(containsString("too_long_frame_exception")));
assertThat(e, hasToString(containsString("too_long_http_line_exception")));
assertThat(e, hasToString(matches("An HTTP line is larger than \\d+ bytes")));
}

Expand Down
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-codec-dns-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-codec-dns-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6b51ce00cfe34adbe93171088f1c7fbd2a517308
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-codec-http2-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-codec-http2-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9a4e44bebe5979b59c9bf4cd879e65c4c52bf869
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-codec-socks-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-codec-socks-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0a8b9c0e9819e4e2c6c938e8f079683a65d85faf
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-handler-proxy-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-handler-proxy-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f9e5ad080d1d1a9a82ba598814e6f5a229db4594
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-resolver-dns-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-resolver-dns-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
84fc82d8ff839d85c81979a5dc2525857b9a8837
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
62c64e182a11e31ad80e68a94f0b02b45344df23
1 change: 0 additions & 1 deletion plugins/repository-hdfs/licenses/netty-all-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-hdfs/licenses/netty-all-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c64dedb62484d9fe9dfe1d1e877ef480fd1d0957
10 changes: 8 additions & 2 deletions plugins/transport-nio/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ thirdPartyAudit {
'com.aayushatharva.brotli4j.Brotli4jLoader',
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Status',
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Wrapper',
'com.aayushatharva.brotli4j.encoder.Encoder',
'com.aayushatharva.brotli4j.encoder.Encoders',
'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',

Expand Down Expand Up @@ -145,6 +145,7 @@ thirdPartyAudit {
'io.netty.internal.tcnative.AsyncSSLPrivateKeyMethod',
'io.netty.internal.tcnative.AsyncTask',
'io.netty.internal.tcnative.Buffer',
'io.netty.internal.tcnative.CertificateCompressionAlgo',
'io.netty.internal.tcnative.Library',
'io.netty.internal.tcnative.ResultCallback',
'io.netty.internal.tcnative.SSL',
Expand All @@ -157,6 +158,10 @@ thirdPartyAudit {
'io.netty.internal.tcnative.SessionTicketKey',
'io.netty.internal.tcnative.SniHostNameMatcher',

// from io.netty.channel.unix (netty)
'io.netty.channel.unix.FileDescriptor',
'io.netty.channel.unix.UnixChannel',

'reactor.blockhound.BlockHound$Builder',
'reactor.blockhound.integration.BlockHoundIntegration'
)
Expand All @@ -167,7 +172,8 @@ thirdPartyAudit {
'io.netty.util.internal.PlatformDependent0$1',
'io.netty.util.internal.PlatformDependent0$2',
'io.netty.util.internal.PlatformDependent0$3',
'io.netty.util.internal.PlatformDependent0$5',
'io.netty.util.internal.PlatformDependent0$4',
'io.netty.util.internal.PlatformDependent0$6',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
Expand Down
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-buffer-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-buffer-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6c0c2d805a2c8ea30223677d8219235f9ec14c38
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-codec-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-codec-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e8486c8923fc0914df4562a8e0923462e885f88a
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-codec-http-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-codec-http-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b636591e973418479f2d08e881b12be61845aa6f
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-common-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-common-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d6f560098050f88ba11750aa856edd955e4a7707
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-handler-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-handler-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7e902b6018378bb700ec9364b1d0fba6eefd99fd
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-resolver-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-resolver-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
691170d70a979757d50f60e16121ced5f411a9b8
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-transport-4.1.73.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-transport-4.1.78.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b1639d431e43622d6cbfdd45c30d3fb810fa9101