Apache Solr open-source search software
SOLR-16853: Upgrade Lucene to 9.7.0 (#1749)
Alex53c2cd274d6c
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex d6fb8155138..50985af23bd 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -288,6 +288,8 @@ Dependency Upgrades* SOLR-16799: upgrade Solr to use Lucene 9.6.0 (Alex Deparvu, Tomás Fernández Löbbe)+* SOLR-16853: Upgrade Lucene to 9.7.0 (Alex Deparvu)+Other Changes---------------------diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.javaindex cf60152f50a..6b8fcc634c3 100644--- a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java+++ b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java@@ -38,6 +38,7 @@ import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.IndexableField;import org.apache.lucene.index.LeafReader;import org.apache.lucene.index.Terms;+import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;import org.apache.lucene.search.highlight.Encoder;import org.apache.lucene.search.highlight.Formatter;@@ -545,17 +546,17 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf@Overrideprotected void flatten(Query sourceQuery,- IndexReader reader,+ IndexSearcher searcher,Collection<Query> flatQueries,float boost)throws IOException {if (sourceQuery instanceof ToParentBlockJoinQuery) {Query childQuery = ((ToParentBlockJoinQuery) sourceQuery).getChildQuery();if (childQuery != null) {- flatten(childQuery, reader, flatQueries, boost);+ flatten(childQuery, searcher, flatQueries, boost);}} else {- super.flatten(sourceQuery, reader, flatQueries, boost);+ super.flatten(sourceQuery, searcher, flatQueries, boost);}}};diff --git a/solr/licenses/lucene-analysis-common-9.6.0.jar.sha1 b/solr/licenses/lucene-analysis-common-9.6.0.jar.sha1deleted file mode 100644index 9f2de10fa7b..00000000000--- a/solr/licenses/lucene-analysis-common-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-17a8b808bb7bf5f49fbfb9cbff821433e2908e22diff --git a/solr/licenses/lucene-analysis-common-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-common-9.7.0.jar.sha1new file mode 100644index 00000000000..48853a554ef--- /dev/null+++ b/solr/licenses/lucene-analysis-common-9.7.0.jar.sha1@@ -0,0 +1 @@+27ba6caaa4587a982cd451f7217b5a982bcfc44adiff --git a/solr/licenses/lucene-analysis-icu-9.6.0.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.6.0.jar.sha1deleted file mode 100644index 9b8870f77e4..00000000000--- a/solr/licenses/lucene-analysis-icu-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-560f0fcd2960aa8e4c2251b44ee81678545fb685diff --git a/solr/licenses/lucene-analysis-icu-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.7.0.jar.sha1new file mode 100644index 00000000000..e17e815b879--- /dev/null+++ b/solr/licenses/lucene-analysis-icu-9.7.0.jar.sha1@@ -0,0 +1 @@+94293b169fb8572f440a5a4a523320ecf9778ffediff --git a/solr/licenses/lucene-analysis-kuromoji-9.6.0.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.6.0.jar.sha1deleted file mode 100644index 6ba89bf7098..00000000000--- a/solr/licenses/lucene-analysis-kuromoji-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-839a51ef7acbb89e7d0e7a02a03bda080b7ded38diff --git a/solr/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1new file mode 100644index 00000000000..1cb53b61d8e--- /dev/null+++ b/solr/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1@@ -0,0 +1 @@+2df800a38b64867b8dcd61fc2cd986114e4a80cbdiff --git a/solr/licenses/lucene-analysis-morfologik-9.6.0.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.6.0.jar.sha1deleted file mode 100644index 24e66633525..00000000000--- a/solr/licenses/lucene-analysis-morfologik-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8efe51c10d7b4bf22b6cd2e42c95b8665fb62038diff --git a/solr/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1new file mode 100644index 00000000000..08b3abe8f12--- /dev/null+++ b/solr/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1@@ -0,0 +1 @@+dfb4313f3c68d337310522840d7144c1605d084adiff --git a/solr/licenses/lucene-analysis-nori-9.6.0.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.6.0.jar.sha1deleted file mode 100644index 095e1010e5c..00000000000--- a/solr/licenses/lucene-analysis-nori-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f8a1b2e4c8dae00995aea5bf8f2ad47a1ab1f624diff --git a/solr/licenses/lucene-analysis-nori-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.7.0.jar.sha1new file mode 100644index 00000000000..47ae76abb25--- /dev/null+++ b/solr/licenses/lucene-analysis-nori-9.7.0.jar.sha1@@ -0,0 +1 @@+a01e8153f34d72e8c8c0180c1dea5b10f677dd3adiff --git a/solr/licenses/lucene-analysis-opennlp-9.6.0.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.6.0.jar.sha1deleted file mode 100644index 4fe72372676..00000000000--- a/solr/licenses/lucene-analysis-opennlp-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ac4e404198093339c46b489ae7dfbc4a15858e8fdiff --git a/solr/licenses/lucene-analysis-opennlp-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.7.0.jar.sha1new file mode 100644index 00000000000..3419a3d6303--- /dev/null+++ b/solr/licenses/lucene-analysis-opennlp-9.7.0.jar.sha1@@ -0,0 +1 @@+af475c4941f250d6a94d26130e884798ca57b982diff --git a/solr/licenses/lucene-analysis-phonetic-9.6.0.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.6.0.jar.sha1deleted file mode 100644index 82d39ffade7..00000000000--- a/solr/licenses/lucene-analysis-phonetic-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-47fc1c8246b2219769c3b28ee0af1c0c9b58922ediff --git a/solr/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1new file mode 100644index 00000000000..3ea0a099d5a--- /dev/null+++ b/solr/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1@@ -0,0 +1 @@+b7d47d54683b0b1e09b271c32d1b7d3eb1990f49diff --git a/solr/licenses/lucene-analysis-smartcn-9.6.0.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.6.0.jar.sha1deleted file mode 100644index f9c6946e79d..00000000000--- a/solr/licenses/lucene-analysis-smartcn-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-7a31613d5d40276babb6ed927b498fd671f00c2ddiff --git a/solr/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1new file mode 100644index 00000000000..29630dabbb0--- /dev/null+++ b/solr/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1@@ -0,0 +1 @@+5e68b9816e6cff8ee15f5b350cf2ffa54f9828b7diff --git a/solr/licenses/lucene-analysis-stempel-9.6.0.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.6.0.jar.sha1deleted file mode 100644index d3c89f34fdc..00000000000--- a/solr/licenses/lucene-analysis-stempel-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-3b030f7348ff866f5ac0fd0b98407e89ae86413fdiff --git a/solr/licenses/lucene-analysis-stempel-9.7.0.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.7.0.jar.sha1new file mode 100644index 00000000000..409b414b486--- /dev/null+++ b/solr/licenses/lucene-analysis-stempel-9.7.0.jar.sha1@@ -0,0 +1 @@+d23b1f05b471e05d0d6068b3ece7c8c65672eae7diff --git a/solr/licenses/lucene-backward-codecs-9.6.0.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.6.0.jar.sha1deleted file mode 100644index 1feb8aa1e72..00000000000--- a/solr/licenses/lucene-backward-codecs-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a4819ca127c46a2759fdf091f41512c56c441fa7diff --git a/solr/licenses/lucene-backward-codecs-9.7.0.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.7.0.jar.sha1new file mode 100644index 00000000000..f186a6837fc--- /dev/null+++ b/solr/licenses/lucene-backward-codecs-9.7.0.jar.sha1@@ -0,0 +1 @@+6389463bfbfcf902c8d31d12e9513a6818ac9d5ediff --git a/solr/licenses/lucene-classification-9.6.0.jar.sha1 b/solr/licenses/lucene-classification-9.6.0.jar.sha1deleted file mode 100644index 2b9f5e709f5..00000000000--- a/solr/licenses/lucene-classification-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-98c34a5aff34d4cca7b1e706b8963e125c6e66f5diff --git a/solr/licenses/lucene-classification-9.7.0.jar.sha1 b/solr/licenses/lucene-classification-9.7.0.jar.sha1new file mode 100644index 00000000000..7ed14dfe1a7--- /dev/null+++ b/solr/licenses/lucene-classification-9.7.0.jar.sha1@@ -0,0 +1 @@+4e5eadd2126228e0c64ad5b6e5858ab9727a4356diff --git a/solr/licenses/lucene-codecs-9.6.0.jar.sha1 b/solr/licenses/lucene-codecs-9.6.0.jar.sha1deleted file mode 100644index 09c8137bd7b..00000000000--- a/solr/licenses/lucene-codecs-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-122bff36d2534dd200896f2f7c9bbfa5c513816adiff --git a/solr/licenses/lucene-codecs-9.7.0.jar.sha1 b/solr/licenses/lucene-codecs-9.7.0.jar.sha1new file mode 100644index 00000000000..12fdb9869ca--- /dev/null+++ b/solr/licenses/lucene-codecs-9.7.0.jar.sha1@@ -0,0 +1 @@+ce18930d286e29c9f78f594c26cd5653ef3fe83ediff --git a/solr/licenses/lucene-core-9.6.0.jar.sha1 b/solr/licenses/lucene-core-9.6.0.jar.sha1deleted file mode 100644index ebf6615bda0..00000000000--- a/solr/licenses/lucene-core-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-2c08c7a491e9d033bb4806e0a45496e3a0667217diff --git a/solr/licenses/lucene-core-9.7.0.jar.sha1 b/solr/licenses/lucene-core-9.7.0.jar.sha1new file mode 100644index 00000000000..e524210f516--- /dev/null+++ b/solr/licenses/lucene-core-9.7.0.jar.sha1@@ -0,0 +1 @@+ad391210ffd806931334be9670a35af00c56f959diff --git a/solr/licenses/lucene-expressions-9.6.0.jar.sha1 b/solr/licenses/lucene-expressions-9.6.0.jar.sha1deleted file mode 100644index 880d09d25f8..00000000000--- a/solr/licenses/lucene-expressions-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f2b28bb17fa6a1415233b1db98bd6fd371afc9b3diff --git a/solr/licenses/lucene-expressions-9.7.0.jar.sha1 b/solr/licenses/lucene-expressions-9.7.0.jar.sha1new file mode 100644index 00000000000..df99d15fd55--- /dev/null+++ b/solr/licenses/lucene-expressions-9.7.0.jar.sha1@@ -0,0 +1 @@+297e1cfade4ef71466cc9d4f361d81807c8dc4c8diff --git a/solr/licenses/lucene-grouping-9.6.0.jar.sha1 b/solr/licenses/lucene-grouping-9.6.0.jar.sha1deleted file mode 100644index 06252992d12..00000000000--- a/solr/licenses/lucene-grouping-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-b7c7d7c0ae0ae79b3dbdbb234c5fbe267d874412diff --git a/solr/licenses/lucene-grouping-9.7.0.jar.sha1 b/solr/licenses/lucene-grouping-9.7.0.jar.sha1new file mode 100644index 00000000000..81519bec541--- /dev/null+++ b/solr/licenses/lucene-grouping-9.7.0.jar.sha1@@ -0,0 +1 @@+8e6f0c229f4861be641047c33b05067176e4279cdiff --git a/solr/licenses/lucene-highlighter-9.6.0.jar.sha1 b/solr/licenses/lucene-highlighter-9.6.0.jar.sha1deleted file mode 100644index a450920dddc..00000000000--- a/solr/licenses/lucene-highlighter-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-b9e14451c73fa0bc8e71a2cfe12a442f37a53c69diff --git a/solr/licenses/lucene-highlighter-9.7.0.jar.sha1 b/solr/licenses/lucene-highlighter-9.7.0.jar.sha1new file mode 100644index 00000000000..31744c10d96--- /dev/null+++ b/solr/licenses/lucene-highlighter-9.7.0.jar.sha1@@ -0,0 +1 @@+facb7c7ee0f75ed457a2d98f10d6430e25a53691diff --git a/solr/licenses/lucene-join-9.6.0.jar.sha1 b/solr/licenses/lucene-join-9.6.0.jar.sha1deleted file mode 100644index d4a1b76507d..00000000000--- a/solr/licenses/lucene-join-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-6596a994b7b35b9f3cfdb76592b2067e9c0a9c60diff --git a/solr/licenses/lucene-join-9.7.0.jar.sha1 b/solr/licenses/lucene-join-9.7.0.jar.sha1new file mode 100644index 00000000000..e9134ce0f3e--- /dev/null+++ b/solr/licenses/lucene-join-9.7.0.jar.sha1@@ -0,0 +1 @@+d041bdc0947a14223cf68357407ee18b21027587diff --git a/solr/licenses/lucene-memory-9.6.0.jar.sha1 b/solr/licenses/lucene-memory-9.6.0.jar.sha1deleted file mode 100644index 5a3d3f25a28..00000000000--- a/solr/licenses/lucene-memory-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-d7f9f0857463bd846abd73de2281135c511a44badiff --git a/solr/licenses/lucene-memory-9.7.0.jar.sha1 b/solr/licenses/lucene-memory-9.7.0.jar.sha1new file mode 100644index 00000000000..9ac3c50a4c9--- /dev/null+++ b/solr/licenses/lucene-memory-9.7.0.jar.sha1@@ -0,0 +1 @@+0fade51ee353e15ddbbc45262aafe6f99ed020f1diff --git a/solr/licenses/lucene-misc-9.6.0.jar.sha1 b/solr/licenses/lucene-misc-9.6.0.jar.sha1deleted file mode 100644index e47c91872ee..00000000000--- a/solr/licenses/lucene-misc-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a8b498a061d63bfa4e91752219b41b2c654a8100diff --git a/solr/licenses/lucene-misc-9.7.0.jar.sha1 b/solr/licenses/lucene-misc-9.7.0.jar.sha1new file mode 100644index 00000000000..9df2fb89f24--- /dev/null+++ b/solr/licenses/lucene-misc-9.7.0.jar.sha1@@ -0,0 +1 @@+7fcf451e2376526c3a027958812866cc5b0ff13fdiff --git a/solr/licenses/lucene-queries-9.6.0.jar.sha1 b/solr/licenses/lucene-queries-9.6.0.jar.sha1deleted file mode 100644index bf8708cdfe3..00000000000--- a/solr/licenses/lucene-queries-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-aadf9fffd94006a397dbdb5ce49a3727ff7d8168diff --git a/solr/licenses/lucene-queries-9.7.0.jar.sha1 b/solr/licenses/lucene-queries-9.7.0.jar.sha1new file mode 100644index 00000000000..80c638e986c--- /dev/null+++ b/solr/licenses/lucene-queries-9.7.0.jar.sha1@@ -0,0 +1 @@+126989d4622419aa06fcbf3a342e859cab8c8799diff --git a/solr/licenses/lucene-queryparser-9.6.0.jar.sha1 b/solr/licenses/lucene-queryparser-9.6.0.jar.sha1deleted file mode 100644index d46f85781a4..00000000000--- a/solr/licenses/lucene-queryparser-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-c2f9ef9b7336981495272e99a1df678a97966102diff --git a/solr/licenses/lucene-queryparser-9.7.0.jar.sha1 b/solr/licenses/lucene-queryparser-9.7.0.jar.sha1new file mode 100644index 00000000000..277242ad56c--- /dev/null+++ b/solr/licenses/lucene-queryparser-9.7.0.jar.sha1@@ -0,0 +1 @@+6e77bde908ff698354e4a2149e6dd4658b56d7b0diff --git a/solr/licenses/lucene-sandbox-9.6.0.jar.sha1 b/solr/licenses/lucene-sandbox-9.6.0.jar.sha1deleted file mode 100644index 9d742dc5777..00000000000--- a/solr/licenses/lucene-sandbox-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-7d6a0f3ac5ced909a8d21a697f9241ddcbe662d9diff --git a/solr/licenses/lucene-sandbox-9.7.0.jar.sha1 b/solr/licenses/lucene-sandbox-9.7.0.jar.sha1new file mode 100644index 00000000000..60ad0045f4d--- /dev/null+++ b/solr/licenses/lucene-sandbox-9.7.0.jar.sha1@@ -0,0 +1 @@+9f3e8e1947f2f1c5784132444af51a060ff0b4bfdiff --git a/solr/licenses/lucene-spatial-extras-9.6.0.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.6.0.jar.sha1deleted file mode 100644index e596609197e..00000000000--- a/solr/licenses/lucene-spatial-extras-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-7df1a3ff8b099c6952d546712126d9db7c789e2cdiff --git a/solr/licenses/lucene-spatial-extras-9.7.0.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.7.0.jar.sha1new file mode 100644index 00000000000..5a4ee73e3ee--- /dev/null+++ b/solr/licenses/lucene-spatial-extras-9.7.0.jar.sha1@@ -0,0 +1 @@+01b0bc7a407d8c35a70a1adf7966bb3e7caae928diff --git a/solr/licenses/lucene-spatial3d-9.6.0.jar.sha1 b/solr/licenses/lucene-spatial3d-9.6.0.jar.sha1deleted file mode 100644index eda876b802a..00000000000--- a/solr/licenses/lucene-spatial3d-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f00857ec2b769dc65b78933ce93fa3133804f38ediff --git a/solr/licenses/lucene-spatial3d-9.7.0.jar.sha1 b/solr/licenses/lucene-spatial3d-9.7.0.jar.sha1new file mode 100644index 00000000000..dfa1e68bbf4--- /dev/null+++ b/solr/licenses/lucene-spatial3d-9.7.0.jar.sha1@@ -0,0 +1 @@+7c6b1b6e0a70c9cd177371e648648c2f896742a2diff --git a/solr/licenses/lucene-suggest-9.6.0.jar.sha1 b/solr/licenses/lucene-suggest-9.6.0.jar.sha1deleted file mode 100644index 1231da3afcf..00000000000--- a/solr/licenses/lucene-suggest-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-269cd8d1cbe3ee2325b8fcaaf5f3c92eccc0cd14diff --git a/solr/licenses/lucene-suggest-9.7.0.jar.sha1 b/solr/licenses/lucene-suggest-9.7.0.jar.sha1new file mode 100644index 00000000000..a1661406108--- /dev/null+++ b/solr/licenses/lucene-suggest-9.7.0.jar.sha1@@ -0,0 +1 @@+5c37fd9a5d71dc87fe1cd4c18ff295ec8cfac170diff --git a/solr/licenses/lucene-test-framework-9.6.0.jar.sha1 b/solr/licenses/lucene-test-framework-9.6.0.jar.sha1deleted file mode 100644index 364e6d35ac0..00000000000--- a/solr/licenses/lucene-test-framework-9.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-4a007d6929fe6ce708218eadff8c068e6fba4dfcdiff --git a/solr/licenses/lucene-test-framework-9.7.0.jar.sha1 b/solr/licenses/lucene-test-framework-9.7.0.jar.sha1new file mode 100644index 00000000000..e4c93a23107--- /dev/null+++ b/solr/licenses/lucene-test-framework-9.7.0.jar.sha1@@ -0,0 +1 @@+c9339d7fdb424940ab437134f06b9f64937d45e2diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xmlindex e9614cc7c8a..b56305e6529 100644--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml@@ -35,7 +35,7 @@that you fully re-index after changing this setting as it canaffect both how text is indexed and queried.-->- <luceneMatchVersion>9.6</luceneMatchVersion>+ <luceneMatchVersion>9.7</luceneMatchVersion><!-- <lib/> directives can be used to instruct Solr to load any Jarsidentified and use them to resolve any "plugins" specified indiff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xmlindex 81b045929dd..b553b37ea83 100644--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml@@ -35,7 +35,7 @@that you fully re-index after changing this setting as it canaffect both how text is indexed and queried.-->- <luceneMatchVersion>9.6</luceneMatchVersion>+ <luceneMatchVersion>9.7</luceneMatchVersion><!-- <lib/> directives can be used to instruct Solr to load any Jarsidentified and use them to resolve any "plugins" specified indiff --git a/versions.lock b/versions.lockindex fe18219d8b9..4aa376e9f6d 100644--- a/versions.lock+++ b/versions.lock@@ -207,32 +207,32 @@ org.apache.logging.log4j:log4j-core:2.20.0 (5 constraints: 82556aef)org.apache.logging.log4j:log4j-layout-template-json:2.20.0 (1 constraints: 3605333b)org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0 (1 constraints: 3605333b)org.apache.logging.log4j:log4j-web:2.20.0 (1 constraints: 3605333b)-org.apache.lucene:lucene-analysis-common:9.6.0 (10 constraints: e89e1463)-org.apache.lucene:lucene-analysis-icu:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-analysis-kuromoji:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-analysis-morfologik:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-analysis-nori:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-analysis-opennlp:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-analysis-phonetic:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-analysis-smartcn:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-analysis-stempel:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-backward-codecs:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-classification:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-codecs:9.6.0 (3 constraints: a5259e44)-org.apache.lucene:lucene-core:9.6.0 (26 constraints: 2f900e9d)-org.apache.lucene:lucene-expressions:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-grouping:9.6.0 (2 constraints: e8155ae4)-org.apache.lucene:lucene-highlighter:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-join:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-memory:9.6.0 (1 constraints: 9b0fb183)-org.apache.lucene:lucene-misc:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-queries:9.6.0 (6 constraints: c051e87b)-org.apache.lucene:lucene-queryparser:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-sandbox:9.6.0 (1 constraints: cf0f2a87)-org.apache.lucene:lucene-spatial-extras:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-spatial3d:9.6.0 (1 constraints: be10b9b9)-org.apache.lucene:lucene-suggest:9.6.0 (1 constraints: 11052a36)-org.apache.lucene:lucene-test-framework:9.6.0 (1 constraints: 11052a36)+org.apache.lucene:lucene-analysis-common:9.7.0 (10 constraints: f29eac6b)+org.apache.lucene:lucene-analysis-icu:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-analysis-kuromoji:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-analysis-morfologik:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-analysis-nori:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-analysis-opennlp:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-analysis-phonetic:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-analysis-smartcn:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-analysis-stempel:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-backward-codecs:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-classification:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-codecs:9.7.0 (3 constraints: a8253445)+org.apache.lucene:lucene-core:9.7.0 (26 constraints: 49905bd5)+org.apache.lucene:lucene-expressions:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-grouping:9.7.0 (2 constraints: ea1590e4)+org.apache.lucene:lucene-highlighter:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-join:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-memory:9.7.0 (1 constraints: 9c0fb483)+org.apache.lucene:lucene-misc:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-queries:9.7.0 (6 constraints: c651867e)+org.apache.lucene:lucene-queryparser:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-sandbox:9.7.0 (1 constraints: d00f2d87)+org.apache.lucene:lucene-spatial-extras:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-spatial3d:9.7.0 (1 constraints: bf10bcb9)+org.apache.lucene:lucene-suggest:9.7.0 (1 constraints: 12052d36)+org.apache.lucene:lucene-test-framework:9.7.0 (1 constraints: 12052d36)org.apache.opennlp:opennlp-tools:1.9.4 (2 constraints: f91d5c6d)org.apache.pdfbox:fontbox:2.0.26 (1 constraints: 180b72d8)org.apache.pdfbox:jbig2-imageio:3.0.4 (1 constraints: 5e0cef01)diff --git a/versions.props b/versions.propsindex 317a609f570..afad823b7aa 100644--- a/versions.props+++ b/versions.props@@ -48,7 +48,7 @@ org.apache.httpcomponents:httpcore=4.4.16org.apache.httpcomponents:httpmime=4.5.14org.apache.kerby:*=1.0.1org.apache.logging.log4j:*=2.20.0-org.apache.lucene:*=9.6.0+org.apache.lucene:*=9.7.0org.apache.tika:*=1.28.5org.apache.tomcat:annotations-api=6.0.53org.apache.zookeeper:*=3.8.1