diff --git a/CHANGELOG.md b/CHANGELOG.md index 20f27c137a494..91bc59e2a0b64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bump `org.bouncycastle:bc-fips` from 1.0.2.3 to 1.0.2.4 ([#10297](https://github.com/opensearch-project/OpenSearch/pull/10297)) - Bump `org.apache.avro:avro` from 1.10.2 to 1.11.3 ([#11502](https://github.com/opensearch-project/OpenSearch/pull/11502)) - Bump `jetty` from 9.4.51.v20230217 to 9.4.52.v20230823 ([#11501](https://github.com/opensearch-project/OpenSearch/pull/11501)) +- Bump `io.projectreactor:reactor-core` from 3.4.23 to 3.4.34 and reactor-netty from 1.0.24 to 1.0.39 ([#11500](https://github.com/opensearch-project/OpenSearch/pull/11500)) ### Changed - Use iterative approach to evaluate Regex.simpleMatch ([#11060](https://github.com/opensearch-project/OpenSearch/pull/11060)) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index e6e1abe191d80..09b51aefc284e 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -27,6 +27,8 @@ protobuf = 3.22.3 jna = 5.5.0 netty = 4.1.101.Final +reactor_netty = 1.0.39 +reactor = 3.4.34 joda = 2.12.2 jetty = 9.4.52.v20230823 diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index ff1b5916ead35..e3d713f5bf452 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -54,12 +54,12 @@ dependencies { api "io.netty:netty-resolver-dns:${versions.netty}" api "io.netty:netty-transport-native-unix-common:${versions.netty}" implementation project(':modules:transport-netty4') - api 'com.azure:azure-storage-blob:12.14.1' - api 'org.reactivestreams:reactive-streams:1.0.3' - api 'io.projectreactor:reactor-core:3.4.23' - api 'io.projectreactor.netty:reactor-netty:1.1.2' - api 'io.projectreactor.netty:reactor-netty-core:1.0.24' - api 'io.projectreactor.netty:reactor-netty-http:1.0.24' + api 'com.azure:azure-storage-blob:12.14.4' + api 'org.reactivestreams:reactive-streams:1.0.4' + api "io.projectreactor:reactor-core:${versions.reactor}" + api "io.projectreactor.netty:reactor-netty:${versions.reactor_netty}" + api "io.projectreactor.netty:reactor-netty-core:${versions.reactor_netty}" + api "io.projectreactor.netty:reactor-netty-http:${versions.reactor_netty}" api "org.slf4j:slf4j-api:${versions.slf4j}" api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}" @@ -99,24 +99,6 @@ thirdPartyAudit { 'com.azure.storage.internal.avro.implementation.AvroReaderFactory', 'com.azure.storage.internal.avro.implementation.schema.AvroSchema', 'com.ctc.wstx.shaded.msv_core.driver.textui.Driver', - 'io.micrometer.core.instrument.Clock', - 'io.micrometer.core.instrument.Counter', - 'io.micrometer.core.instrument.Counter$Builder', - 'io.micrometer.core.instrument.DistributionSummary', - 'io.micrometer.core.instrument.DistributionSummary$Builder', - 'io.micrometer.core.instrument.Gauge', - 'io.micrometer.core.instrument.Gauge$Builder', - 'io.micrometer.core.instrument.Meter', - 'io.micrometer.core.instrument.MeterRegistry', - 'io.micrometer.core.instrument.Metrics', - 'io.micrometer.core.instrument.Tag', - 'io.micrometer.core.instrument.Tags', - 'io.micrometer.core.instrument.Timer', - 'io.micrometer.core.instrument.Timer$Builder', - 'io.micrometer.core.instrument.Timer$Sample', - 'io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics', - 'io.micrometer.core.instrument.composite.CompositeMeterRegistry', - 'io.micrometer.core.instrument.search.Search', 'io.netty.channel.epoll.Epoll', 'io.netty.channel.epoll.EpollDatagramChannel', 'io.netty.channel.epoll.EpollServerSocketChannel', @@ -158,6 +140,33 @@ thirdPartyAudit { 'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter', 'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter$DEFAULT', 'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters', + 'org.osgi.framework.BundleActivator', + 'org.osgi.framework.BundleContext', + 'org.slf4j.impl.StaticLoggerBinder', + 'org.slf4j.impl.StaticMDCBinder', + 'org.slf4j.impl.StaticMarkerBinder', + 'reactor.blockhound.BlockHound$Builder', + 'reactor.blockhound.integration.BlockHoundIntegration', + 'io.micrometer.context.ContextAccessor', + 'io.micrometer.core.instrument.Clock', + 'io.micrometer.core.instrument.Counter', + 'io.micrometer.core.instrument.Counter$Builder', + 'io.micrometer.core.instrument.DistributionSummary', + 'io.micrometer.core.instrument.DistributionSummary$Builder', + 'io.micrometer.core.instrument.Gauge', + 'io.micrometer.core.instrument.Gauge$Builder', + 'io.micrometer.core.instrument.Meter', + 'io.micrometer.core.instrument.Meter$Type', + 'io.micrometer.core.instrument.MeterRegistry', + 'io.micrometer.core.instrument.Metrics', + 'io.micrometer.core.instrument.Tag', + 'io.micrometer.core.instrument.Tags', + 'io.micrometer.core.instrument.Timer', + 'io.micrometer.core.instrument.Timer$Builder', + 'io.micrometer.core.instrument.Timer$Sample', + 'io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics', + 'io.micrometer.core.instrument.composite.CompositeMeterRegistry', + 'io.micrometer.core.instrument.search.Search', 'kotlin.collections.ArraysKt', 'kotlin.jvm.JvmClassMappingKt', 'kotlin.jvm.functions.Function0', @@ -168,14 +177,7 @@ thirdPartyAudit { 'kotlin.jvm.internal.markers.KMappedMarker', 'kotlin.reflect.KClass', 'kotlin.reflect.KDeclarationContainer', - 'kotlin.sequences.Sequence', - 'org.osgi.framework.BundleActivator', - 'org.osgi.framework.BundleContext', - 'org.slf4j.impl.StaticLoggerBinder', - 'org.slf4j.impl.StaticMDCBinder', - 'org.slf4j.impl.StaticMarkerBinder', - 'reactor.blockhound.BlockHound$Builder', - 'reactor.blockhound.integration.BlockHoundIntegration' + 'kotlin.sequences.Sequence' ) ignoreViolations( diff --git a/plugins/repository-azure/licenses/azure-storage-blob-12.14.1.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-blob-12.14.1.jar.sha1 deleted file mode 100644 index d9c6f462089e3..0000000000000 --- a/plugins/repository-azure/licenses/azure-storage-blob-12.14.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -384763aef32d779ee22ef3faa03049fee7e0f6de \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-storage-blob-12.14.4.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-blob-12.14.4.jar.sha1 new file mode 100644 index 0000000000000..5333f8fa90ada --- /dev/null +++ b/plugins/repository-azure/licenses/azure-storage-blob-12.14.4.jar.sha1 @@ -0,0 +1 @@ +2b92020693d09e4980b96d278e8038a1087afea0 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactive-streams-1.0.3.jar.sha1 b/plugins/repository-azure/licenses/reactive-streams-1.0.3.jar.sha1 deleted file mode 100644 index 77210f7c7b402..0000000000000 --- a/plugins/repository-azure/licenses/reactive-streams-1.0.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d9fb7a7926ffa635b3dcaa5049fb2bfa25b3e7d0 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactive-streams-1.0.4.jar.sha1 b/plugins/repository-azure/licenses/reactive-streams-1.0.4.jar.sha1 new file mode 100644 index 0000000000000..45a80e3f7e361 --- /dev/null +++ b/plugins/repository-azure/licenses/reactive-streams-1.0.4.jar.sha1 @@ -0,0 +1 @@ +3864a1320d97d7b045f729a326e1e077661f31b7 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-core-3.4.23.jar.sha1 b/plugins/repository-azure/licenses/reactor-core-3.4.23.jar.sha1 deleted file mode 100644 index e398f1672188c..0000000000000 --- a/plugins/repository-azure/licenses/reactor-core-3.4.23.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -94bb06e2c4e6968c6faf4f5363cb278351f44a6a \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-core-3.4.34.jar.sha1 b/plugins/repository-azure/licenses/reactor-core-3.4.34.jar.sha1 new file mode 100644 index 0000000000000..12ad7039d140e --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-core-3.4.34.jar.sha1 @@ -0,0 +1 @@ +acd10fd94f7a04b49253ef044f4fbf37a54aec40 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-1.0.39.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-1.0.39.jar.sha1 new file mode 100644 index 0000000000000..fec4e01a88578 --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-1.0.39.jar.sha1 @@ -0,0 +1 @@ +db2590d899a11a58cac9ff8e71c33acf10d2e3f1 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-1.1.2.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-1.1.2.jar.sha1 deleted file mode 100644 index 5198e6caabe07..0000000000000 --- a/plugins/repository-azure/licenses/reactor-netty-1.1.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e3bc060179a0776016f629e3b1a1d1c8e51b7112 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.0.24.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.0.24.jar.sha1 deleted file mode 100644 index 3f5c8670c6c00..0000000000000 --- a/plugins/repository-azure/licenses/reactor-netty-core-1.0.24.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -feaecb39237170aafb23935e9b383e8dda281379 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.0.39.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.0.39.jar.sha1 new file mode 100644 index 0000000000000..4e00b2c6bd6ef --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-core-1.0.39.jar.sha1 @@ -0,0 +1 @@ +67c01cb2b23f2393506f8387f212780e3c53cdfd \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.0.24.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.0.24.jar.sha1 deleted file mode 100644 index aa0ca72e38cd0..0000000000000 --- a/plugins/repository-azure/licenses/reactor-netty-http-1.0.24.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2fac480a17f752335318f103ab91427bdfb7716a \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.0.39.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.0.39.jar.sha1 new file mode 100644 index 0000000000000..dfef8d2d844e2 --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-http-1.0.39.jar.sha1 @@ -0,0 +1 @@ +dbdf614dbfd8ad3f50108c9ca8d440c05f33a18e \ No newline at end of file