diff --git a/CHANGELOG.md b/CHANGELOG.md index b1dd94d630505..893b77a6cae13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Add allowlist setting for ingest-common processors ([#14439](https://github.com/opensearch-project/OpenSearch/issues/14439)) ### Dependencies -- Update to Apache Lucene 9.11.0 ([#14042](https://github.com/opensearch-project/OpenSearch/pull/14042)) +- Update to Apache Lucene 9.11.1 ([#14042](https://github.com/opensearch-project/OpenSearch/pull/14042), [#14576](https://github.com/opensearch-project/OpenSearch/pull/14576)) - Bump `netty` from 4.1.110.Final to 4.1.111.Final ([#14356](https://github.com/opensearch-project/OpenSearch/pull/14356)) - Bump `org.wiremock:wiremock-standalone` from 3.3.1 to 3.6.0 ([#14361](https://github.com/opensearch-project/OpenSearch/pull/14361)) - Bump `reactor` from 3.5.17 to 3.5.18 ([#14395](https://github.com/opensearch-project/OpenSearch/pull/14395)) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 54a822d761f03..db4e63ea08d6f 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ opensearch = 2.16.0 -lucene = 9.11.0 +lucene = 9.11.1 bundled_jdk_vendor = adoptium bundled_jdk = 21.0.3+9 diff --git a/libs/core/licenses/lucene-core-9.11.0.jar.sha1 b/libs/core/licenses/lucene-core-9.11.0.jar.sha1 deleted file mode 100644 index b0d38c4165581..0000000000000 --- a/libs/core/licenses/lucene-core-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2e487755a6814b2a1bc770c26569dcba86873dcf \ No newline at end of file diff --git a/libs/core/licenses/lucene-core-9.11.1.jar.sha1 b/libs/core/licenses/lucene-core-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..82de964a2b755 --- /dev/null +++ b/libs/core/licenses/lucene-core-9.11.1.jar.sha1 @@ -0,0 +1 @@ +8f52ba14b21774f41ce33cf5ca111cbdefeed7f9 \ 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 53656ba78410e..1595afff65d4c 100644 --- a/libs/core/src/main/java/org/opensearch/Version.java +++ b/libs/core/src/main/java/org/opensearch/Version.java @@ -134,7 +134,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_2_14_1 = new Version(2140199, org.apache.lucene.util.Version.LUCENE_9_10_0); public static final Version V_2_15_0 = new Version(2150099, org.apache.lucene.util.Version.LUCENE_9_10_0); public static final Version V_2_15_1 = new Version(2150199, org.apache.lucene.util.Version.LUCENE_9_10_0); - public static final Version V_2_16_0 = new Version(2160099, org.apache.lucene.util.Version.LUCENE_9_11_0); + public static final Version V_2_16_0 = new Version(2160099, org.apache.lucene.util.Version.LUCENE_9_11_1); public static final Version CURRENT = V_2_16_0; public static Version fromId(int id) { diff --git a/modules/lang-expression/licenses/lucene-expressions-9.11.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.11.0.jar.sha1 deleted file mode 100644 index 29aade3ad4298..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5e21d20edee0712472e7c6f605c9d97aeecf16c0 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-9.11.1.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..6b9e49f2e745f --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-9.11.1.jar.sha1 @@ -0,0 +1 @@ +e46fbc4fd325ca00ed5a7cacde7ffafa01d7973e \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0.jar.sha1 deleted file mode 100644 index 6f0501d3312ae..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5c7f2d8eab0fca3fdc3d3e57a7f48a335dc7ac33 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.1.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..46c87a1611806 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.1.jar.sha1 @@ -0,0 +1 @@ +028beadfa152c159d21d880461c06f895052bd33 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0.jar.sha1 deleted file mode 100644 index 25031381c9cb3..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -efcf65dda1b4e9d7e83926fd5895a47e491cbf29 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.1.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..ba490a04c090c --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.1.jar.sha1 @@ -0,0 +1 @@ +701c1366189c4410d3cb1f8607df2e50621bfd22 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0.jar.sha1 deleted file mode 100644 index e27d45b217dad..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -59599d7b8bed2e6bd27d0dad7935c078b98c39cc \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.1.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..4317b04bc4d8e --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.1.jar.sha1 @@ -0,0 +1 @@ +46e8f4f3f2f540307fe7d9f500ddc56c1e74d400 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0.jar.sha1 deleted file mode 100644 index ad5473865537d..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e55f83bb373ac139e313f64e80afe1eb0a75b8c0 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.1.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..07a0f261da92f --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.1.jar.sha1 @@ -0,0 +1 @@ +5d8eca81f0d1e5671bf1f1692225f7d8cc7977e8 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0.jar.sha1 deleted file mode 100644 index 68abd162e7266..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1be59d91c45a4de069611fb7f8aa3e8fd26020ec \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.1.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..d1be3c76d6252 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.1.jar.sha1 @@ -0,0 +1 @@ +e900ea081428c3fdc7ec7a48f9c392871304476e \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0.jar.sha1 deleted file mode 100644 index c5f1521ec3769..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d5b5922acf3743b5a0c542959dd93fca8be333a7 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.1.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..c5719a3a210ae --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.1.jar.sha1 @@ -0,0 +1 @@ +50f4d2400fa6264bf682028d8c7b6bbdd588b496 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0.jar.sha1 deleted file mode 100644 index b676ca507467a..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -50fd7b471cbdd6648c4972169f3fc67fae9db7f6 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..ab69cec5884a4 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.1.jar.sha1 @@ -0,0 +1 @@ +20fe70fa74097c35c9aaaa5c0e19ca5f7ac93141 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.11.0.jar.sha1 b/server/licenses/lucene-analysis-common-9.11.0.jar.sha1 deleted file mode 100644 index 7139f6a43a15a..0000000000000 --- a/server/licenses/lucene-analysis-common-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -75a0a333cf1e043102743066c929e65fe51cbcda \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.11.1.jar.sha1 b/server/licenses/lucene-analysis-common-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..4de19f1f8ab33 --- /dev/null +++ b/server/licenses/lucene-analysis-common-9.11.1.jar.sha1 @@ -0,0 +1 @@ +51286aca019db66311f71496191b4bd7adaf3dcf \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.11.0.jar.sha1 b/server/licenses/lucene-backward-codecs-9.11.0.jar.sha1 deleted file mode 100644 index 735e80b60b001..0000000000000 --- a/server/licenses/lucene-backward-codecs-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -db385446bc3fd70e7c6a744276c0a157bd60ee0a \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.11.1.jar.sha1 b/server/licenses/lucene-backward-codecs-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..9059fc3393307 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-9.11.1.jar.sha1 @@ -0,0 +1 @@ +948fda53ceeb0fa1b835af5376abec771b2c3fb1 \ No newline at end of file diff --git a/server/licenses/lucene-core-9.11.0.jar.sha1 b/server/licenses/lucene-core-9.11.0.jar.sha1 deleted file mode 100644 index b0d38c4165581..0000000000000 --- a/server/licenses/lucene-core-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2e487755a6814b2a1bc770c26569dcba86873dcf \ No newline at end of file diff --git a/server/licenses/lucene-core-9.11.1.jar.sha1 b/server/licenses/lucene-core-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..82de964a2b755 --- /dev/null +++ b/server/licenses/lucene-core-9.11.1.jar.sha1 @@ -0,0 +1 @@ +8f52ba14b21774f41ce33cf5ca111cbdefeed7f9 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.11.0.jar.sha1 b/server/licenses/lucene-grouping-9.11.0.jar.sha1 deleted file mode 100644 index 562de95605b60..0000000000000 --- a/server/licenses/lucene-grouping-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -882bdaf209b0acb332aa34836616424bcbecf462 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.11.1.jar.sha1 b/server/licenses/lucene-grouping-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..0e37fd52666a4 --- /dev/null +++ b/server/licenses/lucene-grouping-9.11.1.jar.sha1 @@ -0,0 +1 @@ +0bdf9db0134523d2a41123dca1018f4c771c7b23 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.11.0.jar.sha1 b/server/licenses/lucene-highlighter-9.11.0.jar.sha1 deleted file mode 100644 index e0ef36d321c9d..0000000000000 --- a/server/licenses/lucene-highlighter-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -44accdc03c5482e602718f7bf91e5940ba4e4870 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.11.1.jar.sha1 b/server/licenses/lucene-highlighter-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..d6f2dab59539f --- /dev/null +++ b/server/licenses/lucene-highlighter-9.11.1.jar.sha1 @@ -0,0 +1 @@ +e16cc9c531998a76eb5528147b5f07596f95fad8 \ No newline at end of file diff --git a/server/licenses/lucene-join-9.11.0.jar.sha1 b/server/licenses/lucene-join-9.11.0.jar.sha1 deleted file mode 100644 index 34c618ccfbcc7..0000000000000 --- a/server/licenses/lucene-join-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -32a30ee03ed4f3e43bf63250270b2d4d53050045 \ No newline at end of file diff --git a/server/licenses/lucene-join-9.11.1.jar.sha1 b/server/licenses/lucene-join-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..59fe75206ca0a --- /dev/null +++ b/server/licenses/lucene-join-9.11.1.jar.sha1 @@ -0,0 +1 @@ +f7d63c04f3cc2ec8d7df73178db20de34cf60667 \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.11.0.jar.sha1 b/server/licenses/lucene-memory-9.11.0.jar.sha1 deleted file mode 100644 index d730cfb4b7660..0000000000000 --- a/server/licenses/lucene-memory-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b3e80aa6aa3299118e76a23edc23b58f3ba5a515 \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.11.1.jar.sha1 b/server/licenses/lucene-memory-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..342fa399d1eec --- /dev/null +++ b/server/licenses/lucene-memory-9.11.1.jar.sha1 @@ -0,0 +1 @@ +4221baad5c40849f641f0f5c1b8e2f2dfcf1e73a \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.11.0.jar.sha1 b/server/licenses/lucene-misc-9.11.0.jar.sha1 deleted file mode 100644 index 9be27f004435b..0000000000000 --- a/server/licenses/lucene-misc-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -54fe308908194e1b0697a1157a45c5998c9e1083 \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.11.1.jar.sha1 b/server/licenses/lucene-misc-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..c8b6b747cae8b --- /dev/null +++ b/server/licenses/lucene-misc-9.11.1.jar.sha1 @@ -0,0 +1 @@ +a3ecdb999c3d3435ead88771ce215834bd8be7b8 \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.11.0.jar.sha1 b/server/licenses/lucene-queries-9.11.0.jar.sha1 deleted file mode 100644 index b445610c25858..0000000000000 --- a/server/licenses/lucene-queries-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -987d1286949ddf514b8405fd453ed47bebdfb12d \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.11.1.jar.sha1 b/server/licenses/lucene-queries-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..d21f8bb64fad2 --- /dev/null +++ b/server/licenses/lucene-queries-9.11.1.jar.sha1 @@ -0,0 +1 @@ +027fc885a0442a0442f426f7fea9743f6fcf3c43 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.11.0.jar.sha1 b/server/licenses/lucene-queryparser-9.11.0.jar.sha1 deleted file mode 100644 index a1620ba9c7708..0000000000000 --- a/server/licenses/lucene-queryparser-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e97fe1c0d102edb8d6e1c01454992fd2b8d80ae0 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.11.1.jar.sha1 b/server/licenses/lucene-queryparser-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..b9480ba05f067 --- /dev/null +++ b/server/licenses/lucene-queryparser-9.11.1.jar.sha1 @@ -0,0 +1 @@ +ad6e5b135e1e284d4462d717086ce13a3ce01b4a \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.11.0.jar.sha1 b/server/licenses/lucene-sandbox-9.11.0.jar.sha1 deleted file mode 100644 index 0dc193f054973..0000000000000 --- a/server/licenses/lucene-sandbox-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5e46b790744bd9118ccc053f70235364213312a5 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.11.1.jar.sha1 b/server/licenses/lucene-sandbox-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..1cf3a0e6dd381 --- /dev/null +++ b/server/licenses/lucene-sandbox-9.11.1.jar.sha1 @@ -0,0 +1 @@ +9d6a88d9cb7f206c12d13c4fe48f8c7a973ebdb5 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-9.11.0.jar.sha1 b/server/licenses/lucene-spatial-extras-9.11.0.jar.sha1 deleted file mode 100644 index 9d3a8d2857db6..0000000000000 --- a/server/licenses/lucene-spatial-extras-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -079ca5aaf544a3acde84b8b88423ace6dedc23eb \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-9.11.1.jar.sha1 b/server/licenses/lucene-spatial-extras-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..30600cfd91dea --- /dev/null +++ b/server/licenses/lucene-spatial-extras-9.11.1.jar.sha1 @@ -0,0 +1 @@ +d3938d4f63a29a6e8396416ec6e6e835826e7734 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-9.11.0.jar.sha1 b/server/licenses/lucene-spatial3d-9.11.0.jar.sha1 deleted file mode 100644 index fd5ff875a0113..0000000000000 --- a/server/licenses/lucene-spatial3d-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -564558818d70fc384db5b36fbc8a0ab27b107609 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-9.11.1.jar.sha1 b/server/licenses/lucene-spatial3d-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..eea332a853803 --- /dev/null +++ b/server/licenses/lucene-spatial3d-9.11.1.jar.sha1 @@ -0,0 +1 @@ +d9c48cf29e8736e6ce6cd81c614367b10210523c \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.11.0.jar.sha1 b/server/licenses/lucene-suggest-9.11.0.jar.sha1 deleted file mode 100644 index 2fa96e97f307a..0000000000000 --- a/server/licenses/lucene-suggest-9.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa345db9b6caaf881e7890ea5b8911357d592167 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.11.1.jar.sha1 b/server/licenses/lucene-suggest-9.11.1.jar.sha1 new file mode 100644 index 0000000000000..7b401a4be996f --- /dev/null +++ b/server/licenses/lucene-suggest-9.11.1.jar.sha1 @@ -0,0 +1 @@ +9cceafd67d032d2a507e81f797e05eb284849987 \ No newline at end of file