From f65c07c9e897bf7c5ef8a0a1d3bdede13c679eb3 Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Tue, 15 Apr 2025 21:32:26 -0700
Subject: [PATCH 01/14] Upgrade lucene to version 10.2.0

Signed-off-by: expani <anijainc@amazon.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3268a05115033..c07451ca03f13 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 opensearch        = "3.1.0"
-lucene            = "10.1.0"
+lucene            = "10.2.1"
 
 bundled_jdk_vendor = "adoptium"
 bundled_jdk = "21.0.7+6"

From c4deeb67bda3b8160bff1319d70a2e9b96a5d304 Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Tue, 15 Apr 2025 21:42:06 -0700
Subject: [PATCH 02/14] Removed usage of non public constructor for
 DocIdSetBuilder

Signed-off-by: expani <anijainc@amazon.com>
---
 .../bucket/composite/PointsSortedDocsProducer.java            | 2 +-
 .../composite/UnsignedLongPointsSortedDocsProducer.java       | 2 +-
 .../search/approximate/ApproximatePointRangeQuery.java        | 4 ++--
 .../java/org/opensearch/search/query/BitmapIndexQuery.java    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/PointsSortedDocsProducer.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/PointsSortedDocsProducer.java
index dc130eb54c0ea..b4ac7f212a74c 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/PointsSortedDocsProducer.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/PointsSortedDocsProducer.java
@@ -86,7 +86,7 @@ DocIdSet processLeaf(Query query, CompositeValuesCollectorQueue queue, LeafReade
             upperBucket = (Long) upperValue;
         }
 
-        DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values, field) : null;
+        DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values) : null;
         Visitor visitor = new Visitor(context, queue, builder, values.getBytesPerDimension(), lowerBucket, upperBucket);
         try {
             values.intersect(visitor);
diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/UnsignedLongPointsSortedDocsProducer.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/UnsignedLongPointsSortedDocsProducer.java
index f391eb4f51169..fbece140836f8 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/UnsignedLongPointsSortedDocsProducer.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/UnsignedLongPointsSortedDocsProducer.java
@@ -61,7 +61,7 @@ DocIdSet processLeaf(Query query, CompositeValuesCollectorQueue queue, LeafReade
             }
             upperBucket = (BigInteger) upperValue;
         }
-        DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values, field) : null;
+        DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values) : null;
         Visitor visitor = new Visitor(
             context,
             queue,
diff --git a/server/src/main/java/org/opensearch/search/approximate/ApproximatePointRangeQuery.java b/server/src/main/java/org/opensearch/search/approximate/ApproximatePointRangeQuery.java
index ae3593537f674..6ebd0b1d18600 100644
--- a/server/src/main/java/org/opensearch/search/approximate/ApproximatePointRangeQuery.java
+++ b/server/src/main/java/org/opensearch/search/approximate/ApproximatePointRangeQuery.java
@@ -367,7 +367,7 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti
                     if (sortOrder == null || sortOrder.equals(SortOrder.ASC)) {
                         return new ScorerSupplier() {
 
-                            final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, pointRangeQuery.getField());
+                            final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values);
                             final PointValues.IntersectVisitor visitor = getIntersectVisitor(result, docCount);
                             long cost = -1;
 
@@ -395,7 +395,7 @@ public long cost() {
                         size += deletedDocs;
                         return new ScorerSupplier() {
 
-                            final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, pointRangeQuery.getField());
+                            final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values);
                             final PointValues.IntersectVisitor visitor = getIntersectVisitor(result, docCount);
                             long cost = -1;
 
diff --git a/server/src/main/java/org/opensearch/search/query/BitmapIndexQuery.java b/server/src/main/java/org/opensearch/search/query/BitmapIndexQuery.java
index 2451c3d8d7d4a..d84f7eb6feabf 100644
--- a/server/src/main/java/org/opensearch/search/query/BitmapIndexQuery.java
+++ b/server/src/main/java/org/opensearch/search/query/BitmapIndexQuery.java
@@ -112,7 +112,7 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti
                 return new ScorerSupplier() {
                     long cost = -1;
 
-                    final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, field);
+                    final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values);
                     final MergePointVisitor visitor = new MergePointVisitor(result);
 
                     @Override

From c2a255397edeb21f82d59416e340f1a245d625b9 Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Tue, 15 Apr 2025 21:51:03 -0700
Subject: [PATCH 03/14] Increment version and fixed another compilation error

Signed-off-by: expani <anijainc@amazon.com>
---
 .../search/aggregations/metrics/CardinalityAggregator.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
index f091b28ba5184..45544fbcd6e2b 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
@@ -358,7 +358,7 @@ private static class PruningCollector extends Collector {
                 postingMap.put(term, scorer);
             }
 
-            this.queue = new DisiPriorityQueue(postingMap.size());
+            this.queue = DisiPriorityQueue.ofMaxSize(postingMap.size());
             for (Scorer scorer : postingMap.values()) {
                 queue.add(new DisiWrapper(scorer, false));
             }

From 5af1184873ba541e94d346dcd0930eb92dc820da Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Tue, 15 Apr 2025 22:01:14 -0700
Subject: [PATCH 04/14] Updating license sha for lucene 10.2.0

Signed-off-by: expani <anijainc@amazon.com>
---
 libs/core/licenses/lucene-core-10.1.0.jar.sha1                   | 1 -
 libs/core/licenses/lucene-core-10.2.0.jar.sha1                   | 1 +
 .../lang-expression/licenses/lucene-expressions-10.1.0.jar.sha1  | 1 -
 .../lang-expression/licenses/lucene-expressions-10.2.0.jar.sha1  | 1 +
 .../analysis-icu/licenses/lucene-analysis-icu-10.1.0.jar.sha1    | 1 -
 .../analysis-icu/licenses/lucene-analysis-icu-10.2.0.jar.sha1    | 1 +
 .../licenses/lucene-analysis-kuromoji-10.1.0.jar.sha1            | 1 -
 .../licenses/lucene-analysis-kuromoji-10.2.0.jar.sha1            | 1 +
 .../analysis-nori/licenses/lucene-analysis-nori-10.1.0.jar.sha1  | 1 -
 .../analysis-nori/licenses/lucene-analysis-nori-10.2.0.jar.sha1  | 1 +
 .../licenses/lucene-analysis-phonetic-10.1.0.jar.sha1            | 1 -
 .../licenses/lucene-analysis-phonetic-10.2.0.jar.sha1            | 1 +
 .../licenses/lucene-analysis-smartcn-10.1.0.jar.sha1             | 1 -
 .../licenses/lucene-analysis-smartcn-10.2.0.jar.sha1             | 1 +
 .../licenses/lucene-analysis-stempel-10.1.0.jar.sha1             | 1 -
 .../licenses/lucene-analysis-stempel-10.2.0.jar.sha1             | 1 +
 .../licenses/lucene-analysis-morfologik-10.1.0.jar.sha1          | 1 -
 .../licenses/lucene-analysis-morfologik-10.2.0.jar.sha1          | 1 +
 server/licenses/lucene-analysis-common-10.1.0.jar.sha1           | 1 -
 server/licenses/lucene-analysis-common-10.2.0.jar.sha1           | 1 +
 server/licenses/lucene-backward-codecs-10.1.0.jar.sha1           | 1 -
 server/licenses/lucene-backward-codecs-10.2.0.jar.sha1           | 1 +
 server/licenses/lucene-core-10.1.0.jar.sha1                      | 1 -
 server/licenses/lucene-core-10.2.0.jar.sha1                      | 1 +
 server/licenses/lucene-grouping-10.1.0.jar.sha1                  | 1 -
 server/licenses/lucene-grouping-10.2.0.jar.sha1                  | 1 +
 server/licenses/lucene-highlighter-10.1.0.jar.sha1               | 1 -
 server/licenses/lucene-highlighter-10.2.0.jar.sha1               | 1 +
 server/licenses/lucene-join-10.1.0.jar.sha1                      | 1 -
 server/licenses/lucene-join-10.2.0.jar.sha1                      | 1 +
 server/licenses/lucene-memory-10.1.0.jar.sha1                    | 1 -
 server/licenses/lucene-memory-10.2.0.jar.sha1                    | 1 +
 server/licenses/lucene-misc-10.1.0.jar.sha1                      | 1 -
 server/licenses/lucene-misc-10.2.0.jar.sha1                      | 1 +
 server/licenses/lucene-queries-10.1.0.jar.sha1                   | 1 -
 server/licenses/lucene-queries-10.2.0.jar.sha1                   | 1 +
 server/licenses/lucene-queryparser-10.1.0.jar.sha1               | 1 -
 server/licenses/lucene-queryparser-10.2.0.jar.sha1               | 1 +
 server/licenses/lucene-sandbox-10.1.0.jar.sha1                   | 1 -
 server/licenses/lucene-sandbox-10.2.0.jar.sha1                   | 1 +
 server/licenses/lucene-spatial-extras-10.1.0.jar.sha1            | 1 -
 server/licenses/lucene-spatial-extras-10.2.0.jar.sha1            | 1 +
 server/licenses/lucene-spatial3d-10.1.0.jar.sha1                 | 1 -
 server/licenses/lucene-spatial3d-10.2.0.jar.sha1                 | 1 +
 server/licenses/lucene-suggest-10.1.0.jar.sha1                   | 1 -
 server/licenses/lucene-suggest-10.2.0.jar.sha1                   | 1 +
 test/framework/licenses/lucene-codecs-10.1.0.jar.sha1            | 1 -
 test/framework/licenses/lucene-codecs-10.2.0.jar.sha1            | 1 +
 test/framework/licenses/lucene-test-framework-10.1.0.jar.sha1    | 1 -
 test/framework/licenses/lucene-test-framework-10.2.0.jar.sha1    | 1 +
 50 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 libs/core/licenses/lucene-core-10.1.0.jar.sha1
 create mode 100644 libs/core/licenses/lucene-core-10.2.0.jar.sha1
 delete mode 100644 modules/lang-expression/licenses/lucene-expressions-10.1.0.jar.sha1
 create mode 100644 modules/lang-expression/licenses/lucene-expressions-10.2.0.jar.sha1
 delete mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-10.1.0.jar.sha1
 create mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.0.jar.sha1
 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.1.0.jar.sha1
 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.0.jar.sha1
 delete mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-10.1.0.jar.sha1
 create mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.0.jar.sha1
 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.1.0.jar.sha1
 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.0.jar.sha1
 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.1.0.jar.sha1
 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.0.jar.sha1
 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.1.0.jar.sha1
 create mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.0.jar.sha1
 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.1.0.jar.sha1
 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-analysis-common-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-analysis-common-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-backward-codecs-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-backward-codecs-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-core-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-core-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-grouping-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-grouping-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-highlighter-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-highlighter-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-join-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-join-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-memory-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-memory-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-misc-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-misc-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-queries-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-queries-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-queryparser-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-queryparser-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-sandbox-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-sandbox-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-spatial-extras-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-spatial-extras-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-spatial3d-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-spatial3d-10.2.0.jar.sha1
 delete mode 100644 server/licenses/lucene-suggest-10.1.0.jar.sha1
 create mode 100644 server/licenses/lucene-suggest-10.2.0.jar.sha1
 delete mode 100644 test/framework/licenses/lucene-codecs-10.1.0.jar.sha1
 create mode 100644 test/framework/licenses/lucene-codecs-10.2.0.jar.sha1
 delete mode 100644 test/framework/licenses/lucene-test-framework-10.1.0.jar.sha1
 create mode 100644 test/framework/licenses/lucene-test-framework-10.2.0.jar.sha1

diff --git a/libs/core/licenses/lucene-core-10.1.0.jar.sha1 b/libs/core/licenses/lucene-core-10.1.0.jar.sha1
deleted file mode 100644
index 1727275619d1f..0000000000000
--- a/libs/core/licenses/lucene-core-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-65d7670de89a72433ef374b332da679a484d3a1e
\ No newline at end of file
diff --git a/libs/core/licenses/lucene-core-10.2.0.jar.sha1 b/libs/core/licenses/lucene-core-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..10c7930a09062
--- /dev/null
+++ b/libs/core/licenses/lucene-core-10.2.0.jar.sha1
@@ -0,0 +1 @@
+478bae67d5750cf49125783dc0695f846a1372c4
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-10.1.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-10.1.0.jar.sha1
deleted file mode 100644
index 54b10c7848627..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5b2af7e4940909058dde5c707be7ddb266590309
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-10.2.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..82dedf21a258b
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-10.2.0.jar.sha1
@@ -0,0 +1 @@
+7b9cc250912378d7465b6cc3187fc6205abd3c26
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.1.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.1.0.jar.sha1
deleted file mode 100644
index 8de1c34f0c81f..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-93c315f11e5f6901595a5bd41e35224e081f4c84
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..95f640eab863c
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.0.jar.sha1
@@ -0,0 +1 @@
+67d8a3361ed9c229dfbde9bccf858d6d79da7057
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.1.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.1.0.jar.sha1
deleted file mode 100644
index deb1761045dc4..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5cbe34565be95b4dfe4386e7b8dc62eb9e9020e6
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..9c344a8f777a1
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.0.jar.sha1
@@ -0,0 +1 @@
+efc6ecb92555177b2d3fcc441467671ec273dcf4
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.1.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.1.0.jar.sha1
deleted file mode 100644
index 875e0a2ab10b5..0000000000000
--- a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ae634b73ddd2e5de044993bf2a5ab36aeeadbf99
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..a85ff066d27cc
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.0.jar.sha1
@@ -0,0 +1 @@
+f4a97da2038a7876f1145fccf36488a7d8ae7bde
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.1.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.1.0.jar.sha1
deleted file mode 100644
index 8d2cf1a59a754..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-62f9351b6ba692e948f0e4f718cf97e16962f441
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..67f17cdbda3d8
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.0.jar.sha1
@@ -0,0 +1 @@
+2a7a136433b3e905b53907e33597e0269373f893
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.1.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.1.0.jar.sha1
deleted file mode 100644
index 67271157d3883..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-277221f0ddfb8b21053cd154cb973c61631ec669
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..2d7cd2b36247d
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.0.jar.sha1
@@ -0,0 +1 @@
+93639c1da64b2aef30cf6702e93d5180791c8b3e
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.1.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.1.0.jar.sha1
deleted file mode 100644
index ceb636de044e1..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-980b7136dac6b375d621237488930e8bc3a664c7
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..fbdd78afc4e5d
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.0.jar.sha1
@@ -0,0 +1 @@
+e0e38524ac62bea0a414341619179a07b9f0d537
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.1.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.1.0.jar.sha1
deleted file mode 100644
index 127a8a25d2284..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b641b4a674c4c89d6cee7b28018aa378b933398b
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..04de5dacc8f45
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.0.jar.sha1
@@ -0,0 +1 @@
+a5a0cfc820714fd373d46f11911da240d8967e4f
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-10.1.0.jar.sha1 b/server/licenses/lucene-analysis-common-10.1.0.jar.sha1
deleted file mode 100644
index 779b248fcf495..0000000000000
--- a/server/licenses/lucene-analysis-common-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ddbc824a311d49a54f5808d5a01d5c52424c48b8
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-10.2.0.jar.sha1 b/server/licenses/lucene-analysis-common-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..a797cbbdad81d
--- /dev/null
+++ b/server/licenses/lucene-analysis-common-10.2.0.jar.sha1
@@ -0,0 +1 @@
+67a23f9619931409a6e9d5537a05c9d97247fb6c
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-10.1.0.jar.sha1 b/server/licenses/lucene-backward-codecs-10.1.0.jar.sha1
deleted file mode 100644
index a212225c34cb9..0000000000000
--- a/server/licenses/lucene-backward-codecs-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fbbebd58f1505cc70d73dbdbb8196bfc29b9cf08
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-10.2.0.jar.sha1 b/server/licenses/lucene-backward-codecs-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..4d40415e749f7
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-10.2.0.jar.sha1
@@ -0,0 +1 @@
+8c0235ecfe27f4fceaeeb7969dd227ce17cd6ddb
\ No newline at end of file
diff --git a/server/licenses/lucene-core-10.1.0.jar.sha1 b/server/licenses/lucene-core-10.1.0.jar.sha1
deleted file mode 100644
index 1727275619d1f..0000000000000
--- a/server/licenses/lucene-core-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-65d7670de89a72433ef374b332da679a484d3a1e
\ No newline at end of file
diff --git a/server/licenses/lucene-core-10.2.0.jar.sha1 b/server/licenses/lucene-core-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..10c7930a09062
--- /dev/null
+++ b/server/licenses/lucene-core-10.2.0.jar.sha1
@@ -0,0 +1 @@
+478bae67d5750cf49125783dc0695f846a1372c4
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-10.1.0.jar.sha1 b/server/licenses/lucene-grouping-10.1.0.jar.sha1
deleted file mode 100644
index 9a0a50f0afca7..0000000000000
--- a/server/licenses/lucene-grouping-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2f6409cbe456d5a9840969038173f0826f7ce4ff
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-10.2.0.jar.sha1 b/server/licenses/lucene-grouping-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..e9fef27f66c37
--- /dev/null
+++ b/server/licenses/lucene-grouping-10.2.0.jar.sha1
@@ -0,0 +1 @@
+73267127fea0769482b7b63cd119b39b6679a19b
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-10.1.0.jar.sha1 b/server/licenses/lucene-highlighter-10.1.0.jar.sha1
deleted file mode 100644
index 173b24a96da90..0000000000000
--- a/server/licenses/lucene-highlighter-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-db9c72d8606788e5cd3a5c97e0a8b57648c8c6d4
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-10.2.0.jar.sha1 b/server/licenses/lucene-highlighter-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..f96ea6cdeda02
--- /dev/null
+++ b/server/licenses/lucene-highlighter-10.2.0.jar.sha1
@@ -0,0 +1 @@
+fb34eab0fb706ffdfaf369520556a07f9f7cc54b
\ No newline at end of file
diff --git a/server/licenses/lucene-join-10.1.0.jar.sha1 b/server/licenses/lucene-join-10.1.0.jar.sha1
deleted file mode 100644
index 833dfeadd4f81..0000000000000
--- a/server/licenses/lucene-join-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8ae87dbc1ee0a044b72366eb750c40b269c52fd1
\ No newline at end of file
diff --git a/server/licenses/lucene-join-10.2.0.jar.sha1 b/server/licenses/lucene-join-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..624a212a781fc
--- /dev/null
+++ b/server/licenses/lucene-join-10.2.0.jar.sha1
@@ -0,0 +1 @@
+84b7b057ae517bf4c7bd6036f51ddf2ac1c82152
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-10.1.0.jar.sha1 b/server/licenses/lucene-memory-10.1.0.jar.sha1
deleted file mode 100644
index 836c18e425ce5..0000000000000
--- a/server/licenses/lucene-memory-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8f6a402ff8c40f28fe2debe3ca01c441ccbe5b2d
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-10.2.0.jar.sha1 b/server/licenses/lucene-memory-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..272fc3d5f0b09
--- /dev/null
+++ b/server/licenses/lucene-memory-10.2.0.jar.sha1
@@ -0,0 +1 @@
+714a12b09a865020fd00cf6e728b21dbd88320c2
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-10.1.0.jar.sha1 b/server/licenses/lucene-misc-10.1.0.jar.sha1
deleted file mode 100644
index abf5baa3a8602..0000000000000
--- a/server/licenses/lucene-misc-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ae1104521d00501e18e3c18c2b326f15589cc873
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-10.2.0.jar.sha1 b/server/licenses/lucene-misc-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..bb0fbabe0e124
--- /dev/null
+++ b/server/licenses/lucene-misc-10.2.0.jar.sha1
@@ -0,0 +1 @@
+1061fa8c4912366a6fe53a54b45cb3f7395c8c34
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-10.1.0.jar.sha1 b/server/licenses/lucene-queries-10.1.0.jar.sha1
deleted file mode 100644
index 33697dcb6ce74..0000000000000
--- a/server/licenses/lucene-queries-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-48584c8a650cb4ce33a7e25864474e0da8c9eb53
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-10.2.0.jar.sha1 b/server/licenses/lucene-queries-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..81735f0df5ebe
--- /dev/null
+++ b/server/licenses/lucene-queries-10.2.0.jar.sha1
@@ -0,0 +1 @@
+504c8c953a6fe37d65db1e3012d025aa0bed18de
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-10.1.0.jar.sha1 b/server/licenses/lucene-queryparser-10.1.0.jar.sha1
deleted file mode 100644
index 217b6e770740b..0000000000000
--- a/server/licenses/lucene-queryparser-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2774ab95128b0615568a4861b9a56f24511f774a
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-10.2.0.jar.sha1 b/server/licenses/lucene-queryparser-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..2ed2a8b193138
--- /dev/null
+++ b/server/licenses/lucene-queryparser-10.2.0.jar.sha1
@@ -0,0 +1 @@
+337985430619a3d57a1194dab426b3d1cb99def0
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-10.1.0.jar.sha1 b/server/licenses/lucene-sandbox-10.1.0.jar.sha1
deleted file mode 100644
index 9b44d2dc75154..0000000000000
--- a/server/licenses/lucene-sandbox-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1c10f36c5c2bb39ce5dd52af87834d5f0172b31d
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-10.2.0.jar.sha1 b/server/licenses/lucene-sandbox-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..344a9a124b24c
--- /dev/null
+++ b/server/licenses/lucene-sandbox-10.2.0.jar.sha1
@@ -0,0 +1 @@
+76c62ba19bbed71ce3e83476c4269d83144145ae
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-10.1.0.jar.sha1 b/server/licenses/lucene-spatial-extras-10.1.0.jar.sha1
deleted file mode 100644
index 5af6c28bf8d91..0000000000000
--- a/server/licenses/lucene-spatial-extras-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-601a8e6f9be21ad99fbc43d8fe222553e55ccf80
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-10.2.0.jar.sha1 b/server/licenses/lucene-spatial-extras-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..84802f5a12856
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-10.2.0.jar.sha1
@@ -0,0 +1 @@
+47bc4cc2f5a3acab1b89ed5ba6785433500acce7
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-10.1.0.jar.sha1 b/server/licenses/lucene-spatial3d-10.1.0.jar.sha1
deleted file mode 100644
index 6259680f363a5..0000000000000
--- a/server/licenses/lucene-spatial3d-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-59819cdc2b1af71dcb215284a2f48076b6d4235a
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-10.2.0.jar.sha1 b/server/licenses/lucene-spatial3d-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..351b2ca6a299d
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-10.2.0.jar.sha1
@@ -0,0 +1 @@
+9490a4145f461a7443ad5641777384bfd200ccdf
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-10.1.0.jar.sha1 b/server/licenses/lucene-suggest-10.1.0.jar.sha1
deleted file mode 100644
index 5d479ef0838ee..0000000000000
--- a/server/licenses/lucene-suggest-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-84c212cf954bb48b022511d63b362d9a0a282ecf
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-10.2.0.jar.sha1 b/server/licenses/lucene-suggest-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..66040f61f4ccf
--- /dev/null
+++ b/server/licenses/lucene-suggest-10.2.0.jar.sha1
@@ -0,0 +1 @@
+a7d66e2b1e36cfdcf0b5e3cbfc3305db66ed985e
\ No newline at end of file
diff --git a/test/framework/licenses/lucene-codecs-10.1.0.jar.sha1 b/test/framework/licenses/lucene-codecs-10.1.0.jar.sha1
deleted file mode 100644
index ab61c727ad3e7..0000000000000
--- a/test/framework/licenses/lucene-codecs-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c8c5a67a9718b24fc2e0fe958db3404254af628e
\ No newline at end of file
diff --git a/test/framework/licenses/lucene-codecs-10.2.0.jar.sha1 b/test/framework/licenses/lucene-codecs-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..b8b804ad23a3d
--- /dev/null
+++ b/test/framework/licenses/lucene-codecs-10.2.0.jar.sha1
@@ -0,0 +1 @@
+76288650fc68976660d08110e72ecd6636ada20a
\ No newline at end of file
diff --git a/test/framework/licenses/lucene-test-framework-10.1.0.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.1.0.jar.sha1
deleted file mode 100644
index 29df9ec4257d2..0000000000000
--- a/test/framework/licenses/lucene-test-framework-10.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1985bbbb74c358d2e2477eb467b867fc5a8d0e25
\ No newline at end of file
diff --git a/test/framework/licenses/lucene-test-framework-10.2.0.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.2.0.jar.sha1
new file mode 100644
index 0000000000000..7594b54073376
--- /dev/null
+++ b/test/framework/licenses/lucene-test-framework-10.2.0.jar.sha1
@@ -0,0 +1 @@
+e9fc1e2d2835a36f13de0692b0dad4f0c7fb59fa
\ No newline at end of file

From dabb77344fdf4164f05f6b6ed42cf7a1a1b128c1 Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Tue, 15 Apr 2025 22:52:41 -0700
Subject: [PATCH 05/14] Upgraded icu4j in conjunction with Lucene 10.2.0

Signed-off-by: expani <anijainc@amazon.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c07451ca03f13..4c75ba5344f24 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ jts               = "1.15.0"
 jackson           = "2.18.2"
 jackson_databind  = "2.18.2"
 snakeyaml         = "2.1"
-icu4j             = "75.1"
+icu4j             = "77.1"
 supercsv          = "2.4.0"
 log4j             = "2.21.0"
 slf4j             = "1.7.36"

From 42f3e2f2ff58b9c552a62d808e75ddfade10edd4 Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Tue, 15 Apr 2025 22:53:32 -0700
Subject: [PATCH 06/14] update sha for icu4j

Signed-off-by: expani <anijainc@amazon.com>
---
 plugins/analysis-icu/licenses/icu4j-75.1.jar.sha1 | 1 -
 plugins/analysis-icu/licenses/icu4j-77.1.jar.sha1 | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 plugins/analysis-icu/licenses/icu4j-75.1.jar.sha1
 create mode 100644 plugins/analysis-icu/licenses/icu4j-77.1.jar.sha1

diff --git a/plugins/analysis-icu/licenses/icu4j-75.1.jar.sha1 b/plugins/analysis-icu/licenses/icu4j-75.1.jar.sha1
deleted file mode 100644
index 4ee1fbe23b117..0000000000000
--- a/plugins/analysis-icu/licenses/icu4j-75.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e8f8dcc2967f5ec2cfae185172293adfa5599b78
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/icu4j-77.1.jar.sha1 b/plugins/analysis-icu/licenses/icu4j-77.1.jar.sha1
new file mode 100644
index 0000000000000..636c32be4c8c2
--- /dev/null
+++ b/plugins/analysis-icu/licenses/icu4j-77.1.jar.sha1
@@ -0,0 +1 @@
+38693cf0b1d7362a8b726af74dc06026a7c23809
\ No newline at end of file

From 41eb98965b9f1b3ccc62a23a20d043de6a916492 Mon Sep 17 00:00:00 2001
From: Andrew Ross <andrross@amazon.com>
Date: Thu, 1 May 2025 22:30:57 +0000
Subject: [PATCH 07/14] Update to 10.2.1

Signed-off-by: Andrew Ross <andrross@amazon.com>
---
 libs/core/licenses/lucene-core-10.2.0.jar.sha1                  | 1 -
 libs/core/licenses/lucene-core-10.2.1.jar.sha1                  | 1 +
 libs/core/src/main/java/org/opensearch/Version.java             | 2 +-
 .../lang-expression/licenses/lucene-expressions-10.2.0.jar.sha1 | 1 -
 .../lang-expression/licenses/lucene-expressions-10.2.1.jar.sha1 | 1 +
 .../analysis-icu/licenses/lucene-analysis-icu-10.2.0.jar.sha1   | 1 -
 .../analysis-icu/licenses/lucene-analysis-icu-10.2.1.jar.sha1   | 1 +
 .../licenses/lucene-analysis-kuromoji-10.2.0.jar.sha1           | 1 -
 .../licenses/lucene-analysis-kuromoji-10.2.1.jar.sha1           | 1 +
 .../analysis-nori/licenses/lucene-analysis-nori-10.2.0.jar.sha1 | 1 -
 .../analysis-nori/licenses/lucene-analysis-nori-10.2.1.jar.sha1 | 1 +
 .../licenses/lucene-analysis-phonetic-10.2.0.jar.sha1           | 1 -
 .../licenses/lucene-analysis-phonetic-10.2.1.jar.sha1           | 1 +
 .../licenses/lucene-analysis-smartcn-10.2.0.jar.sha1            | 1 -
 .../licenses/lucene-analysis-smartcn-10.2.1.jar.sha1            | 1 +
 .../licenses/lucene-analysis-stempel-10.2.0.jar.sha1            | 1 -
 .../licenses/lucene-analysis-stempel-10.2.1.jar.sha1            | 1 +
 .../licenses/lucene-analysis-morfologik-10.2.0.jar.sha1         | 1 -
 .../licenses/lucene-analysis-morfologik-10.2.1.jar.sha1         | 1 +
 server/licenses/lucene-analysis-common-10.2.0.jar.sha1          | 1 -
 server/licenses/lucene-analysis-common-10.2.1.jar.sha1          | 1 +
 server/licenses/lucene-backward-codecs-10.2.0.jar.sha1          | 1 -
 server/licenses/lucene-backward-codecs-10.2.1.jar.sha1          | 1 +
 server/licenses/lucene-core-10.2.0.jar.sha1                     | 1 -
 server/licenses/lucene-core-10.2.1.jar.sha1                     | 1 +
 server/licenses/lucene-grouping-10.2.0.jar.sha1                 | 1 -
 server/licenses/lucene-grouping-10.2.1.jar.sha1                 | 1 +
 server/licenses/lucene-highlighter-10.2.0.jar.sha1              | 1 -
 server/licenses/lucene-highlighter-10.2.1.jar.sha1              | 1 +
 server/licenses/lucene-join-10.2.0.jar.sha1                     | 1 -
 server/licenses/lucene-join-10.2.1.jar.sha1                     | 1 +
 server/licenses/lucene-memory-10.2.0.jar.sha1                   | 1 -
 server/licenses/lucene-memory-10.2.1.jar.sha1                   | 1 +
 server/licenses/lucene-misc-10.2.0.jar.sha1                     | 1 -
 server/licenses/lucene-misc-10.2.1.jar.sha1                     | 1 +
 server/licenses/lucene-queries-10.2.0.jar.sha1                  | 1 -
 server/licenses/lucene-queries-10.2.1.jar.sha1                  | 1 +
 server/licenses/lucene-queryparser-10.2.0.jar.sha1              | 1 -
 server/licenses/lucene-queryparser-10.2.1.jar.sha1              | 1 +
 server/licenses/lucene-sandbox-10.2.0.jar.sha1                  | 1 -
 server/licenses/lucene-sandbox-10.2.1.jar.sha1                  | 1 +
 server/licenses/lucene-spatial-extras-10.2.0.jar.sha1           | 1 -
 server/licenses/lucene-spatial-extras-10.2.1.jar.sha1           | 1 +
 server/licenses/lucene-spatial3d-10.2.0.jar.sha1                | 1 -
 server/licenses/lucene-spatial3d-10.2.1.jar.sha1                | 1 +
 server/licenses/lucene-suggest-10.2.0.jar.sha1                  | 1 -
 server/licenses/lucene-suggest-10.2.1.jar.sha1                  | 1 +
 test/framework/licenses/lucene-codecs-10.2.0.jar.sha1           | 1 -
 test/framework/licenses/lucene-codecs-10.2.1.jar.sha1           | 1 +
 test/framework/licenses/lucene-test-framework-10.2.0.jar.sha1   | 1 -
 test/framework/licenses/lucene-test-framework-10.2.1.jar.sha1   | 1 +
 51 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 libs/core/licenses/lucene-core-10.2.0.jar.sha1
 create mode 100644 libs/core/licenses/lucene-core-10.2.1.jar.sha1
 delete mode 100644 modules/lang-expression/licenses/lucene-expressions-10.2.0.jar.sha1
 create mode 100644 modules/lang-expression/licenses/lucene-expressions-10.2.1.jar.sha1
 delete mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.0.jar.sha1
 create mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.1.jar.sha1
 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.0.jar.sha1
 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.1.jar.sha1
 delete mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.0.jar.sha1
 create mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.1.jar.sha1
 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.0.jar.sha1
 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.1.jar.sha1
 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.0.jar.sha1
 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.1.jar.sha1
 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.0.jar.sha1
 create mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.1.jar.sha1
 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.0.jar.sha1
 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-analysis-common-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-analysis-common-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-backward-codecs-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-backward-codecs-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-core-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-core-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-grouping-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-grouping-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-highlighter-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-highlighter-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-join-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-join-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-memory-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-memory-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-misc-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-misc-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-queries-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-queries-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-queryparser-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-queryparser-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-sandbox-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-sandbox-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-spatial-extras-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-spatial-extras-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-spatial3d-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-spatial3d-10.2.1.jar.sha1
 delete mode 100644 server/licenses/lucene-suggest-10.2.0.jar.sha1
 create mode 100644 server/licenses/lucene-suggest-10.2.1.jar.sha1
 delete mode 100644 test/framework/licenses/lucene-codecs-10.2.0.jar.sha1
 create mode 100644 test/framework/licenses/lucene-codecs-10.2.1.jar.sha1
 delete mode 100644 test/framework/licenses/lucene-test-framework-10.2.0.jar.sha1
 create mode 100644 test/framework/licenses/lucene-test-framework-10.2.1.jar.sha1

diff --git a/libs/core/licenses/lucene-core-10.2.0.jar.sha1 b/libs/core/licenses/lucene-core-10.2.0.jar.sha1
deleted file mode 100644
index 10c7930a09062..0000000000000
--- a/libs/core/licenses/lucene-core-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-478bae67d5750cf49125783dc0695f846a1372c4
\ No newline at end of file
diff --git a/libs/core/licenses/lucene-core-10.2.1.jar.sha1 b/libs/core/licenses/lucene-core-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..f360d25f42954
--- /dev/null
+++ b/libs/core/licenses/lucene-core-10.2.1.jar.sha1
@@ -0,0 +1 @@
+f7bee3425ff6bff5e3ba50abfa1a0fdab2b2e46f
\ No newline at end of file
diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java
index 9700609a26435..c939a963491ac 100644
--- a/libs/core/src/main/java/org/opensearch/Version.java
+++ b/libs/core/src/main/java/org/opensearch/Version.java
@@ -117,7 +117,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_19_1 = new Version(2190199, org.apache.lucene.util.Version.LUCENE_9_12_1);
     public static final Version V_2_19_2 = new Version(2190299, org.apache.lucene.util.Version.LUCENE_9_12_1);
     public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_10_1_0);
-    public static final Version V_3_1_0 = new Version(3010099, org.apache.lucene.util.Version.LUCENE_10_1_0);
+    public static final Version V_3_1_0 = new Version(3010099, org.apache.lucene.util.Version.LUCENE_10_2_1);
     public static final Version CURRENT = V_3_1_0;
 
     public static Version fromId(int id) {
diff --git a/modules/lang-expression/licenses/lucene-expressions-10.2.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-10.2.0.jar.sha1
deleted file mode 100644
index 82dedf21a258b..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7b9cc250912378d7465b6cc3187fc6205abd3c26
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-10.2.1.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..e61310c824115
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-10.2.1.jar.sha1
@@ -0,0 +1 @@
+7704566e72d10bd73bea5ee0a7cfcdc98b9f50cf
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.0.jar.sha1
deleted file mode 100644
index 95f640eab863c..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-67d8a3361ed9c229dfbde9bccf858d6d79da7057
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.1.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..b75967aa56072
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.1.jar.sha1
@@ -0,0 +1 @@
+4ffa9bc8accae6d5a4c988653d1fd12d6384bc63
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.0.jar.sha1
deleted file mode 100644
index 9c344a8f777a1..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-efc6ecb92555177b2d3fcc441467671ec273dcf4
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.1.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..bc4b7769c163d
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.1.jar.sha1
@@ -0,0 +1 @@
+3c37f5e3b1177a55ec8953ec343af5c578a02f40
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.0.jar.sha1
deleted file mode 100644
index a85ff066d27cc..0000000000000
--- a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f4a97da2038a7876f1145fccf36488a7d8ae7bde
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.1.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..8e01a01875a39
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.1.jar.sha1
@@ -0,0 +1 @@
+df44aacdf3a1ef743f42e53dca65590b95bbcbdf
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.0.jar.sha1
deleted file mode 100644
index 67f17cdbda3d8..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a7a136433b3e905b53907e33597e0269373f893
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.1.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..52e057a61ef14
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.1.jar.sha1
@@ -0,0 +1 @@
+026d48b44b17dff97ae5afd9007b124410ede1d1
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.0.jar.sha1
deleted file mode 100644
index 2d7cd2b36247d..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-93639c1da64b2aef30cf6702e93d5180791c8b3e
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.1.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..3ba2f3ca6089b
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.1.jar.sha1
@@ -0,0 +1 @@
+e9c9447fd1729bdfa4b284fdfe52202300a0be8c
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.0.jar.sha1
deleted file mode 100644
index fbdd78afc4e5d..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e0e38524ac62bea0a414341619179a07b9f0d537
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.1.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..4c7cfeda31e0b
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.1.jar.sha1
@@ -0,0 +1 @@
+80a5c751308add50f6d1d33acbfafd58d27b8b55
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.0.jar.sha1
deleted file mode 100644
index 04de5dacc8f45..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a5a0cfc820714fd373d46f11911da240d8967e4f
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..5a037c071e870
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.1.jar.sha1
@@ -0,0 +1 @@
+68df86cb2c1dddc3937824ea2cbe7803bf543ca1
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-10.2.0.jar.sha1 b/server/licenses/lucene-analysis-common-10.2.0.jar.sha1
deleted file mode 100644
index a797cbbdad81d..0000000000000
--- a/server/licenses/lucene-analysis-common-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-67a23f9619931409a6e9d5537a05c9d97247fb6c
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-10.2.1.jar.sha1 b/server/licenses/lucene-analysis-common-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..f5467fe100017
--- /dev/null
+++ b/server/licenses/lucene-analysis-common-10.2.1.jar.sha1
@@ -0,0 +1 @@
+82578c7a8804490f1f375ccf63e080afb8c0736b
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-10.2.0.jar.sha1 b/server/licenses/lucene-backward-codecs-10.2.0.jar.sha1
deleted file mode 100644
index 4d40415e749f7..0000000000000
--- a/server/licenses/lucene-backward-codecs-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8c0235ecfe27f4fceaeeb7969dd227ce17cd6ddb
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-10.2.1.jar.sha1 b/server/licenses/lucene-backward-codecs-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..c2b0665faeee2
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-10.2.1.jar.sha1
@@ -0,0 +1 @@
+32eef677c300ac9989bda1045904adf8e925b9eb
\ No newline at end of file
diff --git a/server/licenses/lucene-core-10.2.0.jar.sha1 b/server/licenses/lucene-core-10.2.0.jar.sha1
deleted file mode 100644
index 10c7930a09062..0000000000000
--- a/server/licenses/lucene-core-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-478bae67d5750cf49125783dc0695f846a1372c4
\ No newline at end of file
diff --git a/server/licenses/lucene-core-10.2.1.jar.sha1 b/server/licenses/lucene-core-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..f360d25f42954
--- /dev/null
+++ b/server/licenses/lucene-core-10.2.1.jar.sha1
@@ -0,0 +1 @@
+f7bee3425ff6bff5e3ba50abfa1a0fdab2b2e46f
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-10.2.0.jar.sha1 b/server/licenses/lucene-grouping-10.2.0.jar.sha1
deleted file mode 100644
index e9fef27f66c37..0000000000000
--- a/server/licenses/lucene-grouping-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-73267127fea0769482b7b63cd119b39b6679a19b
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-10.2.1.jar.sha1 b/server/licenses/lucene-grouping-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..da0012d3366c0
--- /dev/null
+++ b/server/licenses/lucene-grouping-10.2.1.jar.sha1
@@ -0,0 +1 @@
+5d5069134efb0c6b482c2dcfecf8a90acf1ee03a
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-10.2.0.jar.sha1 b/server/licenses/lucene-highlighter-10.2.0.jar.sha1
deleted file mode 100644
index f96ea6cdeda02..0000000000000
--- a/server/licenses/lucene-highlighter-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fb34eab0fb706ffdfaf369520556a07f9f7cc54b
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-10.2.1.jar.sha1 b/server/licenses/lucene-highlighter-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..87da130de145c
--- /dev/null
+++ b/server/licenses/lucene-highlighter-10.2.1.jar.sha1
@@ -0,0 +1 @@
+4166f6ddb748bfab3355ef29253377c60ef5c440
\ No newline at end of file
diff --git a/server/licenses/lucene-join-10.2.0.jar.sha1 b/server/licenses/lucene-join-10.2.0.jar.sha1
deleted file mode 100644
index 624a212a781fc..0000000000000
--- a/server/licenses/lucene-join-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-84b7b057ae517bf4c7bd6036f51ddf2ac1c82152
\ No newline at end of file
diff --git a/server/licenses/lucene-join-10.2.1.jar.sha1 b/server/licenses/lucene-join-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..31da038f1f7ed
--- /dev/null
+++ b/server/licenses/lucene-join-10.2.1.jar.sha1
@@ -0,0 +1 @@
+ef2fe517b73f4b144b9ada326ae69c8f3e996042
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-10.2.0.jar.sha1 b/server/licenses/lucene-memory-10.2.0.jar.sha1
deleted file mode 100644
index 272fc3d5f0b09..0000000000000
--- a/server/licenses/lucene-memory-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-714a12b09a865020fd00cf6e728b21dbd88320c2
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-10.2.1.jar.sha1 b/server/licenses/lucene-memory-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..f05eac3cae8b8
--- /dev/null
+++ b/server/licenses/lucene-memory-10.2.1.jar.sha1
@@ -0,0 +1 @@
+7e595a1dff0859818dea02729123c3e1b2520e7f
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-10.2.0.jar.sha1 b/server/licenses/lucene-misc-10.2.0.jar.sha1
deleted file mode 100644
index bb0fbabe0e124..0000000000000
--- a/server/licenses/lucene-misc-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1061fa8c4912366a6fe53a54b45cb3f7395c8c34
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-10.2.1.jar.sha1 b/server/licenses/lucene-misc-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..d7760b85d295c
--- /dev/null
+++ b/server/licenses/lucene-misc-10.2.1.jar.sha1
@@ -0,0 +1 @@
+d4244b7b5f406e40d3f9805a5cb056e351242e86
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-10.2.0.jar.sha1 b/server/licenses/lucene-queries-10.2.0.jar.sha1
deleted file mode 100644
index 81735f0df5ebe..0000000000000
--- a/server/licenses/lucene-queries-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-504c8c953a6fe37d65db1e3012d025aa0bed18de
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-10.2.1.jar.sha1 b/server/licenses/lucene-queries-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..25490eabeb4c1
--- /dev/null
+++ b/server/licenses/lucene-queries-10.2.1.jar.sha1
@@ -0,0 +1 @@
+ddb958b144351a7e693d8866d086aed443792ff6
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-10.2.0.jar.sha1 b/server/licenses/lucene-queryparser-10.2.0.jar.sha1
deleted file mode 100644
index 2ed2a8b193138..0000000000000
--- a/server/licenses/lucene-queryparser-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-337985430619a3d57a1194dab426b3d1cb99def0
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-10.2.1.jar.sha1 b/server/licenses/lucene-queryparser-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..1e50c6ee066a2
--- /dev/null
+++ b/server/licenses/lucene-queryparser-10.2.1.jar.sha1
@@ -0,0 +1 @@
+f9d7cb8ec0f9fc838326e499c4bd0cb044af75e2
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-10.2.0.jar.sha1 b/server/licenses/lucene-sandbox-10.2.0.jar.sha1
deleted file mode 100644
index 344a9a124b24c..0000000000000
--- a/server/licenses/lucene-sandbox-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-76c62ba19bbed71ce3e83476c4269d83144145ae
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-10.2.1.jar.sha1 b/server/licenses/lucene-sandbox-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..32ae932e17415
--- /dev/null
+++ b/server/licenses/lucene-sandbox-10.2.1.jar.sha1
@@ -0,0 +1 @@
+ec539453eb49dd9e02f8ff4b14dc36a08f91436f
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-10.2.0.jar.sha1 b/server/licenses/lucene-spatial-extras-10.2.0.jar.sha1
deleted file mode 100644
index 84802f5a12856..0000000000000
--- a/server/licenses/lucene-spatial-extras-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-47bc4cc2f5a3acab1b89ed5ba6785433500acce7
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-10.2.1.jar.sha1 b/server/licenses/lucene-spatial-extras-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..eb4c90be55ddc
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-10.2.1.jar.sha1
@@ -0,0 +1 @@
+d89b7dc7e2c86b5e8184b60732211f762c074979
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-10.2.0.jar.sha1 b/server/licenses/lucene-spatial3d-10.2.0.jar.sha1
deleted file mode 100644
index 351b2ca6a299d..0000000000000
--- a/server/licenses/lucene-spatial3d-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9490a4145f461a7443ad5641777384bfd200ccdf
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-10.2.1.jar.sha1 b/server/licenses/lucene-spatial3d-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..443a346a67614
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-10.2.1.jar.sha1
@@ -0,0 +1 @@
+9935b848d1e92eb8938b0cc5ce1b3ee565b0e231
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-10.2.0.jar.sha1 b/server/licenses/lucene-suggest-10.2.0.jar.sha1
deleted file mode 100644
index 66040f61f4ccf..0000000000000
--- a/server/licenses/lucene-suggest-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7d66e2b1e36cfdcf0b5e3cbfc3305db66ed985e
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-10.2.1.jar.sha1 b/server/licenses/lucene-suggest-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..508370a40d148
--- /dev/null
+++ b/server/licenses/lucene-suggest-10.2.1.jar.sha1
@@ -0,0 +1 @@
+f798a0f8f3686a75bd3830610156d3b087299340
\ No newline at end of file
diff --git a/test/framework/licenses/lucene-codecs-10.2.0.jar.sha1 b/test/framework/licenses/lucene-codecs-10.2.0.jar.sha1
deleted file mode 100644
index b8b804ad23a3d..0000000000000
--- a/test/framework/licenses/lucene-codecs-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-76288650fc68976660d08110e72ecd6636ada20a
\ No newline at end of file
diff --git a/test/framework/licenses/lucene-codecs-10.2.1.jar.sha1 b/test/framework/licenses/lucene-codecs-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..31d4581b9a158
--- /dev/null
+++ b/test/framework/licenses/lucene-codecs-10.2.1.jar.sha1
@@ -0,0 +1 @@
+7fad476daca759c657ead0e83e46a343fd09d38d
\ No newline at end of file
diff --git a/test/framework/licenses/lucene-test-framework-10.2.0.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.2.0.jar.sha1
deleted file mode 100644
index 7594b54073376..0000000000000
--- a/test/framework/licenses/lucene-test-framework-10.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e9fc1e2d2835a36f13de0692b0dad4f0c7fb59fa
\ No newline at end of file
diff --git a/test/framework/licenses/lucene-test-framework-10.2.1.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.2.1.jar.sha1
new file mode 100644
index 0000000000000..2b65e36e16076
--- /dev/null
+++ b/test/framework/licenses/lucene-test-framework-10.2.1.jar.sha1
@@ -0,0 +1 @@
+f01401e66a71eca1a70d19cf8269f47d191b1a37
\ No newline at end of file

From 8e74188f9532db10b870e375450f7644a2f3ee29 Mon Sep 17 00:00:00 2001
From: Andrew Ross <andrross@amazon.com>
Date: Thu, 1 May 2025 23:17:54 +0000
Subject: [PATCH 08/14] Add changelog entry

Signed-off-by: Andrew Ross <andrross@amazon.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5309dd0d66b69..3ba5e6e76cac7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 
 ### Dependencies
+- Update Apache Lucene from 10.1.0 to 10.2.1 ([#17961](https://github.com/opensearch-project/OpenSearch/pull/17961))
 - Bump `com.google.code.gson:gson` from 2.12.1 to 2.13.0 ([#17923](https://github.com/opensearch-project/OpenSearch/pull/17923))
 - Bump `com.github.spotbugs:spotbugs-annotations` from 4.9.0 to 4.9.3 ([#17922](https://github.com/opensearch-project/OpenSearch/pull/17922))
 - Bump `com.microsoft.azure:msal4j` from 1.18.0 to 1.20.0 ([#17925](https://github.com/opensearch-project/OpenSearch/pull/17925))

From baaf1d2140eff2d9e33d19762be20ada1a311c09 Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Thu, 1 May 2025 23:01:00 -0700
Subject: [PATCH 09/14] Updated test based on Lucene-#14561

Signed-off-by: expani <anijainc@amazon.com>
---
 .../test/java/org/opensearch/search/query/QueryPhaseTests.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java b/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java
index ce15806327470..73333ea2c5706 100644
--- a/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java
+++ b/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java
@@ -988,7 +988,7 @@ public void testMinScore() throws Exception {
         context.trackTotalHitsUpTo(5);
 
         QueryPhase.executeInternal(context.withCleanQueryResult(), queryPhaseSearcher);
-        assertEquals(10, context.queryResult().topDocs().topDocs.totalHits.value());
+        assertTrue(context.queryResult().topDocs().topDocs.totalHits.value() >= 5);
 
         reader.close();
         dir.close();

From 569e848923ef46376302c6e083fa8a3f948fbad0 Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Fri, 2 May 2025 11:29:02 -0700
Subject: [PATCH 10/14] Updated test based on Lucene-14561

Signed-off-by: expani <anijainc@amazon.com>
---
 .../org/opensearch/search/query/QueryProfilePhaseTests.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java b/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
index f246aa84e8e27..999a68f0548db 100644
--- a/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
+++ b/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
@@ -1233,7 +1233,7 @@ public void testMinScore() throws Exception {
         context.trackTotalHitsUpTo(5);
 
         QueryPhase.executeInternal(context.withCleanQueryResult().withProfilers(), queryPhaseSearcher);
-        assertEquals(10, context.queryResult().topDocs().topDocs.totalHits.value());
+        assertTrue(context.queryResult().topDocs().topDocs.totalHits.value() >= 5);
         assertProfileData(context, "BooleanQuery", query -> {
             assertThat(query.getTimeBreakdown().keySet(), not(empty()));
             assertThat(query.getTimeBreakdown().get("score"), greaterThan(0L));

From 2777ed68a86809912f3e036c31442ba0d114d6c6 Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Fri, 2 May 2025 12:48:20 -0700
Subject: [PATCH 11/14] Updated test based on Lucene-14561

Signed-off-by: expani <anijainc@amazon.com>
---
 .../org/opensearch/search/query/QueryProfilePhaseTests.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java b/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
index 999a68f0548db..e0fee0cb375b4 100644
--- a/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
+++ b/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
@@ -1237,7 +1237,7 @@ public void testMinScore() throws Exception {
         assertProfileData(context, "BooleanQuery", query -> {
             assertThat(query.getTimeBreakdown().keySet(), not(empty()));
             assertThat(query.getTimeBreakdown().get("score"), greaterThan(0L));
-            assertThat(query.getTimeBreakdown().get("score_count"), equalTo(10L));
+            assertThat(query.getTimeBreakdown().get("score_count"), greaterThanOrEqualTo(5L));
             if (executor != null) {
                 assertThat(query.getTimeBreakdown().get("max_score"), greaterThan(0L));
                 assertThat(query.getTimeBreakdown().get("min_score"), greaterThan(0L));

From 048405a8b33b37b0e79b47b02229413979bc86c1 Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Fri, 2 May 2025 14:00:32 -0700
Subject: [PATCH 12/14] Updated test based on Lucene-14561

Signed-off-by: expani <anijainc@amazon.com>
---
 .../org/opensearch/search/query/QueryProfilePhaseTests.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java b/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
index e0fee0cb375b4..ea4db0630c7d4 100644
--- a/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
+++ b/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
@@ -1242,9 +1242,9 @@ public void testMinScore() throws Exception {
                 assertThat(query.getTimeBreakdown().get("max_score"), greaterThan(0L));
                 assertThat(query.getTimeBreakdown().get("min_score"), greaterThan(0L));
                 assertThat(query.getTimeBreakdown().get("avg_score"), greaterThan(0L));
-                assertThat(query.getTimeBreakdown().get("max_score_count"), equalTo(10L));
-                assertThat(query.getTimeBreakdown().get("min_score_count"), equalTo(10L));
-                assertThat(query.getTimeBreakdown().get("avg_score_count"), equalTo(10L));
+                assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThanOrEqualTo(5L));
+                assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThanOrEqualTo(5L));
+                assertThat(query.getTimeBreakdown().get("avg_score_count"), greaterThanOrEqualTo(5L));
             }
             assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));
             assertThat(query.getTimeBreakdown().get("create_weight_count"), equalTo(1L));

From fd4209572a920875b3ef9f431f4e2ef69634c463 Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Fri, 2 May 2025 21:09:19 -0700
Subject: [PATCH 13/14] Delegating nextDoc to advance as previous assumption
 doesn't hold with current ConstantScoreSupplier

Signed-off-by: expani <anijainc@amazon.com>
---
 .../search/aggregations/metrics/CardinalityAggregator.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
index 45544fbcd6e2b..48548f29ab264 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
@@ -452,9 +452,8 @@ public int advance(int target) throws IOException {
         }
 
         @Override
-        public int nextDoc() {
-            // don't expect this to be called based on its usage in DefaultBulkScorer
-            throw new UnsupportedOperationException();
+        public int nextDoc() throws IOException {
+            return advance(slowDocId + 1);
         }
 
         @Override

From cefd17483675fae7bd4b654410c157663f613139 Mon Sep 17 00:00:00 2001
From: expani <anijainc@amazon.com>
Date: Fri, 2 May 2025 22:07:32 -0700
Subject: [PATCH 14/14] Implemented cost function

Signed-off-by: expani <anijainc@amazon.com>
---
 .../search/aggregations/metrics/CardinalityAggregator.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
index 48548f29ab264..8d8219704b284 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
@@ -458,8 +458,7 @@ public int nextDoc() throws IOException {
 
         @Override
         public long cost() {
-            // don't expect this to be called based on its usage in DefaultBulkScorer
-            throw new UnsupportedOperationException();
+            return queue.top() == null ? 0 : queue.top().approximation.cost();
         }
     }