Upgrade Netty 4.3.32.Final (#36102)
This commit upgrades netty. This will close #35360. Netty started throwing an IllegalArgumentException if a CompositeByteBuf is created with < 2 components. Netty4Utils was updated to reflect this change.
This commit is contained in:
Tim Brooks
GitHub
parent
11fa5c626b
commit
370472b6d1
|
|
@ -15,7 +15,7 @@ slf4j = 1.6.2
|
|||
# when updating the JNA version, also update the version in buildSrc/build.gradle
|
||||
jna = 4.5.1
|
||||
|
||||
netty = 4.1.31.Final
|
||||
netty = 4.1.32.Final
|
||||
joda = 2.10.1
|
||||
|
||||
# test dependencies
|
||||
|
|
|
|||
|
|
@ -109,6 +109,8 @@ thirdPartyAudit.excludes = [
|
|||
'org.jboss.marshalling.Unmarshaller',
|
||||
|
||||
// from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional
|
||||
'org.slf4j.helpers.FormattingTuple',
|
||||
'org.slf4j.helpers.MessageFormatter',
|
||||
'org.slf4j.Logger',
|
||||
'org.slf4j.LoggerFactory',
|
||||
'org.slf4j.spi.LocationAwareLogger',
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
e086523d6bb01fcab1d8dd370eecfcd606311b92
|
||||
|
|
@ -0,0 +1 @@
|
|||
046ede57693788181b2cafddc3a5967ed2f621c8
|
||||
|
|
@ -1 +0,0 @@
|
|||
cfa60b136f5ea57787e910eee37e240bb45402a7
|
||||
|
|
@ -0,0 +1 @@
|
|||
8f32bd79c5a16f014a4372ed979dc62b39ede33a
|
||||
|
|
@ -1 +0,0 @@
|
|||
bf6321b3f10ea3aefc1970b30bb8928e833f236c
|
||||
|
|
@ -0,0 +1 @@
|
|||
0b9218adba7353ad5a75fcb639e4755d64bd6ddf
|
||||
|
|
@ -1 +0,0 @@
|
|||
39ddfa47808c8393a343513571e404fef02f45f0
|
||||
|
|
@ -0,0 +1 @@
|
|||
e95de4f762606f492328e180c8ad5438565a5e3b
|
||||
|
|
@ -1 +0,0 @@
|
|||
7703c0696f2f34ec7c223c6a5750366a5f4dfb6f
|
||||
|
|
@ -0,0 +1 @@
|
|||
b4e3fa13f219df14a9455cc2111f133374428be0
|
||||
|
|
@ -1 +0,0 @@
|
|||
8ea7a47400beedd5bb901b96a0730eea8b7b6f2a
|
||||
|
|
@ -0,0 +1 @@
|
|||
3e0114715cb125a12db8d982b2208e552a91256d
|
||||
|
|
@ -1 +0,0 @@
|
|||
e3396bd65e9c76accac11c29dca035da1cc39cb1
|
||||
|
|
@ -0,0 +1 @@
|
|||
d5e5a8ff9c2bc7d91ddccc536a5aca1a4355bd8b
|
||||
|
|
@ -107,9 +107,14 @@ public class Netty4Utils {
|
|||
while ((slice = iterator.next()) != null) {
|
||||
buffers.add(Unpooled.wrappedBuffer(slice.bytes, slice.offset, slice.length));
|
||||
}
|
||||
final CompositeByteBuf composite = Unpooled.compositeBuffer(buffers.size());
|
||||
composite.addComponents(true, buffers);
|
||||
return composite;
|
||||
|
||||
if (buffers.size() == 1) {
|
||||
return buffers.get(0);
|
||||
} else {
|
||||
CompositeByteBuf composite = Unpooled.compositeBuffer(buffers.size());
|
||||
composite.addComponents(true, buffers);
|
||||
return composite;
|
||||
}
|
||||
} catch (IOException ex) {
|
||||
throw new AssertionError("no IO happens here", ex);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,6 +88,8 @@ thirdPartyAudit.excludes = [
|
|||
'org.jboss.marshalling.Unmarshaller',
|
||||
|
||||
// from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional
|
||||
'org.slf4j.helpers.FormattingTuple',
|
||||
'org.slf4j.helpers.MessageFormatter',
|
||||
'org.slf4j.Logger',
|
||||
'org.slf4j.LoggerFactory',
|
||||
'org.slf4j.spi.LocationAwareLogger',
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
e086523d6bb01fcab1d8dd370eecfcd606311b92
|
||||
|
|
@ -0,0 +1 @@
|
|||
046ede57693788181b2cafddc3a5967ed2f621c8
|
||||
|
|
@ -1 +0,0 @@
|
|||
cfa60b136f5ea57787e910eee37e240bb45402a7
|
||||
|
|
@ -0,0 +1 @@
|
|||
8f32bd79c5a16f014a4372ed979dc62b39ede33a
|
||||
|
|
@ -1 +0,0 @@
|
|||
bf6321b3f10ea3aefc1970b30bb8928e833f236c
|
||||
|
|
@ -0,0 +1 @@
|
|||
0b9218adba7353ad5a75fcb639e4755d64bd6ddf
|
||||
|
|
@ -1 +0,0 @@
|
|||
39ddfa47808c8393a343513571e404fef02f45f0
|
||||
|
|
@ -0,0 +1 @@
|
|||
e95de4f762606f492328e180c8ad5438565a5e3b
|
||||
|
|
@ -1 +0,0 @@
|
|||
7703c0696f2f34ec7c223c6a5750366a5f4dfb6f
|
||||
|
|
@ -0,0 +1 @@
|
|||
b4e3fa13f219df14a9455cc2111f133374428be0
|
||||
|
|
@ -1 +0,0 @@
|
|||
8ea7a47400beedd5bb901b96a0730eea8b7b6f2a
|
||||
|
|
@ -0,0 +1 @@
|
|||
3e0114715cb125a12db8d982b2208e552a91256d
|
||||
|
|
@ -1 +0,0 @@
|
|||
e3396bd65e9c76accac11c29dca035da1cc39cb1
|
||||
|
|
@ -0,0 +1 @@
|
|||
d5e5a8ff9c2bc7d91ddccc536a5aca1a4355bd8b
|
||||
|
|
@ -54,9 +54,14 @@ class ByteBufUtils {
|
|||
while ((slice = iterator.next()) != null) {
|
||||
buffers.add(Unpooled.wrappedBuffer(slice.bytes, slice.offset, slice.length));
|
||||
}
|
||||
final CompositeByteBuf composite = Unpooled.compositeBuffer(buffers.size());
|
||||
composite.addComponents(true, buffers);
|
||||
return composite;
|
||||
|
||||
if (buffers.size() == 1) {
|
||||
return buffers.get(0);
|
||||
} else {
|
||||
CompositeByteBuf composite = Unpooled.compositeBuffer(buffers.size());
|
||||
composite.addComponents(true, buffers);
|
||||
return composite;
|
||||
}
|
||||
} catch (IOException ex) {
|
||||
throw new AssertionError("no IO happens here", ex);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,8 +95,6 @@ public class SslIntegrationTests extends SecurityIntegTestCase {
|
|||
}
|
||||
}
|
||||
|
||||
// no SSL exception as this is the exception is returned when connecting
|
||||
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/35360")
|
||||
public void testThatTransportClientUsingSSLv3ProtocolIsRejected() {
|
||||
assumeFalse("Can't run in a FIPS JVM as SSLv3 SSLContext not available", inFipsJvm());
|
||||
try (TransportClient transportClient = new TestXPackTransportClient(Settings.builder()
|
||||
|
|
|
|||
Loading…
Reference in New Issue