diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bbee2251963a..6bf8bb1802f57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Dependencies - Bump `netty` from 4.1.118.Final to 4.1.121.Final ([#18192](https://github.com/opensearch-project/OpenSearch/pull/18192)) -- Bump Apache Lucene to 9.12.2 ([#18574](https://github.com/opensearch-project/OpenSearch/pull/18574)) +- Bump Apache Lucene to 9.12.3 ([#19444](https://github.com/opensearch-project/OpenSearch/pull/19444)) - Bump `commons-beanutils:commons-beanutils` from 1.9.4 to 1.11.0 ([#18401](https://github.com/opensearch-project/OpenSearch/issues/18401)) - Bump `org.apache.poi` version from 5.2.5 to 5.4.1 in /plugins/ingest-attachment ([#17887](https://github.com/opensearch-project/OpenSearch/pull/17887)) - Bump `org.apache.tika` from 2.9.2 to 3.2.2 ([#19242](https://github.com/opensearch-project/OpenSearch/pull/19242)) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8e98309439e18..47ece5591d533 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] opensearch = "2.19.4" -lucene = "9.12.2" +lucene = "9.12.3" bundled_jdk_vendor = "adoptium" bundled_jdk = "21.0.8+9" diff --git a/libs/core/licenses/lucene-core-9.12.2.jar.sha1 b/libs/core/licenses/lucene-core-9.12.2.jar.sha1 deleted file mode 100644 index 8fb24b5095245..0000000000000 --- a/libs/core/licenses/lucene-core-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1369d425657294be298a7e128a562f5acd0a1dca \ No newline at end of file diff --git a/libs/core/licenses/lucene-core-9.12.3.jar.sha1 b/libs/core/licenses/lucene-core-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..4b1335b4ba0b3 --- /dev/null +++ b/libs/core/licenses/lucene-core-9.12.3.jar.sha1 @@ -0,0 +1 @@ +b4b3fbe8608b438d0a810d15187498e6de974d0e \ 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 5973a9dd7d5dd..6544d074dc9ac 100644 --- a/libs/core/src/main/java/org/opensearch/Version.java +++ b/libs/core/src/main/java/org/opensearch/Version.java @@ -148,7 +148,7 @@ public class Version implements Comparable, 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_2_19_3 = new Version(2190399, org.apache.lucene.util.Version.LUCENE_9_12_2); - public static final Version V_2_19_4 = new Version(2190499, org.apache.lucene.util.Version.LUCENE_9_12_2); + public static final Version V_2_19_4 = new Version(2190499, org.apache.lucene.util.Version.LUCENE_9_12_3); public static final Version CURRENT = V_2_19_4; public static Version fromId(int id) { diff --git a/modules/lang-expression/licenses/lucene-expressions-9.12.2.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.12.2.jar.sha1 deleted file mode 100644 index d6437055635d9..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7c7cb348d6a84e59a5b61febfefa879d8841d9ad \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-9.12.3.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..ac653356cf5a5 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-9.12.3.jar.sha1 @@ -0,0 +1 @@ +339a00c401970d0bc9fbe85b67df19aed4f2df42 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.12.2.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.12.2.jar.sha1 deleted file mode 100644 index d805ed6a163a5..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -437ee60c5dd97d3f93891b70aae368769016ba66 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.12.3.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..46ca035c77624 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.12.3.jar.sha1 @@ -0,0 +1 @@ +179072e7378b0e83c65e6811771b594973901996 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.12.2.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.12.2.jar.sha1 deleted file mode 100644 index a86ac14a50ae5..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6cae333fd37b8e6ca9d236e8942ce6ee097fb629 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.12.3.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..8498f92303624 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.12.3.jar.sha1 @@ -0,0 +1 @@ +2bccb5ff38ed05b141f415ca8e451b8c10bfd182 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.12.2.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.12.2.jar.sha1 deleted file mode 100644 index e58de779c2a66..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0ed2c1cfe63fedbdc9567490a10ee9e7af5a2a14 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.12.3.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..caaaad0658d51 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.12.3.jar.sha1 @@ -0,0 +1 @@ +64f46bec51462cd9f614ad55e565ffaeae834c82 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.12.2.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.12.2.jar.sha1 deleted file mode 100644 index e66482db17d58..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -526d18443b70ccd97405e9d77fffc7132363b6af \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.12.3.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..127e2cb66c580 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.12.3.jar.sha1 @@ -0,0 +1 @@ +5121f7b50d9d966c2ab7e2842d372b9497584dbf \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.12.2.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.12.2.jar.sha1 deleted file mode 100644 index 78ef9ada736f4..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d7c7b9b2e9d21e791dc4cd19fece2abdf4c94b2d \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.12.3.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..7a0e858a5e32e --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.12.3.jar.sha1 @@ -0,0 +1 @@ +9cf8f16da6e42d6206740c6ce58764f617266ae6 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.12.2.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.12.2.jar.sha1 deleted file mode 100644 index 845040e59ec05..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8b1a8b0a1bce7e1758273b0c38842bda2e921cb6 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.12.3.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..3b374a7d87b4b --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.12.3.jar.sha1 @@ -0,0 +1 @@ +2789706d67553a638ad9d1fa71004e5c96de9ed4 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.12.2.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.12.2.jar.sha1 deleted file mode 100644 index 7eb4592cb5104..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d98158ea0c1044ee23d1a77e22106bd60f64e60e \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.12.3.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..fdca011efcc47 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.12.3.jar.sha1 @@ -0,0 +1 @@ +5c9bdcbc50f84a867d043c3361d93ee1336d8b9a \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.12.2.jar.sha1 b/server/licenses/lucene-analysis-common-9.12.2.jar.sha1 deleted file mode 100644 index 2676e45f078f2..0000000000000 --- a/server/licenses/lucene-analysis-common-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cdc24b721435268fb7e9344c05f70466674ba5b6 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.12.3.jar.sha1 b/server/licenses/lucene-analysis-common-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..4130916b73dc9 --- /dev/null +++ b/server/licenses/lucene-analysis-common-9.12.3.jar.sha1 @@ -0,0 +1 @@ +1c25766443c63d4b75c4acb5d2ae162a67d6f937 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.12.2.jar.sha1 b/server/licenses/lucene-backward-codecs-9.12.2.jar.sha1 deleted file mode 100644 index 6be134734db49..0000000000000 --- a/server/licenses/lucene-backward-codecs-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cec3fb5be7f5667671fb9a0afee95c387e0d3b4c \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.12.3.jar.sha1 b/server/licenses/lucene-backward-codecs-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..cd21b68117f97 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-9.12.3.jar.sha1 @@ -0,0 +1 @@ +8a01dcdd8b63cfa761d518c4fe51f3ddfbf2f712 \ No newline at end of file diff --git a/server/licenses/lucene-core-9.12.2.jar.sha1 b/server/licenses/lucene-core-9.12.2.jar.sha1 deleted file mode 100644 index 8fb24b5095245..0000000000000 --- a/server/licenses/lucene-core-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1369d425657294be298a7e128a562f5acd0a1dca \ No newline at end of file diff --git a/server/licenses/lucene-core-9.12.3.jar.sha1 b/server/licenses/lucene-core-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..4b1335b4ba0b3 --- /dev/null +++ b/server/licenses/lucene-core-9.12.3.jar.sha1 @@ -0,0 +1 @@ +b4b3fbe8608b438d0a810d15187498e6de974d0e \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.12.2.jar.sha1 b/server/licenses/lucene-grouping-9.12.2.jar.sha1 deleted file mode 100644 index e0624bb65e486..0000000000000 --- a/server/licenses/lucene-grouping-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b3630e6494e1753192e738aa6ac8e330c30db064 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.12.3.jar.sha1 b/server/licenses/lucene-grouping-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..c4db6bc48567a --- /dev/null +++ b/server/licenses/lucene-grouping-9.12.3.jar.sha1 @@ -0,0 +1 @@ +4e817e84f9f2cde4c08abacbc2cf9fcc6f9ed257 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.12.2.jar.sha1 b/server/licenses/lucene-highlighter-9.12.2.jar.sha1 deleted file mode 100644 index 20a9c2c7bd54b..0000000000000 --- a/server/licenses/lucene-highlighter-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9a2312b6992ac5116003711f7f5db706e3342f88 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.12.3.jar.sha1 b/server/licenses/lucene-highlighter-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..dcdbfde1d9540 --- /dev/null +++ b/server/licenses/lucene-highlighter-9.12.3.jar.sha1 @@ -0,0 +1 @@ +72b809aea6b57e8515a39d4eb368d8dd3fe9c072 \ No newline at end of file diff --git a/server/licenses/lucene-join-9.12.2.jar.sha1 b/server/licenses/lucene-join-9.12.2.jar.sha1 deleted file mode 100644 index f7f1121a41168..0000000000000 --- a/server/licenses/lucene-join-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e69ad250b3905acf8bdfc1483806a53f47a6ed5a \ No newline at end of file diff --git a/server/licenses/lucene-join-9.12.3.jar.sha1 b/server/licenses/lucene-join-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..4230b90eb7915 --- /dev/null +++ b/server/licenses/lucene-join-9.12.3.jar.sha1 @@ -0,0 +1 @@ +44e48600d2f127fb09aa7eac315bd1ea8e8dd205 \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.12.2.jar.sha1 b/server/licenses/lucene-memory-9.12.2.jar.sha1 deleted file mode 100644 index 308d6411c66e1..0000000000000 --- a/server/licenses/lucene-memory-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6a380a60c2388b37ebafae90ccdaee78d2106854 \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.12.3.jar.sha1 b/server/licenses/lucene-memory-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..91f5eb7f990be --- /dev/null +++ b/server/licenses/lucene-memory-9.12.3.jar.sha1 @@ -0,0 +1 @@ +b370151bc0b07a4dce3e5510060f18464391d8b0 \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.12.2.jar.sha1 b/server/licenses/lucene-misc-9.12.2.jar.sha1 deleted file mode 100644 index 8c28e8e8fac1a..0000000000000 --- a/server/licenses/lucene-misc-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c0bfbee60ad705ee43a30e59fcf37359bba58d4d \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.12.3.jar.sha1 b/server/licenses/lucene-misc-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..77cadc54df0fd --- /dev/null +++ b/server/licenses/lucene-misc-9.12.3.jar.sha1 @@ -0,0 +1 @@ +25c5e05862aad0c5564d2202d95dfaa4fa235590 \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.12.2.jar.sha1 b/server/licenses/lucene-queries-9.12.2.jar.sha1 deleted file mode 100644 index 99efe6235bfd8..0000000000000 --- a/server/licenses/lucene-queries-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b745a713191e93da201afb50093a652def0d4f07 \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.12.3.jar.sha1 b/server/licenses/lucene-queries-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..4db582686a8c5 --- /dev/null +++ b/server/licenses/lucene-queries-9.12.3.jar.sha1 @@ -0,0 +1 @@ +00d1c7d922e2dccde36c5492db68f07e70ff506f \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.12.2.jar.sha1 b/server/licenses/lucene-queryparser-9.12.2.jar.sha1 deleted file mode 100644 index e04da534c6260..0000000000000 --- a/server/licenses/lucene-queryparser-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1fa802ec001c663a1b7fa0fea314c4a8c007b728 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.12.3.jar.sha1 b/server/licenses/lucene-queryparser-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..0b7b79695220e --- /dev/null +++ b/server/licenses/lucene-queryparser-9.12.3.jar.sha1 @@ -0,0 +1 @@ +9d50596f071c47cc2768c119b142c7c5c7373c68 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.12.2.jar.sha1 b/server/licenses/lucene-sandbox-9.12.2.jar.sha1 deleted file mode 100644 index a2d750932de36..0000000000000 --- a/server/licenses/lucene-sandbox-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a31ab6d32ae618abc4416a74d228306dfb2240a4 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.12.3.jar.sha1 b/server/licenses/lucene-sandbox-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..42cc18c9b5617 --- /dev/null +++ b/server/licenses/lucene-sandbox-9.12.3.jar.sha1 @@ -0,0 +1 @@ +98c053273f7ba1ed0f6f768002f58001cdbe896f \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-9.12.2.jar.sha1 b/server/licenses/lucene-spatial-extras-9.12.2.jar.sha1 deleted file mode 100644 index d851c2f35a96b..0000000000000 --- a/server/licenses/lucene-spatial-extras-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -53f9fd386ea87d6d1444a705dbdc47a7b2ef2844 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-9.12.3.jar.sha1 b/server/licenses/lucene-spatial-extras-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..a154ca5523c86 --- /dev/null +++ b/server/licenses/lucene-spatial-extras-9.12.3.jar.sha1 @@ -0,0 +1 @@ +bd2f7110b89941f7229be079e6f74d6c68b64b7e \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-9.12.2.jar.sha1 b/server/licenses/lucene-spatial3d-9.12.2.jar.sha1 deleted file mode 100644 index 674c001b3e18d..0000000000000 --- a/server/licenses/lucene-spatial3d-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -239378a1940fef39965fe681f855b65d9b043de3 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-9.12.3.jar.sha1 b/server/licenses/lucene-spatial3d-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..2e9004370666f --- /dev/null +++ b/server/licenses/lucene-spatial3d-9.12.3.jar.sha1 @@ -0,0 +1 @@ +953b7f020b91ae8301e4f6c145e3684a2dbcdb14 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.12.2.jar.sha1 b/server/licenses/lucene-suggest-9.12.2.jar.sha1 deleted file mode 100644 index 38f0164ac7275..0000000000000 --- a/server/licenses/lucene-suggest-9.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c798a106a47216b35a624ae2deb800efdf61cf56 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.12.3.jar.sha1 b/server/licenses/lucene-suggest-9.12.3.jar.sha1 new file mode 100644 index 0000000000000..287a5754b8a61 --- /dev/null +++ b/server/licenses/lucene-suggest-9.12.3.jar.sha1 @@ -0,0 +1 @@ +822501e3f385738638af681ac8b2024841966cdf \ No newline at end of file