diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d1f54ec0a545..a7f50d43188ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Dependencies - Bump `org.apache.zookeeper:zookeeper` from 3.9.3 to 3.9.4 ([#19535](https://github.com/opensearch-project/OpenSearch/pull/19535)) +- Bump `netty` to 4.2.4 ([#19178](https://github.com/opensearch-project/OpenSearch/pull/19178)) ### Deprecated diff --git a/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java index 59caf37f522b3..34596b7d3e1f0 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java @@ -201,6 +201,8 @@ public void execute(Task t) { test.systemProperty("io.netty.noUnsafe", "true"); test.systemProperty("io.netty.noKeySetOptimization", "true"); test.systemProperty("io.netty.recycler.maxCapacityPerThread", "0"); + // See please https://github.com/netty/netty/issues/15631 + test.systemProperty("io.netty.allocator.type", "pooled"); test.testLogging(logging -> { logging.setShowExceptions(true); diff --git a/client/rest/licenses/reactor-core-3.7.5.jar.sha1 b/client/rest/licenses/reactor-core-3.7.5.jar.sha1 deleted file mode 100644 index bbb0e76e3614c..0000000000000 --- a/client/rest/licenses/reactor-core-3.7.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2ffb9b7043593da9a80b91f14cc30f4914183f3a \ No newline at end of file diff --git a/client/rest/licenses/reactor-core-3.8.0-M7.jar.sha1 b/client/rest/licenses/reactor-core-3.8.0-M7.jar.sha1 new file mode 100644 index 0000000000000..28085983dba60 --- /dev/null +++ b/client/rest/licenses/reactor-core-3.8.0-M7.jar.sha1 @@ -0,0 +1 @@ +cbe5b8b1e86a46c59708458bb2b2a61e9088777b \ No newline at end of file diff --git a/distribution/src/config/jvm.options b/distribution/src/config/jvm.options index 90346e2377a8b..dc4d6e4f47d97 100644 --- a/distribution/src/config/jvm.options +++ b/distribution/src/config/jvm.options @@ -91,3 +91,6 @@ ${error.file} # prevent issues like "leaked" maps or performance degradation. A value of 1 effectively # disables the shared Arena pooling and uses a confined Arena for each MMapDirectory -Dorg.apache.lucene.store.MMapDirectory.sharedArenaMaxPermits=1 + +# See please https://github.com/netty/netty/issues/1563 +-Dio.netty.allocator.type=pooled diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fec48c86bfcd9..53473419e51f2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -35,13 +35,13 @@ json_smart = "2.5.2" # when updating the JNA version, also update the version in buildSrc/build.gradle jna = "5.16.0" -netty = "4.1.125.Final" +netty = "4.2.6.Final" joda = "2.12.7" roaringbitmap = "1.3.0" # project reactor -reactor_netty = "1.2.9" -reactor = "3.7.5" +reactor_netty = "1.3.0-M7" +reactor = "3.8.0-M7" # client dependencies httpclient5 = "5.4.4" @@ -141,9 +141,12 @@ lucene-spatial3d = { group = "org.apache.lucene", name = "lucene-spatial3d", ver lucene-suggest = { group = "org.apache.lucene", name = "lucene-suggest", version.ref = "lucene" } netty-buffer = { group = "io.netty", name = "netty-buffer", version.ref = "netty" } netty-codec = { group = "io.netty", name = "netty-codec", version.ref = "netty" } +netty-codec-base = { group = "io.netty", name = "netty-codec-base", version.ref = "netty" } +netty-codec-compression = { group = "io.netty", name = "netty-codec-compression", version.ref = "netty" } netty-codec-dns = { group = "io.netty", name = "netty-codec-dns", version.ref = "netty" } netty-codec-http = { group = "io.netty", name = "netty-codec-http", version.ref = "netty" } netty-codec-http2 = { group = "io.netty", name = "netty-codec-http2", version.ref = "netty" } +netty-codec-http3 = { group = "io.netty", name = "netty-codec-http3", version.ref = "netty" } netty-common = { group = "io.netty", name = "netty-common", version.ref = "netty" } netty-handler = { group = "io.netty", name = "netty-handler", version.ref = "netty" } netty-resolver-dns = { group = "io.netty", name = "netty-resolver-dns", version.ref = "netty" } @@ -188,7 +191,9 @@ lucene = [ netty = [ "netty-buffer", + "netty-codec-base", "netty-codec", + "netty-codec-compression", "netty-codec-dns", "netty-codec-http", "netty-codec-http2", diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index 77333c146c4f0..1585f74a4919e 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -57,6 +57,8 @@ opensearchplugin { dependencies { // network stack api "io.netty:netty-buffer:${versions.netty}" + api "io.netty:netty-codec-base:${versions.netty}" + api "io.netty:netty-codec-compression:${versions.netty}" api "io.netty:netty-codec:${versions.netty}" api "io.netty:netty-codec-http:${versions.netty}" api "io.netty:netty-codec-http2:${versions.netty}" @@ -158,25 +160,6 @@ thirdPartyAudit { 'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder', 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo', - // from io.netty.handler.ssl.JettyNpnSslEngine (netty) - 'org.eclipse.jetty.npn.NextProtoNego$ClientProvider', - 'org.eclipse.jetty.npn.NextProtoNego$ServerProvider', - 'org.eclipse.jetty.npn.NextProtoNego', - - // from io.netty.handler.codec.marshalling.ChannelBufferByteInput (netty) - 'org.jboss.marshalling.ByteInput', - - // from io.netty.handler.codec.marshalling.ChannelBufferByteOutput (netty) - 'org.jboss.marshalling.ByteOutput', - - // from io.netty.handler.codec.marshalling.CompatibleMarshallingEncoder (netty) - 'org.jboss.marshalling.Marshaller', - - // from io.netty.handler.codec.marshalling.ContextBoundUnmarshallerProvider (netty) - 'org.jboss.marshalling.MarshallerFactory', - 'org.jboss.marshalling.MarshallingConfiguration', - 'org.jboss.marshalling.Unmarshaller', - // from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional 'org.slf4j.helpers.FormattingTuple', 'org.slf4j.helpers.MessageFormatter', @@ -184,8 +167,6 @@ thirdPartyAudit { 'org.slf4j.LoggerFactory', 'org.slf4j.spi.LocationAwareLogger', - 'com.google.protobuf.nano.CodedOutputByteBufferNano', - 'com.google.protobuf.nano.MessageNano', 'com.ning.compress.BufferRecycler', 'com.ning.compress.lzf.ChunkDecoder', 'com.ning.compress.lzf.ChunkEncoder', @@ -209,9 +190,6 @@ thirdPartyAudit { 'io.netty.internal.tcnative.SSL', 'io.netty.internal.tcnative.SSLSession', 'io.netty.internal.tcnative.SSLSessionCache', - 'org.eclipse.jetty.alpn.ALPN$ClientProvider', - 'org.eclipse.jetty.alpn.ALPN$ServerProvider', - 'org.eclipse.jetty.alpn.ALPN', 'org.conscrypt.AllocatedBuffer', 'org.conscrypt.BufferAllocator', @@ -219,16 +197,31 @@ thirdPartyAudit { 'org.conscrypt.HandshakeListener', 'reactor.blockhound.BlockHound$Builder', - 'reactor.blockhound.integration.BlockHoundIntegration' + 'reactor.blockhound.integration.BlockHoundIntegration', + + 'io.netty.pkitesting.CertificateBuilder', + 'io.netty.pkitesting.CertificateBuilder$Algorithm', + 'io.netty.pkitesting.X509Bundle' ) ignoreViolations( + 'io.netty.buffer.AbstractAllocatorEvent', + 'io.netty.buffer.AbstractBufferEvent', + 'io.netty.buffer.AbstractChunkEvent', + 'io.netty.buffer.AdaptivePoolingAllocator$AdaptiveByteBuf', + 'io.netty.buffer.AdaptivePoolingAllocator$Chunk', + 'io.netty.buffer.AllocateBufferEvent', + 'io.netty.buffer.AllocateChunkEvent', + 'io.netty.buffer.FreeBufferEvent', + 'io.netty.buffer.FreeChunkEvent', + 'io.netty.buffer.PooledByteBufAllocator', + 'io.netty.buffer.ReallocateBufferEvent', + 'io.netty.buffer.ReturnChunkEvent', 'io.netty.util.internal.PlatformDependent0', 'io.netty.util.internal.PlatformDependent0$1', 'io.netty.util.internal.PlatformDependent0$2', 'io.netty.util.internal.PlatformDependent0$3', - 'io.netty.util.internal.PlatformDependent0$4', - 'io.netty.util.internal.PlatformDependent0$6', + 'io.netty.util.internal.PlatformDependent0$5', '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', diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.125.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.125.Final.jar.sha1 deleted file mode 100644 index f314c9bc03635..0000000000000 --- a/modules/transport-netty4/licenses/netty-buffer-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -814b9a0fbe6b46ea87f77b6548c26f2f6b21cc51 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-buffer-4.2.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..0fcd8c741ee75 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-buffer-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +4dfa898e145ea6910b9e99388f35e0ad483a6dfa \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.125.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.125.Final.jar.sha1 deleted file mode 100644 index ac26996889bfb..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ce90b4cf7fffaec2711397337eeb098a1495c455 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.2.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..dcb39ee65ab21 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +d3c3d384843eb12f8d33d92efd0e4e0ec305cd23 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-base-4.2.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-base-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..bd8a63d5bee34 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-base-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fd6ff9613696f99857daeca37d4cfed22b1eb69e \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..51f3db940ae2c --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fadf334ce949ae99b96b4b9d95d59c30a5dc2614 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.125.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.125.Final.jar.sha1 deleted file mode 100644 index b20cf31e0c074..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-http-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e5c04e7e7885890cf03085cac4fdf837e73ef8ab \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.2.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..b90d84b9ef335 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-http-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +26da0fb9215bde2ecd551b941ccb974f65f59884 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 deleted file mode 100644 index e2b7e8b466919..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -38ac88e75e5721665bd5ea8124fe71cb1d7faef3 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..63841d2df7094 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +55b556602dd5ae7adf7a0ef4720195138018a623 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.125.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.125.Final.jar.sha1 deleted file mode 100644 index e024f64939236..0000000000000 --- a/modules/transport-netty4/licenses/netty-common-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e07fdeb2ad80ad1d849e45f57d3889a992b25159 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.2.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..eaa6b0a3b2542 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-common-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +5746874869298a07b468dd50b5991f457e773620 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.125.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.125.Final.jar.sha1 deleted file mode 100644 index 822b6438372c8..0000000000000 --- a/modules/transport-netty4/licenses/netty-handler-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3eb6a0d1aaded69e40de0a1d812c5f7944a020cb \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.2.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..752d658d4d65b --- /dev/null +++ b/modules/transport-netty4/licenses/netty-handler-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +311ea62f27b26685b306dc24c4bbf765bc1950d9 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.125.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.125.Final.jar.sha1 deleted file mode 100644 index 3443a5450396c..0000000000000 --- a/modules/transport-netty4/licenses/netty-resolver-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6dd3e964005803e6ef477323035725480349ca76 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.2.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..da1542000ff33 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-resolver-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +121223f223094539282b916c303ac52c7875b9aa \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.125.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.125.Final.jar.sha1 deleted file mode 100644 index 2afce2653429d..0000000000000 --- a/modules/transport-netty4/licenses/netty-transport-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a81400cf3207415e549ad54c6c2f47473886c1b0 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.2.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..239451ceb63ea --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +15af02f1735db36455f2af2fd11b64e9f4499008 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 deleted file mode 100644 index bd00a49e450be..0000000000000 --- a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -72f1e54685c68e921ac1dd87cbd65ec1dcbbcb92 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..5ce8d6fd01ee0 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +cacd60c080051c74b9487074cf89d28ec892d71c \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/build.gradle b/plugins/arrow-flight-rpc/build.gradle index 449f517b9b31d..f6e50ee63b25d 100644 --- a/plugins/arrow-flight-rpc/build.gradle +++ b/plugins/arrow-flight-rpc/build.gradle @@ -24,6 +24,8 @@ dependencies { api "org.apache.arrow:arrow-memory-netty-buffer-patch:${versions.arrow}" api "io.netty:netty-buffer:${versions.netty}" api "io.netty:netty-common:${versions.netty}" + api "io.netty:netty-codec-base:${versions.netty}" + api "io.netty:netty-codec-compression:${versions.netty}" api "org.apache.arrow:arrow-vector:${versions.arrow}" api "org.apache.arrow:arrow-format:${versions.arrow}" @@ -185,27 +187,6 @@ tasks.named('thirdPartyAudit').configure { 'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder', 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo', - // from io.netty.handler.ssl.JettyNpnSslEngine (netty) - 'org.eclipse.jetty.npn.NextProtoNego$ClientProvider', - 'org.eclipse.jetty.npn.NextProtoNego$ServerProvider', - 'org.eclipse.jetty.npn.NextProtoNego', - - // from io.netty.handler.codec.marshalling.ChannelBufferByteInput (netty) - 'org.jboss.marshalling.ByteInput', - - // from io.netty.handler.codec.marshalling.ChannelBufferByteOutput (netty) - 'org.jboss.marshalling.ByteOutput', - - // from io.netty.handler.codec.marshalling.CompatibleMarshallingEncoder (netty) - 'org.jboss.marshalling.Marshaller', - - // from io.netty.handler.codec.marshalling.ContextBoundUnmarshallerProvider (netty) - 'org.jboss.marshalling.MarshallerFactory', - 'org.jboss.marshalling.MarshallingConfiguration', - 'org.jboss.marshalling.Unmarshaller', - - 'com.google.protobuf.nano.CodedOutputByteBufferNano', - 'com.google.protobuf.nano.MessageNano', 'com.ning.compress.BufferRecycler', 'com.ning.compress.lzf.ChunkDecoder', 'com.ning.compress.lzf.ChunkEncoder', @@ -219,18 +200,32 @@ tasks.named('thirdPartyAudit').configure { 'net.jpountz.lz4.LZ4FastDecompressor', 'net.jpountz.xxhash.XXHash32', 'net.jpountz.xxhash.XXHashFactory', - 'org.eclipse.jetty.alpn.ALPN$ClientProvider', - 'org.eclipse.jetty.alpn.ALPN$ServerProvider', - 'org.eclipse.jetty.alpn.ALPN', 'org.conscrypt.AllocatedBuffer', 'org.conscrypt.BufferAllocator', 'org.conscrypt.Conscrypt', 'org.conscrypt.HandshakeListener', + 'io.netty.pkitesting.CertificateBuilder', + 'io.netty.pkitesting.CertificateBuilder$Algorithm', + 'io.netty.pkitesting.X509Bundle', + 'com.google.protobuf.util.Timestamps' ) ignoreViolations( + 'io.netty.buffer.AbstractAllocatorEvent', + 'io.netty.buffer.AbstractBufferEvent', + 'io.netty.buffer.AbstractChunkEvent', + 'io.netty.buffer.AdaptivePoolingAllocator$AdaptiveByteBuf', + 'io.netty.buffer.AdaptivePoolingAllocator$Chunk', + 'io.netty.buffer.AllocateBufferEvent', + 'io.netty.buffer.AllocateChunkEvent', + 'io.netty.buffer.FreeBufferEvent', + 'io.netty.buffer.FreeChunkEvent', + 'io.netty.buffer.PooledByteBufAllocator', + 'io.netty.buffer.ReallocateBufferEvent', + 'io.netty.buffer.ReturnChunkEvent', + // Guava internal classes 'com.google.common.cache.Striped64', 'com.google.common.cache.Striped64$1', @@ -250,8 +245,7 @@ tasks.named('thirdPartyAudit').configure { 'io.netty.util.internal.PlatformDependent0$1', 'io.netty.util.internal.PlatformDependent0$2', 'io.netty.util.internal.PlatformDependent0$3', - 'io.netty.util.internal.PlatformDependent0$4', - 'io.netty.util.internal.PlatformDependent0$6', + 'io.netty.util.internal.PlatformDependent0$5', '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', @@ -270,8 +264,7 @@ tasks.named('thirdPartyAudit').configure { 'io.netty.util.internal.PlatformDependent0$1', 'io.netty.util.internal.PlatformDependent0$2', 'io.netty.util.internal.PlatformDependent0$3', - 'io.netty.util.internal.PlatformDependent0$4', - 'io.netty.util.internal.PlatformDependent0$6', + 'io.netty.util.internal.PlatformDependent0$5', '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', diff --git a/plugins/arrow-flight-rpc/licenses/netty-buffer-4.1.125.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-buffer-4.1.125.Final.jar.sha1 deleted file mode 100644 index f314c9bc03635..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/netty-buffer-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -814b9a0fbe6b46ea87f77b6548c26f2f6b21cc51 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-buffer-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-buffer-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..0fcd8c741ee75 --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-buffer-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +4dfa898e145ea6910b9e99388f35e0ad483a6dfa \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-codec-4.1.125.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-codec-4.1.125.Final.jar.sha1 deleted file mode 100644 index ac26996889bfb..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/netty-codec-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ce90b4cf7fffaec2711397337eeb098a1495c455 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-codec-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-codec-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..dcb39ee65ab21 --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-codec-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +d3c3d384843eb12f8d33d92efd0e4e0ec305cd23 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-codec-base-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-codec-base-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..bd8a63d5bee34 --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-codec-base-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fd6ff9613696f99857daeca37d4cfed22b1eb69e \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..51f3db940ae2c --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fadf334ce949ae99b96b4b9d95d59c30a5dc2614 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-codec-http-4.1.125.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-codec-http-4.1.125.Final.jar.sha1 deleted file mode 100644 index b20cf31e0c074..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/netty-codec-http-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e5c04e7e7885890cf03085cac4fdf837e73ef8ab \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-codec-http-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-codec-http-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..b90d84b9ef335 --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-codec-http-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +26da0fb9215bde2ecd551b941ccb974f65f59884 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 deleted file mode 100644 index e2b7e8b466919..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -38ac88e75e5721665bd5ea8124fe71cb1d7faef3 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..63841d2df7094 --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +55b556602dd5ae7adf7a0ef4720195138018a623 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-common-4.1.125.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-common-4.1.125.Final.jar.sha1 deleted file mode 100644 index e024f64939236..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/netty-common-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e07fdeb2ad80ad1d849e45f57d3889a992b25159 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-common-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-common-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..eaa6b0a3b2542 --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-common-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +5746874869298a07b468dd50b5991f457e773620 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-handler-4.1.125.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-handler-4.1.125.Final.jar.sha1 deleted file mode 100644 index 822b6438372c8..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/netty-handler-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3eb6a0d1aaded69e40de0a1d812c5f7944a020cb \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-handler-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-handler-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..752d658d4d65b --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-handler-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +311ea62f27b26685b306dc24c4bbf765bc1950d9 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-resolver-4.1.125.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-resolver-4.1.125.Final.jar.sha1 deleted file mode 100644 index 3443a5450396c..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/netty-resolver-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6dd3e964005803e6ef477323035725480349ca76 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-resolver-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-resolver-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..da1542000ff33 --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-resolver-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +121223f223094539282b916c303ac52c7875b9aa \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-transport-4.1.125.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-transport-4.1.125.Final.jar.sha1 deleted file mode 100644 index 2afce2653429d..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/netty-transport-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a81400cf3207415e549ad54c6c2f47473886c1b0 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-transport-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-transport-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..239451ceb63ea --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-transport-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +15af02f1735db36455f2af2fd11b64e9f4499008 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-transport-classes-epoll-4.1.125.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-transport-classes-epoll-4.1.125.Final.jar.sha1 deleted file mode 100644 index defd3a5811bcf..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/netty-transport-classes-epoll-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -20b1b428b568ce60ebc0007599e9be53233a8533 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-transport-classes-epoll-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-transport-classes-epoll-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..8006c1dd6adcc --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-transport-classes-epoll-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +b61968c0cb9c474df7a0ddc7cd577fed677efbbb \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 deleted file mode 100644 index bd00a49e450be..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -72f1e54685c68e921ac1dd87cbd65ec1dcbbcb92 \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..5ce8d6fd01ee0 --- /dev/null +++ b/plugins/arrow-flight-rpc/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +cacd60c080051c74b9487074cf89d28ec892d71c \ No newline at end of file diff --git a/plugins/ingestion-kinesis/build.gradle b/plugins/ingestion-kinesis/build.gradle index 7b4b892cb4c3b..ad6cceda1dd60 100644 --- a/plugins/ingestion-kinesis/build.gradle +++ b/plugins/ingestion-kinesis/build.gradle @@ -72,6 +72,8 @@ dependencies { // network stack api "io.netty:netty-buffer:${versions.netty}" api "io.netty:netty-codec:${versions.netty}" + api "io.netty:netty-codec-base:${versions.netty}" + api "io.netty:netty-codec-compression:${versions.netty}" api "io.netty:netty-codec-http:${versions.netty}" api "io.netty:netty-codec-http2:${versions.netty}" api "io.netty:netty-common:${versions.netty}" @@ -116,9 +118,6 @@ thirdPartyAudit { 'com.aayushatharva.brotli4j.encoder.Encoder$Mode', 'com.aayushatharva.brotli4j.encoder.Encoder$Parameters', - 'com.google.protobuf.nano.CodedOutputByteBufferNano', - 'com.google.protobuf.nano.MessageNano', - 'org.apache.avalon.framework.logger.Logger', 'org.apache.log.Hierarchy', 'org.apache.log.Logger', @@ -180,44 +179,37 @@ thirdPartyAudit { 'org.conscrypt.Conscrypt', 'org.conscrypt.HandshakeListener', - 'org.eclipse.jetty.alpn.ALPN$ClientProvider', - 'org.eclipse.jetty.alpn.ALPN$ServerProvider', - 'org.eclipse.jetty.alpn.ALPN', - - // from io.netty.handler.ssl.JettyNpnSslEngine (netty) - 'org.eclipse.jetty.npn.NextProtoNego$ClientProvider', - 'org.eclipse.jetty.npn.NextProtoNego$ServerProvider', - 'org.eclipse.jetty.npn.NextProtoNego', - - // from io.netty.handler.codec.marshalling.ChannelBufferByteInput (netty) - 'org.jboss.marshalling.ByteInput', - - // from io.netty.handler.codec.marshalling.ChannelBufferByteOutput (netty) - 'org.jboss.marshalling.ByteOutput', - - // from io.netty.handler.codec.marshalling.CompatibleMarshallingEncoder (netty) - 'org.jboss.marshalling.Marshaller', - - // from io.netty.handler.codec.marshalling.ContextBoundUnmarshallerProvider (netty) - 'org.jboss.marshalling.MarshallerFactory', - 'org.jboss.marshalling.MarshallingConfiguration', - 'org.jboss.marshalling.Unmarshaller', - 'reactor.blockhound.BlockHound$Builder', 'reactor.blockhound.integration.BlockHoundIntegration', 'software.amazon.eventstream.HeaderValue', 'software.amazon.eventstream.Message', - 'software.amazon.eventstream.MessageDecoder' + 'software.amazon.eventstream.MessageDecoder', + + 'io.netty.pkitesting.CertificateBuilder', + 'io.netty.pkitesting.CertificateBuilder$Algorithm', + 'io.netty.pkitesting.X509Bundle' ) ignoreViolations ( + 'io.netty.buffer.AbstractAllocatorEvent', + 'io.netty.buffer.AbstractBufferEvent', + 'io.netty.buffer.AbstractChunkEvent', + 'io.netty.buffer.AdaptivePoolingAllocator$AdaptiveByteBuf', + 'io.netty.buffer.AdaptivePoolingAllocator$Chunk', + 'io.netty.buffer.AllocateBufferEvent', + 'io.netty.buffer.AllocateChunkEvent', + 'io.netty.buffer.FreeBufferEvent', + 'io.netty.buffer.FreeChunkEvent', + 'io.netty.buffer.PooledByteBufAllocator', + 'io.netty.buffer.ReallocateBufferEvent', + 'io.netty.buffer.ReturnChunkEvent', + 'io.netty.util.internal.PlatformDependent0', 'io.netty.util.internal.PlatformDependent0$1', 'io.netty.util.internal.PlatformDependent0$2', 'io.netty.util.internal.PlatformDependent0$3', - 'io.netty.util.internal.PlatformDependent0$4', - 'io.netty.util.internal.PlatformDependent0$6', + 'io.netty.util.internal.PlatformDependent0$5', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef', diff --git a/plugins/ingestion-kinesis/licenses/netty-buffer-4.1.125.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-buffer-4.1.125.Final.jar.sha1 deleted file mode 100644 index f314c9bc03635..0000000000000 --- a/plugins/ingestion-kinesis/licenses/netty-buffer-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -814b9a0fbe6b46ea87f77b6548c26f2f6b21cc51 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-buffer-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-buffer-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..0fcd8c741ee75 --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-buffer-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +4dfa898e145ea6910b9e99388f35e0ad483a6dfa \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-codec-4.1.125.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-codec-4.1.125.Final.jar.sha1 deleted file mode 100644 index ac26996889bfb..0000000000000 --- a/plugins/ingestion-kinesis/licenses/netty-codec-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ce90b4cf7fffaec2711397337eeb098a1495c455 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-codec-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-codec-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..dcb39ee65ab21 --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-codec-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +d3c3d384843eb12f8d33d92efd0e4e0ec305cd23 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-codec-base-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-codec-base-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..bd8a63d5bee34 --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-codec-base-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fd6ff9613696f99857daeca37d4cfed22b1eb69e \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..51f3db940ae2c --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fadf334ce949ae99b96b4b9d95d59c30a5dc2614 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-codec-http-4.1.125.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-codec-http-4.1.125.Final.jar.sha1 deleted file mode 100644 index b20cf31e0c074..0000000000000 --- a/plugins/ingestion-kinesis/licenses/netty-codec-http-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e5c04e7e7885890cf03085cac4fdf837e73ef8ab \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-codec-http-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-codec-http-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..b90d84b9ef335 --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-codec-http-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +26da0fb9215bde2ecd551b941ccb974f65f59884 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 deleted file mode 100644 index e2b7e8b466919..0000000000000 --- a/plugins/ingestion-kinesis/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -38ac88e75e5721665bd5ea8124fe71cb1d7faef3 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..63841d2df7094 --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +55b556602dd5ae7adf7a0ef4720195138018a623 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-common-4.1.125.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-common-4.1.125.Final.jar.sha1 deleted file mode 100644 index e024f64939236..0000000000000 --- a/plugins/ingestion-kinesis/licenses/netty-common-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e07fdeb2ad80ad1d849e45f57d3889a992b25159 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-common-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-common-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..eaa6b0a3b2542 --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-common-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +5746874869298a07b468dd50b5991f457e773620 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-handler-4.1.125.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-handler-4.1.125.Final.jar.sha1 deleted file mode 100644 index 822b6438372c8..0000000000000 --- a/plugins/ingestion-kinesis/licenses/netty-handler-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3eb6a0d1aaded69e40de0a1d812c5f7944a020cb \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-handler-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-handler-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..752d658d4d65b --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-handler-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +311ea62f27b26685b306dc24c4bbf765bc1950d9 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-resolver-4.1.125.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-resolver-4.1.125.Final.jar.sha1 deleted file mode 100644 index 3443a5450396c..0000000000000 --- a/plugins/ingestion-kinesis/licenses/netty-resolver-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6dd3e964005803e6ef477323035725480349ca76 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-resolver-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-resolver-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..da1542000ff33 --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-resolver-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +121223f223094539282b916c303ac52c7875b9aa \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-transport-4.1.125.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-transport-4.1.125.Final.jar.sha1 deleted file mode 100644 index 2afce2653429d..0000000000000 --- a/plugins/ingestion-kinesis/licenses/netty-transport-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a81400cf3207415e549ad54c6c2f47473886c1b0 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-transport-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-transport-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..239451ceb63ea --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-transport-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +15af02f1735db36455f2af2fd11b64e9f4499008 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-transport-classes-epoll-4.1.125.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-transport-classes-epoll-4.1.125.Final.jar.sha1 deleted file mode 100644 index defd3a5811bcf..0000000000000 --- a/plugins/ingestion-kinesis/licenses/netty-transport-classes-epoll-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -20b1b428b568ce60ebc0007599e9be53233a8533 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-transport-classes-epoll-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-transport-classes-epoll-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..8006c1dd6adcc --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-transport-classes-epoll-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +b61968c0cb9c474df7a0ddc7cd577fed677efbbb \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 deleted file mode 100644 index bd00a49e450be..0000000000000 --- a/plugins/ingestion-kinesis/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -72f1e54685c68e921ac1dd87cbd65ec1dcbbcb92 \ No newline at end of file diff --git a/plugins/ingestion-kinesis/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..5ce8d6fd01ee0 --- /dev/null +++ b/plugins/ingestion-kinesis/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +cacd60c080051c74b9487074cf89d28ec892d71c \ No newline at end of file diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index 96266f4d5db85..108594fc762e4 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -48,7 +48,8 @@ dependencies { api 'com.azure:azure-json:1.5.0' api 'com.azure:azure-xml:1.2.0' api 'com.azure:azure-storage-common:12.30.2' - api 'com.azure:azure-core-http-netty:1.15.12' + api 'com.azure:azure-core-http-netty:1.16.0' + api "io.netty:netty-codec-base:${versions.netty}" api "io.netty:netty-codec-dns:${versions.netty}" api "io.netty:netty-codec-socks:${versions.netty}" api "io.netty:netty-codec-http2:${versions.netty}" @@ -135,12 +136,33 @@ thirdPartyAudit { 'io.netty.channel.kqueue.KQueueDatagramChannel', 'io.netty.channel.kqueue.KQueueServerSocketChannel', 'io.netty.channel.kqueue.KQueueSocketChannel', + 'io.netty.channel.epoll.EpollIoHandle', + 'io.netty.channel.epoll.EpollIoHandler', + 'io.netty.channel.kqueue.KQueueIoHandle', + 'io.netty.channel.kqueue.KQueueIoHandler', + 'io.netty.channel.uring.IoUring', + 'io.netty.channel.uring.IoUringDatagramChannel', + 'io.netty.channel.uring.IoUringIoHandle', + 'io.netty.channel.uring.IoUringIoHandler', + 'io.netty.channel.uring.IoUringServerSocketChannel', + 'io.netty.channel.uring.IoUringSocketChannel', + 'io.netty.handler.codec.quic.QuicChannel', + 'io.netty.handler.codec.quic.QuicChannelBootstrap', + 'io.netty.handler.codec.quic.QuicClientCodecBuilder', + 'io.netty.handler.codec.quic.QuicServerCodecBuilder', + 'io.netty.handler.codec.quic.QuicSslContext', + 'io.netty.handler.codec.quic.QuicSslContextBuilder', + 'io.netty.handler.codec.quic.QuicSslEngine', + 'io.netty.handler.codec.quic.QuicStreamChannel', + 'io.netty.handler.codec.quic.QuicStreamChannelBootstrap', + 'io.netty.handler.codec.quic.QuicTokenHandler', 'io.netty.handler.codec.haproxy.HAProxyMessage', 'io.netty.handler.codec.haproxy.HAProxyMessageDecoder', - 'io.netty.incubator.channel.uring.IOUring', - 'io.netty.incubator.channel.uring.IOUringDatagramChannel', - 'io.netty.incubator.channel.uring.IOUringServerSocketChannel', - 'io.netty.incubator.channel.uring.IOUringSocketChannel', + 'io.netty.handler.codec.http3.Http3', + 'io.netty.handler.codec.http3.Http3ClientConnectionHandler', + 'io.netty.handler.codec.http3.Http3DataFrame', + 'io.netty.handler.codec.http3.Http3Headers', + 'io.netty.handler.codec.http3.Http3HeadersFrame', 'javax.activation.DataHandler', 'javax.activation.DataSource', 'javax.xml.bind.JAXBElement', @@ -256,25 +278,8 @@ thirdPartyAudit { 'org.opensaml.xmlsec.signature.Signature', 'org.opensaml.xmlsec.signature.support.SignatureException', 'org.opensaml.xmlsec.signature.support.SignatureValidator', - 'org.opensaml.xmlsec.signature.support.Signer', + 'org.opensaml.xmlsec.signature.support.Signer' // End of the list of classes from the optional compile/provided dependencies used in "com.nimbusds:oauth2-oidc-sdk". - - // from reactor_netty - 'io.netty.incubator.codec.http3.Http3', - 'io.netty.incubator.codec.http3.Http3ClientConnectionHandler', - 'io.netty.incubator.codec.http3.Http3DataFrame', - 'io.netty.incubator.codec.http3.Http3Headers', - 'io.netty.incubator.codec.http3.Http3HeadersFrame', - 'io.netty.incubator.codec.quic.QuicChannel', - 'io.netty.incubator.codec.quic.QuicChannelBootstrap', - 'io.netty.incubator.codec.quic.QuicClientCodecBuilder', - 'io.netty.incubator.codec.quic.QuicServerCodecBuilder', - 'io.netty.incubator.codec.quic.QuicSslContext', - 'io.netty.incubator.codec.quic.QuicSslContextBuilder', - 'io.netty.incubator.codec.quic.QuicSslEngine', - 'io.netty.incubator.codec.quic.QuicStreamChannel', - 'io.netty.incubator.codec.quic.QuicStreamChannelBootstrap', - 'io.netty.incubator.codec.quic.QuicTokenHandler', ) ignoreViolations( diff --git a/plugins/repository-azure/licenses/azure-core-http-netty-1.15.12.jar.sha1 b/plugins/repository-azure/licenses/azure-core-http-netty-1.15.12.jar.sha1 deleted file mode 100644 index 042c4921e3514..0000000000000 --- a/plugins/repository-azure/licenses/azure-core-http-netty-1.15.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6549545f3c3530687ac356e9be8ba44e00eb2dc1 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-core-http-netty-1.16.0.jar.sha1 b/plugins/repository-azure/licenses/azure-core-http-netty-1.16.0.jar.sha1 new file mode 100644 index 0000000000000..1540c2b3c66a1 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-core-http-netty-1.16.0.jar.sha1 @@ -0,0 +1 @@ +c92bb48478f40282393bdfc6a924e8f53dce866b \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-base-4.2.6.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-base-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..bd8a63d5bee34 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-base-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fd6ff9613696f99857daeca37d4cfed22b1eb69e \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.125.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.125.Final.jar.sha1 deleted file mode 100644 index cfa351dd066cb..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-dns-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c328f0afa45a0198a6c3674ca07d36204dc36179 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.2.6.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..7927d66c05c59 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-dns-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +498d957639b6249ba1b6884b212bb9e3d8580ec3 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 deleted file mode 100644 index e2b7e8b466919..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -38ac88e75e5721665bd5ea8124fe71cb1d7faef3 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..63841d2df7094 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +55b556602dd5ae7adf7a0ef4720195138018a623 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.125.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.125.Final.jar.sha1 deleted file mode 100644 index 84f37378f6a47..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-socks-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -87880becd7919fb79d76d01e7f8f2b0c616604a1 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.2.6.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..0249cd96795f7 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-socks-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +6e9de561de0b5764cf05be667c90a4fe06aba40c \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.125.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.125.Final.jar.sha1 deleted file mode 100644 index 71ae602bad0bd..0000000000000 --- a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19a614cccc6fe8924c2674035fb3c9fedc7ae1c9 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.2.6.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..916ad687549e7 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-handler-proxy-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +1f0f9fb2f321cc697f13d802cf80c37889ce421a \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.125.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.125.Final.jar.sha1 deleted file mode 100644 index 72340001e8298..0000000000000 --- a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2f0d5f10e52739fcf9ab2b021adad4ded6064f2c \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.2.6.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..755acaa6ed628 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-resolver-dns-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +ff71e8ef0b6bfdef7620ff4e77481a716792534f \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 deleted file mode 100644 index bd00a49e450be..0000000000000 --- a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -72f1e54685c68e921ac1dd87cbd65ec1dcbbcb92 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..5ce8d6fd01ee0 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +cacd60c080051c74b9487074cf89d28ec892d71c \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.2.9.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.2.9.jar.sha1 deleted file mode 100644 index 3e9f1ad95ac41..0000000000000 --- a/plugins/repository-azure/licenses/reactor-netty-core-1.2.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa1979804ad9f8e3b59f60681bfd2400a16d7b9b \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.3.0-M7.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.3.0-M7.jar.sha1 new file mode 100644 index 0000000000000..80a4de5b60422 --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-core-1.3.0-M7.jar.sha1 @@ -0,0 +1 @@ +152f4075f0e980802e64407e2cb0c9920b787c0e \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.2.9.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.2.9.jar.sha1 deleted file mode 100644 index ba3b94e56e29e..0000000000000 --- a/plugins/repository-azure/licenses/reactor-netty-http-1.2.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aea5b2eb6f1cb9a933a4c97745291ffc34ec10d6 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.3.0-M7.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.3.0-M7.jar.sha1 new file mode 100644 index 0000000000000..75752bb3b0bcd --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-http-1.3.0-M7.jar.sha1 @@ -0,0 +1 @@ +394420d18e794034e77b332a22b5235863d17a19 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.125.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.125.Final.jar.sha1 deleted file mode 100644 index 6fdcdcfd9ea3f..0000000000000 --- a/plugins/repository-hdfs/licenses/netty-all-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -51f9c0d5164c4ab83b3b949d657b7a8233fd6285 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/netty-all-4.2.6.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..178c05ad6e19f --- /dev/null +++ b/plugins/repository-hdfs/licenses/netty-all-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fbfc5dc48f9d1028eb5609f356effe30dcc6ab98 \ No newline at end of file diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index a50f317ebbbf6..f238c161c8570 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -99,6 +99,8 @@ dependencies { api "io.netty:netty-codec:${versions.netty}" api "io.netty:netty-codec-http:${versions.netty}" api "io.netty:netty-codec-http2:${versions.netty}" + api "io.netty:netty-codec-base:${versions.netty}" + api "io.netty:netty-codec-compression:${versions.netty}" api "io.netty:netty-common:${versions.netty}" api "io.netty:netty-handler:${versions.netty}" api "io.netty:netty-resolver:${versions.netty}" @@ -468,9 +470,6 @@ thirdPartyAudit { 'com.aayushatharva.brotli4j.encoder.Encoder$Mode', 'com.aayushatharva.brotli4j.encoder.Encoder$Parameters', - 'com.google.protobuf.nano.CodedOutputByteBufferNano', - 'com.google.protobuf.nano.MessageNano', - 'com.ning.compress.BufferRecycler', 'com.ning.compress.lzf.ChunkDecoder', 'com.ning.compress.lzf.ChunkEncoder', @@ -514,29 +513,6 @@ thirdPartyAudit { 'org.conscrypt.Conscrypt', 'org.conscrypt.HandshakeListener', - 'org.eclipse.jetty.alpn.ALPN$ClientProvider', - 'org.eclipse.jetty.alpn.ALPN$ServerProvider', - 'org.eclipse.jetty.alpn.ALPN', - - // from io.netty.handler.ssl.JettyNpnSslEngine (netty) - 'org.eclipse.jetty.npn.NextProtoNego$ClientProvider', - 'org.eclipse.jetty.npn.NextProtoNego$ServerProvider', - 'org.eclipse.jetty.npn.NextProtoNego', - - // from io.netty.handler.codec.marshalling.ChannelBufferByteInput (netty) - 'org.jboss.marshalling.ByteInput', - - // from io.netty.handler.codec.marshalling.ChannelBufferByteOutput (netty) - 'org.jboss.marshalling.ByteOutput', - - // from io.netty.handler.codec.marshalling.CompatibleMarshallingEncoder (netty) - 'org.jboss.marshalling.Marshaller', - - // from io.netty.handler.codec.marshalling.ContextBoundUnmarshallerProvider (netty) - 'org.jboss.marshalling.MarshallerFactory', - 'org.jboss.marshalling.MarshallingConfiguration', - 'org.jboss.marshalling.Unmarshaller', - 'org.slf4j.ext.EventData', 'reactor.blockhound.BlockHound$Builder', 'reactor.blockhound.integration.BlockHoundIntegration', @@ -548,7 +524,11 @@ thirdPartyAudit { 'software.amazon.awssdk.arns.ArnResource', 'software.amazon.eventstream.HeaderValue', 'software.amazon.eventstream.Message', - 'software.amazon.eventstream.MessageDecoder' + 'software.amazon.eventstream.MessageDecoder', + + 'io.netty.pkitesting.CertificateBuilder', + 'io.netty.pkitesting.CertificateBuilder$Algorithm', + 'io.netty.pkitesting.X509Bundle' ) ignoreViolations ( @@ -556,8 +536,7 @@ thirdPartyAudit { 'io.netty.util.internal.PlatformDependent0$1', 'io.netty.util.internal.PlatformDependent0$2', 'io.netty.util.internal.PlatformDependent0$3', - 'io.netty.util.internal.PlatformDependent0$4', - 'io.netty.util.internal.PlatformDependent0$6', + 'io.netty.util.internal.PlatformDependent0$5', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef', @@ -576,6 +555,18 @@ thirdPartyAudit { 'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess', + 'io.netty.buffer.AbstractAllocatorEvent', + 'io.netty.buffer.AbstractBufferEvent', + 'io.netty.buffer.AbstractChunkEvent', + 'io.netty.buffer.AdaptivePoolingAllocator$AdaptiveByteBuf', + 'io.netty.buffer.AdaptivePoolingAllocator$Chunk', + 'io.netty.buffer.AllocateBufferEvent', + 'io.netty.buffer.AllocateChunkEvent', + 'io.netty.buffer.FreeBufferEvent', + 'io.netty.buffer.FreeChunkEvent', + 'io.netty.buffer.PooledByteBufAllocator', + 'io.netty.buffer.ReallocateBufferEvent', + 'io.netty.buffer.ReturnChunkEvent' ) } diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.125.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.125.Final.jar.sha1 deleted file mode 100644 index f314c9bc03635..0000000000000 --- a/plugins/repository-s3/licenses/netty-buffer-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -814b9a0fbe6b46ea87f77b6548c26f2f6b21cc51 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-buffer-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..0fcd8c741ee75 --- /dev/null +++ b/plugins/repository-s3/licenses/netty-buffer-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +4dfa898e145ea6910b9e99388f35e0ad483a6dfa \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.125.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.125.Final.jar.sha1 deleted file mode 100644 index ac26996889bfb..0000000000000 --- a/plugins/repository-s3/licenses/netty-codec-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ce90b4cf7fffaec2711397337eeb098a1495c455 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-codec-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..dcb39ee65ab21 --- /dev/null +++ b/plugins/repository-s3/licenses/netty-codec-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +d3c3d384843eb12f8d33d92efd0e4e0ec305cd23 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-codec-base-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-base-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..bd8a63d5bee34 --- /dev/null +++ b/plugins/repository-s3/licenses/netty-codec-base-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fd6ff9613696f99857daeca37d4cfed22b1eb69e \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..51f3db940ae2c --- /dev/null +++ b/plugins/repository-s3/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fadf334ce949ae99b96b4b9d95d59c30a5dc2614 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.125.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.125.Final.jar.sha1 deleted file mode 100644 index b20cf31e0c074..0000000000000 --- a/plugins/repository-s3/licenses/netty-codec-http-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e5c04e7e7885890cf03085cac4fdf837e73ef8ab \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..b90d84b9ef335 --- /dev/null +++ b/plugins/repository-s3/licenses/netty-codec-http-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +26da0fb9215bde2ecd551b941ccb974f65f59884 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 deleted file mode 100644 index e2b7e8b466919..0000000000000 --- a/plugins/repository-s3/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -38ac88e75e5721665bd5ea8124fe71cb1d7faef3 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..63841d2df7094 --- /dev/null +++ b/plugins/repository-s3/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +55b556602dd5ae7adf7a0ef4720195138018a623 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-common-4.1.125.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.125.Final.jar.sha1 deleted file mode 100644 index e024f64939236..0000000000000 --- a/plugins/repository-s3/licenses/netty-common-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e07fdeb2ad80ad1d849e45f57d3889a992b25159 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-common-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..eaa6b0a3b2542 --- /dev/null +++ b/plugins/repository-s3/licenses/netty-common-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +5746874869298a07b468dd50b5991f457e773620 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.125.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.125.Final.jar.sha1 deleted file mode 100644 index 822b6438372c8..0000000000000 --- a/plugins/repository-s3/licenses/netty-handler-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3eb6a0d1aaded69e40de0a1d812c5f7944a020cb \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-handler-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..752d658d4d65b --- /dev/null +++ b/plugins/repository-s3/licenses/netty-handler-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +311ea62f27b26685b306dc24c4bbf765bc1950d9 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.125.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.125.Final.jar.sha1 deleted file mode 100644 index 3443a5450396c..0000000000000 --- a/plugins/repository-s3/licenses/netty-resolver-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6dd3e964005803e6ef477323035725480349ca76 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-resolver-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..da1542000ff33 --- /dev/null +++ b/plugins/repository-s3/licenses/netty-resolver-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +121223f223094539282b916c303ac52c7875b9aa \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.125.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.125.Final.jar.sha1 deleted file mode 100644 index 2afce2653429d..0000000000000 --- a/plugins/repository-s3/licenses/netty-transport-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a81400cf3207415e549ad54c6c2f47473886c1b0 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-transport-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..239451ceb63ea --- /dev/null +++ b/plugins/repository-s3/licenses/netty-transport-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +15af02f1735db36455f2af2fd11b64e9f4499008 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.125.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.125.Final.jar.sha1 deleted file mode 100644 index defd3a5811bcf..0000000000000 --- a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -20b1b428b568ce60ebc0007599e9be53233a8533 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..8006c1dd6adcc --- /dev/null +++ b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +b61968c0cb9c474df7a0ddc7cd577fed677efbbb \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 deleted file mode 100644 index bd00a49e450be..0000000000000 --- a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -72f1e54685c68e921ac1dd87cbd65ec1dcbbcb92 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..5ce8d6fd01ee0 --- /dev/null +++ b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +cacd60c080051c74b9487074cf89d28ec892d71c \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/build.gradle b/plugins/transport-reactor-netty4/build.gradle index ac44d82606e6a..4fcfdafc180ef 100644 --- a/plugins/transport-reactor-netty4/build.gradle +++ b/plugins/transport-reactor-netty4/build.gradle @@ -34,6 +34,7 @@ dependencies { api libs.bundles.netty api libs.bundles.reactornetty + api libs.netty.codec.http3 testImplementation libs.log4jslf4jimpl javaRestTestImplementation libs.reactor.test @@ -114,25 +115,6 @@ thirdPartyAudit { 'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder', 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo', - // from io.netty.handler.ssl.JettyNpnSslEngine (netty) - 'org.eclipse.jetty.npn.NextProtoNego$ClientProvider', - 'org.eclipse.jetty.npn.NextProtoNego$ServerProvider', - 'org.eclipse.jetty.npn.NextProtoNego', - - // from io.netty.handler.codec.marshalling.ChannelBufferByteInput (netty) - 'org.jboss.marshalling.ByteInput', - - // from io.netty.handler.codec.marshalling.ChannelBufferByteOutput (netty) - 'org.jboss.marshalling.ByteOutput', - - // from io.netty.handler.codec.marshalling.CompatibleMarshallingEncoder (netty) - 'org.jboss.marshalling.Marshaller', - - // from io.netty.handler.codec.marshalling.ContextBoundUnmarshallerProvider (netty) - 'org.jboss.marshalling.MarshallerFactory', - 'org.jboss.marshalling.MarshallingConfiguration', - 'org.jboss.marshalling.Unmarshaller', - // from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional 'org.slf4j.helpers.FormattingTuple', 'org.slf4j.helpers.MessageFormatter', @@ -140,8 +122,6 @@ thirdPartyAudit { 'org.slf4j.LoggerFactory', 'org.slf4j.spi.LocationAwareLogger', - 'com.google.protobuf.nano.CodedOutputByteBufferNano', - 'com.google.protobuf.nano.MessageNano', 'com.ning.compress.BufferRecycler', 'com.ning.compress.lzf.ChunkDecoder', 'com.ning.compress.lzf.ChunkEncoder', @@ -176,14 +156,34 @@ thirdPartyAudit { 'io.netty.handler.codec.haproxy.HAProxyMessage', 'io.netty.handler.codec.haproxy.HAProxyMessageDecoder', 'io.netty.handler.proxy.ProxyHandler', - 'io.netty.incubator.channel.uring.IOUring', - 'io.netty.incubator.channel.uring.IOUringDatagramChannel', - 'io.netty.incubator.channel.uring.IOUringServerSocketChannel', - 'io.netty.incubator.channel.uring.IOUringSocketChannel', + 'io.netty.channel.epoll.EpollIoHandle', + 'io.netty.channel.epoll.EpollIoHandler', + 'io.netty.channel.kqueue.KQueueIoHandle', + 'io.netty.channel.kqueue.KQueueIoHandler', + 'io.netty.channel.uring.IoUring', + 'io.netty.channel.uring.IoUringDatagramChannel', + 'io.netty.channel.uring.IoUringIoHandle', + 'io.netty.channel.uring.IoUringIoHandler', + 'io.netty.channel.uring.IoUringServerSocketChannel', + 'io.netty.channel.uring.IoUringSocketChannel', + 'io.netty.handler.codec.quic.QuicChannel', + 'io.netty.handler.codec.quic.QuicChannelBootstrap', + 'io.netty.handler.codec.quic.QuicClientCodecBuilder', + 'io.netty.handler.codec.quic.QuicCodecBuilder', + 'io.netty.handler.codec.quic.QuicException', + 'io.netty.handler.codec.quic.QuicServerCodecBuilder', + 'io.netty.handler.codec.quic.QuicSslContext', + 'io.netty.handler.codec.quic.QuicSslContextBuilder', + 'io.netty.handler.codec.quic.QuicSslEngine', + 'io.netty.handler.codec.quic.QuicStreamChannel', + 'io.netty.handler.codec.quic.QuicStreamChannelBootstrap', + 'io.netty.handler.codec.quic.QuicStreamFrame', + 'io.netty.handler.codec.quic.QuicStreamType', + 'io.netty.handler.codec.quic.QuicTokenHandler', - 'org.eclipse.jetty.alpn.ALPN$ClientProvider', - 'org.eclipse.jetty.alpn.ALPN$ServerProvider', - 'org.eclipse.jetty.alpn.ALPN', + 'io.netty.pkitesting.CertificateBuilder', + 'io.netty.pkitesting.CertificateBuilder$Algorithm', + 'io.netty.pkitesting.X509Bundle', 'org.conscrypt.AllocatedBuffer', 'org.conscrypt.BufferAllocator', @@ -230,23 +230,7 @@ thirdPartyAudit { 'io.micrometer.tracing.handler.DefaultTracingObservationHandler', 'io.micrometer.tracing.handler.PropagatingReceiverTracingObservationHandler', 'io.micrometer.tracing.handler.PropagatingSenderTracingObservationHandler', - 'io.micrometer.tracing.propagation.Propagator', - // from reactor_netty - 'io.netty.incubator.codec.http3.Http3', - 'io.netty.incubator.codec.http3.Http3ClientConnectionHandler', - 'io.netty.incubator.codec.http3.Http3DataFrame', - 'io.netty.incubator.codec.http3.Http3Headers', - 'io.netty.incubator.codec.http3.Http3HeadersFrame', - 'io.netty.incubator.codec.quic.QuicChannel', - 'io.netty.incubator.codec.quic.QuicChannelBootstrap', - 'io.netty.incubator.codec.quic.QuicClientCodecBuilder', - 'io.netty.incubator.codec.quic.QuicServerCodecBuilder', - 'io.netty.incubator.codec.quic.QuicSslContext', - 'io.netty.incubator.codec.quic.QuicSslContextBuilder', - 'io.netty.incubator.codec.quic.QuicSslEngine', - 'io.netty.incubator.codec.quic.QuicStreamChannel', - 'io.netty.incubator.codec.quic.QuicStreamChannelBootstrap', - 'io.netty.incubator.codec.quic.QuicTokenHandler', + 'io.micrometer.tracing.propagation.Propagator' ) ignoreViolations( @@ -254,8 +238,7 @@ thirdPartyAudit { 'io.netty.util.internal.PlatformDependent0$1', 'io.netty.util.internal.PlatformDependent0$2', 'io.netty.util.internal.PlatformDependent0$3', - 'io.netty.util.internal.PlatformDependent0$4', - 'io.netty.util.internal.PlatformDependent0$6', + 'io.netty.util.internal.PlatformDependent0$5', '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', @@ -272,6 +255,18 @@ thirdPartyAudit { 'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess', - 'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess' + 'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess', + 'io.netty.buffer.AbstractAllocatorEvent', + 'io.netty.buffer.AbstractBufferEvent', + 'io.netty.buffer.AbstractChunkEvent', + 'io.netty.buffer.AdaptivePoolingAllocator$AdaptiveByteBuf', + 'io.netty.buffer.AdaptivePoolingAllocator$Chunk', + 'io.netty.buffer.AllocateBufferEvent', + 'io.netty.buffer.AllocateChunkEvent', + 'io.netty.buffer.FreeBufferEvent', + 'io.netty.buffer.FreeChunkEvent', + 'io.netty.buffer.PooledByteBufAllocator', + 'io.netty.buffer.ReallocateBufferEvent', + 'io.netty.buffer.ReturnChunkEvent' ) } diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.125.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.125.Final.jar.sha1 deleted file mode 100644 index f314c9bc03635..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -814b9a0fbe6b46ea87f77b6548c26f2f6b21cc51 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..0fcd8c741ee75 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +4dfa898e145ea6910b9e99388f35e0ad483a6dfa \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.125.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.125.Final.jar.sha1 deleted file mode 100644 index ac26996889bfb..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ce90b4cf7fffaec2711397337eeb098a1495c455 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..dcb39ee65ab21 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-codec-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +d3c3d384843eb12f8d33d92efd0e4e0ec305cd23 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-base-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-base-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..bd8a63d5bee34 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-codec-base-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fd6ff9613696f99857daeca37d4cfed22b1eb69e \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..51f3db940ae2c --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-codec-compression-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +fadf334ce949ae99b96b4b9d95d59c30a5dc2614 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.125.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.125.Final.jar.sha1 deleted file mode 100644 index cfa351dd066cb..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c328f0afa45a0198a6c3674ca07d36204dc36179 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..7927d66c05c59 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +498d957639b6249ba1b6884b212bb9e3d8580ec3 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.125.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.125.Final.jar.sha1 deleted file mode 100644 index b20cf31e0c074..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e5c04e7e7885890cf03085cac4fdf837e73ef8ab \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..b90d84b9ef335 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +26da0fb9215bde2ecd551b941ccb974f65f59884 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 deleted file mode 100644 index e2b7e8b466919..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -38ac88e75e5721665bd5ea8124fe71cb1d7faef3 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..63841d2df7094 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +55b556602dd5ae7adf7a0ef4720195138018a623 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http3-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http3-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..f96a360a42a81 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-codec-http3-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +2ef74aebde1d0bc63816cbeb9f053da3be3b5449 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.125.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.125.Final.jar.sha1 deleted file mode 100644 index e024f64939236..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e07fdeb2ad80ad1d849e45f57d3889a992b25159 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..eaa6b0a3b2542 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-common-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +5746874869298a07b468dd50b5991f457e773620 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.125.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.125.Final.jar.sha1 deleted file mode 100644 index 822b6438372c8..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3eb6a0d1aaded69e40de0a1d812c5f7944a020cb \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..752d658d4d65b --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-handler-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +311ea62f27b26685b306dc24c4bbf765bc1950d9 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.125.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.125.Final.jar.sha1 deleted file mode 100644 index 3443a5450396c..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6dd3e964005803e6ef477323035725480349ca76 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..da1542000ff33 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +121223f223094539282b916c303ac52c7875b9aa \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.125.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.125.Final.jar.sha1 deleted file mode 100644 index 72340001e8298..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2f0d5f10e52739fcf9ab2b021adad4ded6064f2c \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..755acaa6ed628 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +ff71e8ef0b6bfdef7620ff4e77481a716792534f \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.125.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.125.Final.jar.sha1 deleted file mode 100644 index 2afce2653429d..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a81400cf3207415e549ad54c6c2f47473886c1b0 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..239451ceb63ea --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-transport-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +15af02f1735db36455f2af2fd11b64e9f4499008 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 deleted file mode 100644 index bd00a49e450be..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.125.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -72f1e54685c68e921ac1dd87cbd65ec1dcbbcb92 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 new file mode 100644 index 0000000000000..5ce8d6fd01ee0 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.2.6.Final.jar.sha1 @@ -0,0 +1 @@ +cacd60c080051c74b9487074cf89d28ec892d71c \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.2.9.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.2.9.jar.sha1 deleted file mode 100644 index 3e9f1ad95ac41..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.2.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa1979804ad9f8e3b59f60681bfd2400a16d7b9b \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.3.0-M7.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.3.0-M7.jar.sha1 new file mode 100644 index 0000000000000..80a4de5b60422 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.3.0-M7.jar.sha1 @@ -0,0 +1 @@ +152f4075f0e980802e64407e2cb0c9920b787c0e \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.2.9.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.2.9.jar.sha1 deleted file mode 100644 index ba3b94e56e29e..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.2.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aea5b2eb6f1cb9a933a4c97745291ffc34ec10d6 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.3.0-M7.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.3.0-M7.jar.sha1 new file mode 100644 index 0000000000000..75752bb3b0bcd --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.3.0-M7.jar.sha1 @@ -0,0 +1 @@ +394420d18e794034e77b332a22b5235863d17a19 \ No newline at end of file diff --git a/server/licenses/reactor-core-3.7.5.jar.sha1 b/server/licenses/reactor-core-3.7.5.jar.sha1 deleted file mode 100644 index bbb0e76e3614c..0000000000000 --- a/server/licenses/reactor-core-3.7.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2ffb9b7043593da9a80b91f14cc30f4914183f3a \ No newline at end of file diff --git a/server/licenses/reactor-core-3.8.0-M7.jar.sha1 b/server/licenses/reactor-core-3.8.0-M7.jar.sha1 new file mode 100644 index 0000000000000..28085983dba60 --- /dev/null +++ b/server/licenses/reactor-core-3.8.0-M7.jar.sha1 @@ -0,0 +1 @@ +cbe5b8b1e86a46c59708458bb2b2a61e9088777b \ No newline at end of file diff --git a/server/src/main/resources/org/opensearch/bootstrap/security.policy b/server/src/main/resources/org/opensearch/bootstrap/security.policy index d1fee5e550dac..dccfb2c40eae4 100644 --- a/server/src/main/resources/org/opensearch/bootstrap/security.policy +++ b/server/src/main/resources/org/opensearch/bootstrap/security.policy @@ -250,6 +250,7 @@ grant { permission java.io.FilePermission "/sys/fs/cgroup/memory.max", "read"; permission java.io.FilePermission "/sys/fs/cgroup/memory.current", "read"; permission java.io.FilePermission "/sys/fs/cgroup/system.slice/-", "read"; + permission java.io.FilePermission "/sys/fs/cgroup/init.scope/-", "read"; // needed by RestClientBuilder permission java.io.FilePermission "${java.home}/lib/security/cacerts", "read";