diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index ec71750438679..99d08a85d94b4 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.7.0-snapshot-4d1ed9e
+lucene            = 9.7.0-snapshot-204acc3
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 20.0.1+9
diff --git a/libs/core/build.gradle b/libs/core/build.gradle
index 696ea11f5be50..6c6fc745b5942 100644
--- a/libs/core/build.gradle
+++ b/libs/core/build.gradle
@@ -103,13 +103,23 @@ tasks.named('forbiddenApisMain').configure {
 tasks.named("thirdPartyAudit").configure {
   ignoreMissingClasses(
     // from log4j
-    'org.osgi.framework.Bundle',
-    'org.osgi.framework.BundleActivator',
-    'org.osgi.framework.BundleContext',
-    'org.osgi.framework.BundleEvent',
-    'org.osgi.framework.SynchronousBundleListener',
-    'org.osgi.framework.wiring.BundleWire',
-    'org.osgi.framework.wiring.BundleWiring'
+    *[
+        'org.osgi.framework.Bundle',
+        'org.osgi.framework.BundleActivator',
+        'org.osgi.framework.BundleContext',
+        'org.osgi.framework.BundleEvent',
+        'org.osgi.framework.SynchronousBundleListener',
+        'org.osgi.framework.wiring.BundleWire',
+        'org.osgi.framework.wiring.BundleWiring',
+    ]  + (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_20) ? [] : [
+       'jdk.incubator.vector.ByteVector',
+       'jdk.incubator.vector.FloatVector',
+       'jdk.incubator.vector.IntVector',
+       'jdk.incubator.vector.ShortVector',
+       'jdk.incubator.vector.Vector',
+       'jdk.incubator.vector.VectorOperators',
+       'jdk.incubator.vector.VectorSpecies'
+    ]
   )
 }
 
diff --git a/libs/core/licenses/lucene-core-9.7.0-snapshot-204acc3.jar.sha1 b/libs/core/licenses/lucene-core-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..2afe66c03cf22
--- /dev/null
+++ b/libs/core/licenses/lucene-core-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+3aa698cf90f074cbf24acfd7feaaad84c5a6f829
\ No newline at end of file
diff --git a/libs/core/licenses/lucene-core-9.7.0-snapshot-4d1ed9e.jar.sha1 b/libs/core/licenses/lucene-core-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 12114423683c2..0000000000000
--- a/libs/core/licenses/lucene-core-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e87d93868271da754a7c22517b3dbbcf84fc7f9
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.7.0-snapshot-204acc3.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..f70c327ab5f6b
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+c31671978777d97c026b13decfbef1d7eeed4410
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.7.0-snapshot-4d1ed9e.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 805927269dcdc..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-441c6341e75f06b834c992084f21556681963ea6
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0-snapshot-204acc3.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..b5c59c8f5ed8c
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+e31f7c161ad2b7652b1ac9100b4fa67d52be86eb
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0-snapshot-4d1ed9e.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 36207cb3ba7de..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5da04f8baf0d0961eee28fc1ca0dde93f58bd3e5
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0-snapshot-204acc3.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..e3f1d7afdc72a
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+ed13aaa5843c76ba8bb9fcd1cac6de8855ea7f1c
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0-snapshot-4d1ed9e.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 3d7e75eca8126..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5307fbb67bd0901e07d2987d4c3e33dc7d9dd62
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0-snapshot-204acc3.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..12210d41b4e6f
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+f8673a2b86d3868e9ef2745d1d3fa9ad5a63e84f
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0-snapshot-4d1ed9e.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 82f1d60f1970a..0000000000000
--- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-668dd1d3506840f6a258efda8a4f5e0ae0f069eb
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0-snapshot-204acc3.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..307d90ca834b6
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+f7a585d5f62033f19a5ec79b66a74cc24c9e9d10
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0-snapshot-4d1ed9e.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 96e07339bbebe..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df49e950d6463df63546b0989b46a717424b48c0
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0-snapshot-204acc3.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..b4e595a07ffda
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+40ba622c3aa91a0a8f2747617fef8f59bf212345
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0-snapshot-4d1ed9e.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 62fbf8fd39c73..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-06abcf12423dc8f115f2bb4c269b6ba2202245c2
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0-snapshot-204acc3.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..9b6dcc21465fa
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+e08432a3db0bde29f425812896bd695c5477b05f
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0-snapshot-4d1ed9e.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index b038010aa271f..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0c2f7b681c54ff2f174a894c0bcc26030d1644c2
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0-snapshot-204acc3.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..b70b4e8d6c35b
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+a44008e83286060f0265a32f9a9b586e86ec03b1
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0-snapshot-4d1ed9e.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 8a60f1eb31e08..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ac785becbaf914830deeb950626b850cd89efadf
\ No newline at end of file
diff --git a/server/build.gradle b/server/build.gradle
index 7e75368323cf2..a77fdc9062c5a 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -244,6 +244,7 @@ tasks.named("processResources").configure {
 
 tasks.named("thirdPartyAudit").configure {
     ignoreMissingClasses(
+        *[
             // from com.fasterxml.jackson.dataformat.yaml.YAMLMapper (jackson-dataformat-yaml)
             'com.fasterxml.jackson.databind.ObjectMapper',
 
@@ -337,6 +338,15 @@ tasks.named("thirdPartyAudit").configure {
             'com.google.common.geometry.S2Point',
             'com.google.common.geometry.S2$Metric',
             'com.google.common.geometry.S2LatLng'
+        ] + (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_20) ? [] : [
+            'jdk.incubator.vector.ByteVector',
+            'jdk.incubator.vector.FloatVector',
+            'jdk.incubator.vector.IntVector',
+            'jdk.incubator.vector.ShortVector',
+            'jdk.incubator.vector.Vector',
+            'jdk.incubator.vector.VectorOperators',
+            'jdk.incubator.vector.VectorSpecies'
+        ]
     )
     ignoreViolations(
             'com.google.protobuf.MessageSchema',
diff --git a/server/licenses/lucene-analysis-common-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-analysis-common-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..a770070d97c2d
--- /dev/null
+++ b/server/licenses/lucene-analysis-common-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+5aa5989b931c68eee90b22bca3f1f280a7d5c1ee
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-analysis-common-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 412b87be774e0..0000000000000
--- a/server/licenses/lucene-analysis-common-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d478df2acb5b224038a2380c15eec26a77bbce8b
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-backward-codecs-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..c35bc03c19097
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+2326fb4762cd14eff6bea770d5c85a848e7a2482
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-backward-codecs-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 690c3d6b5955d..0000000000000
--- a/server/licenses/lucene-backward-codecs-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-28c618f5e814cf05af94032f340d7cb79ea7dec2
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-core-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..2afe66c03cf22
--- /dev/null
+++ b/server/licenses/lucene-core-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+3aa698cf90f074cbf24acfd7feaaad84c5a6f829
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-core-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 12114423683c2..0000000000000
--- a/server/licenses/lucene-core-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e87d93868271da754a7c22517b3dbbcf84fc7f9
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-grouping-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..c7aaff3a0b184
--- /dev/null
+++ b/server/licenses/lucene-grouping-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+b3251c58b21c5c205c63bbe618c0d3c1393908e1
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-grouping-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 63b85475e130b..0000000000000
--- a/server/licenses/lucene-grouping-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b1b0674d8afa4ad78c1eccfb0b73064b5826631d
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-highlighter-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..6f9bfe7604f7f
--- /dev/null
+++ b/server/licenses/lucene-highlighter-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+2313a0755a5774eb5dfcdc116dc15bd9367c8cc1
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-highlighter-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index c69ef9d8ad17f..0000000000000
--- a/server/licenses/lucene-highlighter-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d376f4bad9ba6b9a2cc3fb4201cccfd7465cb54c
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-join-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..00b5c33be3568
--- /dev/null
+++ b/server/licenses/lucene-join-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+25fddcaf47d5614f48dc264f79151eb87990abd9
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-join-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 0b3f3bf35d4d6..0000000000000
--- a/server/licenses/lucene-join-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-757e3bdda4a34fb4a5ded85d34df5ea00dc4e310
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-memory-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..cf7eced4686aa
--- /dev/null
+++ b/server/licenses/lucene-memory-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+7c2aad4c1baa818a94bd787615e70824e6ae3a9d
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-memory-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 87965865e9f52..0000000000000
--- a/server/licenses/lucene-memory-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-daaf3d5424e6e474e860a7db92af4f490c627457
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-misc-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..b5ac7eb1f988b
--- /dev/null
+++ b/server/licenses/lucene-misc-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+56211acb2a31b1967568eba9953db502a53f9010
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-misc-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index ecbc173a2e2fc..0000000000000
--- a/server/licenses/lucene-misc-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c3c52d69784be7787e239631cc7b64f3e32ded4f
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-queries-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..2aa628ebc9573
--- /dev/null
+++ b/server/licenses/lucene-queries-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+c45b1847150e2e2e6302177b41faf95df2ca4fbf
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-queries-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 42b204fa512f3..0000000000000
--- a/server/licenses/lucene-queries-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8f10d4ff130928351a8c03f9c2d10188d0267d74
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-queryparser-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..5e7b5d9da9c0d
--- /dev/null
+++ b/server/licenses/lucene-queryparser-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+d40fe6400f21564ccb50b6716ec42d8dcd526b9d
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-queryparser-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index fb00bb91e49e7..0000000000000
--- a/server/licenses/lucene-queryparser-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-22bc9f5ca57b5b3c35b10075716ca6b2ab1e2f4c
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-sandbox-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..e45e9b929836b
--- /dev/null
+++ b/server/licenses/lucene-sandbox-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+e9347773d0b269768c58dd0b438bdc4b450f9185
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-sandbox-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 815fec16716c4..0000000000000
--- a/server/licenses/lucene-sandbox-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e88b9b8adb0e206a20482f47340cb65794d23330
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-spatial-extras-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..a697cb9fa2dff
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+7055502c9a77b9a93d1b96c99397fd765dd7891f
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-spatial-extras-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 6035ad3a79715..0000000000000
--- a/server/licenses/lucene-spatial-extras-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-85b32ddf62395219fe5bd7d5d9f70e81c9a41d34
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-spatial3d-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..3b96e448add5b
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+a2c5a7be5887dacf89c251936c3f3388ca20d28e
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-spatial3d-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 4ad2e869c9eb8..0000000000000
--- a/server/licenses/lucene-spatial3d-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-387188af30ac63d8e970b2f3043003b01ed001ca
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.7.0-snapshot-204acc3.jar.sha1 b/server/licenses/lucene-suggest-9.7.0-snapshot-204acc3.jar.sha1
new file mode 100644
index 0000000000000..0460861900897
--- /dev/null
+++ b/server/licenses/lucene-suggest-9.7.0-snapshot-204acc3.jar.sha1
@@ -0,0 +1 @@
+1a076a8db84fa85634cc4894ee4fc78b5e69525c
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.7.0-snapshot-4d1ed9e.jar.sha1 b/server/licenses/lucene-suggest-9.7.0-snapshot-4d1ed9e.jar.sha1
deleted file mode 100644
index 73f330f5a96ce..0000000000000
--- a/server/licenses/lucene-suggest-9.7.0-snapshot-4d1ed9e.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c9aa971ca1beaa1fe407417587343c0a356b9ad2
\ No newline at end of file
diff --git a/server/src/main/java/org/opensearch/index/search/MatchQuery.java b/server/src/main/java/org/opensearch/index/search/MatchQuery.java
index 91a4b456bfa2a..2c8b091fef8ef 100644
--- a/server/src/main/java/org/opensearch/index/search/MatchQuery.java
+++ b/server/src/main/java/org/opensearch/index/search/MatchQuery.java
@@ -56,6 +56,7 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.util.QueryBuilder;
+import org.apache.lucene.util.TermAndBoost;
 import org.apache.lucene.util.graph.GraphTokenStreamFiniteStrings;
 import org.opensearch.OpenSearchException;
 import org.opensearch.common.io.stream.StreamInput;
diff --git a/server/src/main/java/org/opensearch/index/search/MultiMatchQuery.java b/server/src/main/java/org/opensearch/index/search/MultiMatchQuery.java
index 241f05af2c512..554d9714409b7 100644
--- a/server/src/main/java/org/opensearch/index/search/MultiMatchQuery.java
+++ b/server/src/main/java/org/opensearch/index/search/MultiMatchQuery.java
@@ -42,6 +42,7 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.TermAndBoost;
 import org.opensearch.common.lucene.search.Queries;
 import org.opensearch.index.mapper.MappedFieldType;
 import org.opensearch.index.query.AbstractQueryBuilder;
diff --git a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java
index 27f3312626e48..b93cb64e32cfe 100644
--- a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java
@@ -222,6 +222,8 @@ public abstract class AnalysisFactoryTestCase extends OpenSearchTestCase {
         // LUCENE-10352
         .put("daitchmokotoffsoundex", Void.class)
         .put("persianstem", Void.class)
+        // https://github.com/apache/lucene/pull/12169
+        .put("word2vecsynonym", Void.class)
         .immutableMap();
 
     static final Map<String, Class<?>> KNOWN_CHARFILTERS = new MapBuilder<String, Class<?>>()