Merge branch 'main' into restore-snapshot

opensearch-project · Dec 30, 2022 · 39c7679 · 39c7679
2 parents 6beb70e + d248643
commit 39c7679
Show file tree

Hide file tree

Showing 154 changed files with 5,744 additions and 817 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add feature flag for extensions ([#5211](https://github.com/opensearch-project/OpenSearch/pull/5211))
 - Added jackson dependency to server ([#5366] (https://github.com/opensearch-project/OpenSearch/pull/5366))
 - Adding support to register settings dynamically ([#5495](https://github.com/opensearch-project/OpenSearch/pull/5495))
-- Added experimental support for extensions ([#5347](https://github.com/opensearch-project/OpenSearch/pull/5347)), ([#5518](https://github.com/opensearch-project/OpenSearch/pull/5518), ([#5597](https://github.com/opensearch-project/OpenSearch/pull/5597)))
+- Added experimental support for extensions ([#5347](https://github.com/opensearch-project/OpenSearch/pull/5347)), ([#5518](https://github.com/opensearch-project/OpenSearch/pull/5518), ([#5597](https://github.com/opensearch-project/OpenSearch/pull/5597)), ([#5615](https://github.com/opensearch-project/OpenSearch/pull/5615)))
 - Add CI bundle pattern to distribution download ([#5348](https://github.com/opensearch-project/OpenSearch/pull/5348))
 - Add support for ppc64le architecture ([#5459](https://github.com/opensearch-project/OpenSearch/pull/5459))
 
@@ -29,26 +29,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bumps `avro` from 1.11.0 to 1.11.1
 - Bumps `woodstox-core` from 6.3.0 to 6.3.1
 - Bumps `xmlbeans` from 5.1.0 to 5.1.1 ([#4354](https://github.com/opensearch-project/OpenSearch/pull/4354))
-- Bumps `azure-core-http-netty` from 1.12.0 to 1.12.4 ([#4160](https://github.com/opensearch-project/OpenSearch/pull/4160))
 - Bumps `azure-storage-common` from 12.18.0 to 12.18.1 ([#4164](https://github.com/opensearch-project/OpenSearch/pull/4664))
 - Bumps `org.gradle.test-retry` from 1.4.0 to 1.4.1 ([#4411](https://github.com/opensearch-project/OpenSearch/pull/4411))
 - Bumps `reactor-netty-core` from 1.0.19 to 1.0.22 ([#4447](https://github.com/opensearch-project/OpenSearch/pull/4447))
 - Bumps `reactive-streams` from 1.0.3 to 1.0.4 ([#4488](https://github.com/opensearch-project/OpenSearch/pull/4488))
 - Bumps `com.diffplug.spotless` from 6.10.0 to 6.11.0 ([#4547](https://github.com/opensearch-project/OpenSearch/pull/4547))
-- Bumps `reactor-core` from 3.4.18 to 3.4.23 ([#4548](https://github.com/opensearch-project/OpenSearch/pull/4548))
+- Bumps `reactor-core` from 3.4.23 to 3.5.1 ([#5604](https://github.com/opensearch-project/OpenSearch/pull/5604))
 - Bumps `jempbox` from 1.8.16 to 1.8.17 ([#4550](https://github.com/opensearch-project/OpenSearch/pull/4550))
 - Bumps `commons-compress` from 1.21 to 1.22
 - Bumps `jcodings` from 1.0.57 to 1.0.58 ([#5233](https://github.com/opensearch-project/OpenSearch/pull/5233))
 - Bumps `google-http-client-jackson2` from 1.35.0 to 1.42.3 ([#5234](https://github.com/opensearch-project/OpenSearch/pull/5234))
 - Bumps `azure-core` from 1.33.0 to 1.34.0 ([#5235](https://github.com/opensearch-project/OpenSearch/pull/5235))
 - Bumps `azure-core-http-netty` from 1.12.4 to 1.12.7 ([#5235](https://github.com/opensearch-project/OpenSearch/pull/5235))
-- Bumps `spock-core` from from 2.1-groovy-3.0 to 2.3-groovy-3.0 ([#5315](https://github.com/opensearch-project/OpenSearch/pull/5315))
+- Bumps `spock-core` from 2.1-groovy-3.0 to 2.3-groovy-3.0 ([#5315](https://github.com/opensearch-project/OpenSearch/pull/5315))
 - Bumps `json-schema-validator` from 1.0.69 to 1.0.73 ([#5316](https://github.com/opensearch-project/OpenSearch/pull/5316))
 - Bumps `proto-google-common-protos` from 2.8.0 to 2.10.0 ([#5318](https://github.com/opensearch-project/OpenSearch/pull/5318))
-- Bumps `protobuf-java` from 3.21.7 to 3.21.9 ([#5319](https://github.com/opensearch-project/OpenSearch/pull/5319))
-- Update Apache Lucene to 9.5.0-snapshot-a4ef70f ([#4979](https://github.com/opensearch-project/OpenSearch/pull/4979))
 - Update to Gradle 7.6 and JDK-19 ([#4973](https://github.com/opensearch-project/OpenSearch/pull/4973))
-- Bumps `protobuf-java` from 3.21.9 to 3.21.11 in /plugins/repository-hdfs ([#5519](https://github.com/opensearch-project/OpenSearch/pull/5519))
 - Update Apache Lucene to 9.5.0-snapshot-d5cef1c ([#5570](https://github.com/opensearch-project/OpenSearch/pull/5570))
 - Bump antlr4 from 4.9.3 to 4.11.1 ([#4546](https://github.com/opensearch-project/OpenSearch/pull/4546))
 - Bumps `maven-model` from 3.6.2 to 3.8.6 ([#5599](https://github.com/opensearch-project/OpenSearch/pull/5599))
@@ -82,12 +78,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Remove LegacyESVersion.V_7_6_ and V_7_7_ Constants ([#4837](https://github.com/opensearch-project/OpenSearch/pull/4837))
 - Remove LegacyESVersion.V_7_10_ Constants ([#5018](https://github.com/opensearch-project/OpenSearch/pull/5018))
 - Remove Version.V_1_ Constants ([#5021](https://github.com/opensearch-project/OpenSearch/pull/5021))
+- Remove --enable-preview feature flag since Apache Lucene now patches class files ([#5642](https://github.com/opensearch-project/OpenSearch/pull/5642))
 
 ### Fixed
 - Fix 'org.apache.hc.core5.http.ParseException: Invalid protocol version' under JDK 16+ ([#4827](https://github.com/opensearch-project/OpenSearch/pull/4827))
 - Fixed compression support for h2c protocol ([#4944](https://github.com/opensearch-project/OpenSearch/pull/4944))
 - Reject bulk requests with invalid actions ([#5299](https://github.com/opensearch-project/OpenSearch/issues/5299))
 - Support OpenSSL Provider with default Netty allocator ([#5460](https://github.com/opensearch-project/OpenSearch/pull/5460))
+- Increasing timeout of testQuorumRecovery to 90 seconds from 30 ([#5651](https://github.com/opensearch-project/OpenSearch/pull/5651))
 
 ### Security
 
@@ -101,7 +99,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bumps `azure-storage-blob` from 12.16.1 to 12.20.0 ([#4995](https://github.com/opensearch-project/OpenSearch/pull/4995))
 - Bumps `commons-compress` from 1.21 to 1.22 ([#5104](https://github.com/opensearch-project/OpenSearch/pull/5104))
 - Bump `opencensus-contrib-http-util` from 0.18.0 to 0.31.1 ([#3633](https://github.com/opensearch-project/OpenSearch/pull/3633))
-- Bump `geoip2` from 3.0.1 to 3.0.2 ([#5103](https://github.com/opensearch-project/OpenSearch/pull/5103))
+- Bump `geoip2` from 3.0.2 to 4.0.0 ([#5634](https://github.com/opensearch-project/OpenSearch/pull/5634))
 - Bump gradle-extra-configurations-plugin from 7.0.0 to 8.0.0 ([#4808](https://github.com/opensearch-project/OpenSearch/pull/4808))
 
 ### Changed
@@ -116,6 +114,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix case sensitivity for wildcard queries ([#5462](https://github.com/opensearch-project/OpenSearch/pull/5462))
 - Apply cluster manager throttling settings during bootstrap ([#5524](https://github.com/opensearch-project/OpenSearch/pull/5524))
 - Update thresholds map when cluster manager throttling setting is removed ([#5524](https://github.com/opensearch-project/OpenSearch/pull/5524))
+- Fix backward compatibility for static cluster manager throttling threshold setting ([#5633](https://github.com/opensearch-project/OpenSearch/pull/5633))
 ### Security
 
 [Unreleased 3.0]: https://github.com/opensearch-project/OpenSearch/compare/2.4...HEAD

diff --git a/build.gradle b/build.gradle
@@ -413,9 +413,6 @@ gradle.projectsEvaluated {
         if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_17) {
           task.jvmArgs += ["-Djava.security.manager=allow"]
         }
-        if (BuildParams.runtimeJavaVersion >= JavaVersion.VERSION_19) {
-          task.jvmArgs += ["--enable-preview"]
-        }
       }
     }
 

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.5.0-snapshot-6700b7e
+lucene            = 9.5.0-snapshot-0878271
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 19.0.1+10

diff --git a/distribution/src/config/jvm.options b/distribution/src/config/jvm.options
@@ -78,6 +78,3 @@ ${error.file}
 
 # Explicitly allow security manager (https://bugs.openjdk.java.net/browse/JDK-8270380)
 18-:-Djava.security.manager=allow
-
-# Allow mmap to use new JDK-19 preview APIs in Apache Lucene 9.4 (https://github.com/opensearch-project/OpenSearch/issues/4637)
-19-:--enable-preview
diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle
@@ -39,7 +39,7 @@ opensearchplugin {
 }
 
 dependencies {
-  api('com.maxmind.geoip2:geoip2:3.0.2')
+  api('com.maxmind.geoip2:geoip2:4.0.0')
   // geoip2 dependencies:
   api('com.maxmind.db:maxmind-db:3.0.0')
 

diff --git a/modules/ingest-geoip/licenses/geoip2-3.0.2.jar.sha1 b/modules/ingest-geoip/licenses/geoip2-3.0.2.jar.sha1
diff --git a/modules/ingest-geoip/licenses/geoip2-4.0.0.jar.sha1 b/modules/ingest-geoip/licenses/geoip2-4.0.0.jar.sha1
@@ -0,0 +1 @@
+4d6811f8c07aa7f121edbf797d26907b879df5f5
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-0878271.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+6912f9f9ceebbe5a54795035984709a4ada115e8
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-6700b7e.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+477512b093aa1dd55ea9340c3a16128f6722161b
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+89e9389e166bbd5e774d4b62acd75bf37481062e
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+928c3eb74edf7ab62ea7d0948703f2867299cb56
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+2d5640fe3a99b9af4c469243032b89dba32f7ab2
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+44c3ceefd4999b046b935d8737c26c1a835c8d5a
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-0878271.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+6da2070b19949a397e45f2b54a739cef403d0c94
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-0878271.jar.sha1 b/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+1803e928dd330599048b71386456fb90acbed5c1
diff --git a/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-6700b7e.jar.sha1 b/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle
@@ -56,7 +56,7 @@ dependencies {
   implementation project(':modules:transport-netty4')
   api 'com.azure:azure-storage-blob:12.20.0'
   api 'org.reactivestreams:reactive-streams:1.0.4'
-  api 'io.projectreactor:reactor-core:3.4.23'
+  api 'io.projectreactor:reactor-core:3.5.1'
   api 'io.projectreactor.netty:reactor-netty:1.0.18'
   api 'io.projectreactor.netty:reactor-netty-core:1.0.24'
   api 'io.projectreactor.netty:reactor-netty-http:1.0.24'
@@ -97,6 +97,10 @@ 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.context.ContextAccessor',
+    'io.micrometer.context.ContextRegistry',
+    'io.micrometer.context.ContextSnapshot',
+    'io.micrometer.context.ContextSnapshot$Scope',
     'io.micrometer.core.instrument.Clock',
     'io.micrometer.core.instrument.Counter',
     'io.micrometer.core.instrument.Counter$Builder',
@@ -156,17 +160,6 @@ 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',

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
diff --git a/plugins/repository-azure/licenses/reactor-core-3.5.1.jar.sha1 b/plugins/repository-azure/licenses/reactor-core-3.5.1.jar.sha1
@@ -0,0 +1 @@
+d1e833c13320d3a3133be6a70a4f1a82466f65fe
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml
@@ -824,6 +824,7 @@ setup:
       indices.forcemerge:
         index: test_1
         max_num_segments: 1
+        flush: true
 
   - do:
       search:

diff --git a/server/licenses/lucene-analysis-common-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-analysis-common-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+92c380f063c5b75efd6b3c48dffc942bfe21360f
diff --git a/server/licenses/lucene-analysis-common-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-analysis-common-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-backward-codecs-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+2f0f211b1ed0447135f84a36935625e9a33a98e5
diff --git a/server/licenses/lucene-backward-codecs-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-backward-codecs-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-core-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-core-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+1f8895d068b5d98c16d48f267a772d0243148040
diff --git a/server/licenses/lucene-core-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-core-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-grouping-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-grouping-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+f12819e51f145624ef7b1fd93aaa543cec13e3aa
diff --git a/server/licenses/lucene-grouping-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-grouping-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-highlighter-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-highlighter-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+ed88cca26580a32234e3f605cf963703ea99eb60
diff --git a/server/licenses/lucene-highlighter-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-highlighter-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-join-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-join-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+f51934b2362e827d9f467507624b773153f0ca01
diff --git a/server/licenses/lucene-join-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-join-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-memory-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-memory-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+54744097c6882a498c08ffd8a42b54da00c9420c
diff --git a/server/licenses/lucene-memory-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-memory-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-misc-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-misc-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+b9061dea1178e0cac86147d7b69fc53bf2f8ee58
diff --git a/server/licenses/lucene-misc-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-misc-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-queries-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-queries-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+eca07717c0ee563c5337222fd1a1b7ef5f03f34f
diff --git a/server/licenses/lucene-queries-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-queries-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-queryparser-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-queryparser-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+4d1ed21bc62940c4545778dc5f6249b67d08b095
diff --git a/server/licenses/lucene-queryparser-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-queryparser-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-sandbox-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-sandbox-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+c564c73080cff226a131847b4361bc9c2155f00c
diff --git a/server/licenses/lucene-sandbox-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-sandbox-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-spatial-extras-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+7a654fcc671e0372a9becd7c7cbd9a1f43569106
diff --git a/server/licenses/lucene-spatial-extras-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-spatial-extras-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-spatial3d-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+33c9c43eac6b4924155eeff03d2231c2bed9b169
diff --git a/server/licenses/lucene-spatial3d-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-spatial3d-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/licenses/lucene-suggest-9.5.0-snapshot-0878271.jar.sha1 b/server/licenses/lucene-suggest-9.5.0-snapshot-0878271.jar.sha1
@@ -0,0 +1 @@
+95a69fd51377d964d16057a4a9501665a2ca9a7a
diff --git a/server/licenses/lucene-suggest-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-suggest-9.5.0-snapshot-6700b7e.jar.sha1
diff --git a/server/src/internalClusterTest/java/org/opensearch/gateway/QuorumGatewayIT.java b/server/src/internalClusterTest/java/org/opensearch/gateway/QuorumGatewayIT.java
@@ -92,7 +92,7 @@ public void doAfterNodes(int numNodes, final Client activeClient) throws Excepti
                         logger.info("--> done cluster_health, status {}", clusterHealth.getStatus());
                         assertFalse(clusterHealth.isTimedOut());
                         assertEquals(ClusterHealthStatus.YELLOW, clusterHealth.getStatus());
-                    }, 30, TimeUnit.SECONDS);
+                    }, 90, TimeUnit.SECONDS);
 
                     logger.info("--> one node is closed -- index 1 document into the remaining nodes");
                     activeClient.prepareIndex("test")