Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Bump versions of reactor-core and reactor-netty #11500

Merged
merged 5 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Bump `org.apache.zookeeper:zookeper` from 3.8.0 to 3.8.3 ([#11476](https://github.com/opensearch-project/OpenSearch/pull/11476))
- 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))
Expand Down
2 changes: 2 additions & 0 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,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

Expand Down
54 changes: 37 additions & 17 deletions plugins/repository-azure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ dependencies {
api "io.netty:netty-transport-native-unix-common:${versions.netty}"
implementation project(':modules:transport-netty4')
api 'com.azure:azure-storage-blob:12.14.4'
api 'org.reactivestreams:reactive-streams:1.0.3'
api 'io.projectreactor:reactor-core:3.4.23'
api 'io.projectreactor.netty:reactor-netty:1.0.16'
api 'io.projectreactor.netty:reactor-netty-core:1.0.24'
api 'io.projectreactor.netty:reactor-netty-http:1.0.24'
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}"
Expand Down Expand Up @@ -158,24 +158,44 @@ thirdPartyAudit {
'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter',
'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter$DEFAULT',
'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters',
'kotlin.collections.ArraysKt',
'kotlin.jvm.JvmClassMappingKt',
'kotlin.jvm.functions.Function0',
'kotlin.jvm.functions.Function1',
'kotlin.jvm.internal.FunctionReference',
'kotlin.jvm.internal.Intrinsics',
'kotlin.jvm.internal.Reflection',
'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'
'reactor.blockhound.integration.BlockHoundIntegration',
'io.micrometer.common.KeyValue',
'io.micrometer.common.KeyValues',
'io.micrometer.common.docs.KeyName',
'io.micrometer.context.ContextAccessor',
'io.micrometer.context.ContextRegistry',
'io.micrometer.context.ContextSnapshot',
'io.micrometer.context.ContextSnapshot$Scope',
'io.micrometer.context.ContextSnapshotFactory',
'io.micrometer.context.ContextSnapshotFactory$Builder',
'io.micrometer.context.ThreadLocalAccessor',
'io.micrometer.core.instrument.Meter$Type',
'io.micrometer.core.instrument.docs.MeterDocumentation',
'io.micrometer.observation.Observation',
'io.micrometer.observation.Observation$Context',
'io.micrometer.observation.docs.ObservationDocumentation',
'io.micrometer.observation.transport.ReceiverContext',
'io.micrometer.observation.transport.RequestReplyReceiverContext',
'io.micrometer.observation.transport.RequestReplySenderContext',
'io.micrometer.observation.transport.SenderContext',
'io.micrometer.tracing.Span',
'io.micrometer.tracing.Tracer',
'io.micrometer.tracing.docs.SpanDocumentation',
'io.micrometer.tracing.handler.PropagatingReceiverTracingObservationHandler',
'io.micrometer.tracing.handler.PropagatingSenderTracingObservationHandler',
'io.micrometer.tracing.propagation.Propagator',
'io.micrometer.core.instrument.observation.MeterObservationHandler',
'io.micrometer.core.instrument.Tags',
'io.micrometer.observation.ObservationHandler',
'io.micrometer.observation.ObservationRegistry',
'io.micrometer.observation.ObservationRegistry$ObservationConfig',
'io.micrometer.tracing.handler.DefaultTracingObservationHandler'
)

ignoreViolations(
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
db2299757f562261eb775d13658e86ff06f91e8a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fba199a8eca9363502766dc76aabf9ea3dfafa31

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
faea23e582978a34f6a932b81e86206ec2314990

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c5af7bc746050d080891a5446cca2c96a0c51d03
Loading