You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2024/03/19 03:46:00 UTC
(solr) branch jira/SOLR-17157 created (now 57cb1012169)
This is an automated email from the ASF dual-hosted git repository.
hossman pushed a change to branch jira/SOLR-17157
in repository https://gitbox.apache.org/repos/asf/solr.git
at 57cb1012169 SOLR-17157: Upgrade to Lucene 9.10.0
This branch includes the following new commits:
new 57cb1012169 SOLR-17157: Upgrade to Lucene 9.10.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(solr) 01/01: SOLR-17157: Upgrade to Lucene 9.10.0
Posted by ho...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hossman pushed a commit to branch jira/SOLR-17157
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 57cb10121699752a3c4c629037d1c3a4181a8e93
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Mon Mar 18 20:42:22 2024 -0700
SOLR-17157: Upgrade to Lucene 9.10.0
---
.../solr/search/CollapsingQParserPlugin.java | 3 +-
.../solr/search/NumericHidingLeafReader.java | 3 +-
.../org/apache/solr/search/TermsQParserPlugin.java | 3 +-
.../solr/search/join/GraphEdgeCollector.java | 6 ++-
.../apache/solr/uninverting/UninvertingReader.java | 3 +-
.../lucene-analysis-common-9.10.0.jar.sha1 | 1 +
.../licenses/lucene-analysis-common-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-analysis-icu-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-analysis-icu-9.9.2.jar.sha1 | 1 -
.../lucene-analysis-kuromoji-9.10.0.jar.sha1 | 1 +
.../lucene-analysis-kuromoji-9.9.2.jar.sha1 | 1 -
.../lucene-analysis-morfologik-9.10.0.jar.sha1 | 1 +
.../lucene-analysis-morfologik-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-analysis-nori-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-analysis-nori-9.9.2.jar.sha1 | 1 -
.../lucene-analysis-opennlp-9.10.0.jar.sha1 | 1 +
.../lucene-analysis-opennlp-9.9.2.jar.sha1 | 1 -
.../lucene-analysis-phonetic-9.10.0.jar.sha1 | 1 +
.../lucene-analysis-phonetic-9.9.2.jar.sha1 | 1 -
.../lucene-analysis-smartcn-9.10.0.jar.sha1 | 1 +
.../lucene-analysis-smartcn-9.9.2.jar.sha1 | 1 -
.../lucene-analysis-stempel-9.10.0.jar.sha1 | 1 +
.../lucene-analysis-stempel-9.9.2.jar.sha1 | 1 -
.../lucene-backward-codecs-9.10.0.jar.sha1 | 1 +
.../licenses/lucene-backward-codecs-9.9.2.jar.sha1 | 1 -
.../licenses/lucene-classification-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-classification-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-codecs-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-codecs-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-core-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-core-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-expressions-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-expressions-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-grouping-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-grouping-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-highlighter-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-highlighter-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-join-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-join-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-memory-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-memory-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-misc-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-misc-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-queries-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-queries-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-queryparser-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-queryparser-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-sandbox-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-sandbox-9.9.2.jar.sha1 | 1 -
.../licenses/lucene-spatial-extras-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-spatial-extras-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-spatial3d-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-spatial3d-9.9.2.jar.sha1 | 1 -
solr/licenses/lucene-suggest-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-suggest-9.9.2.jar.sha1 | 1 -
.../licenses/lucene-test-framework-9.10.0.jar.sha1 | 1 +
solr/licenses/lucene-test-framework-9.9.2.jar.sha1 | 1 -
.../solr/configsets/_default/conf/solrconfig.xml | 2 +-
.../conf/solrconfig.xml | 2 +-
versions.lock | 52 +++++++++++-----------
versions.props | 2 +-
61 files changed, 67 insertions(+), 61 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
index 9a3b199de51..221f2c8b06b 100644
--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
@@ -536,7 +536,8 @@ public class CollapsingQParserPlugin extends QParserPlugin {
fieldInfo.getVectorDimension(),
fieldInfo.getVectorEncoding(),
fieldInfo.getVectorSimilarityFunction(),
- fieldInfo.isSoftDeletesField());
+ fieldInfo.isSoftDeletesField(),
+ fieldInfo.isParentField());
newInfos.add(f);
} else {
newInfos.add(fieldInfo);
diff --git a/solr/core/src/java/org/apache/solr/search/NumericHidingLeafReader.java b/solr/core/src/java/org/apache/solr/search/NumericHidingLeafReader.java
index e125f2a6cc1..25c3a62debd 100644
--- a/solr/core/src/java/org/apache/solr/search/NumericHidingLeafReader.java
+++ b/solr/core/src/java/org/apache/solr/search/NumericHidingLeafReader.java
@@ -76,7 +76,8 @@ public class NumericHidingLeafReader extends FilterLeafReader {
fi.getVectorDimension(),
fi.getVectorEncoding(),
fi.getVectorSimilarityFunction(),
- fi.isSoftDeletesField()));
+ fi.isSoftDeletesField(),
+ fi.isParentField()));
} else {
filteredInfos.add(fi);
}
diff --git a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
index d0f76aa80d7..78297666f27 100644
--- a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
@@ -121,7 +121,8 @@ public class TermsQParserPlugin extends QParserPlugin {
docValuesTermsFilterPerSegment {
@Override
Query makeFilter(String fname, BytesRef[] byteRefs) {
- return disableCacheByDefault(SortedSetDocValuesField.newSlowSetQuery(fname, byteRefs));
+ return disableCacheByDefault(
+ SortedSetDocValuesField.newSlowSetQuery(fname, Arrays.asList(byteRefs)));
}
};
diff --git a/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java b/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
index a2a891bc0ba..c38c3d00b2e 100644
--- a/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
+++ b/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
@@ -17,6 +17,8 @@
package org.apache.solr.search.join;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.TreeSet;
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.index.DocValues;
@@ -169,11 +171,11 @@ abstract class GraphEdgeCollector extends SimpleCollector implements Collector {
AutomatonQuery autnQuery = new AutomatonQuery(new Term(matchField.getName()), autn);
q = autnQuery;
} else {
- BytesRef[] termList = new BytesRef[collectorTerms.size()];
+ List<BytesRef> termList = new ArrayList<BytesRef>(collectorTerms.size());
for (int i = 0; i < collectorTerms.size(); i++) {
BytesRef ref = new BytesRef();
collectorTerms.get(i, ref);
- termList[i] = ref;
+ termList.add(ref);
}
q =
(matchField.hasDocValues() && !matchField.indexed())
diff --git a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
index 8cdc3736aff..78a3576420d 100644
--- a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
+++ b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
@@ -298,7 +298,8 @@ public class UninvertingReader extends FilterLeafReader {
fi.getVectorDimension(),
fi.getVectorEncoding(),
fi.getVectorSimilarityFunction(),
- fi.isSoftDeletesField()));
+ fi.isSoftDeletesField(),
+ fi.isParentField()));
} else {
newFieldInfos.add(fi);
}
diff --git a/solr/licenses/lucene-analysis-common-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-common-9.10.0.jar.sha1
new file mode 100644
index 00000000000..7ae167f402e
--- /dev/null
+++ b/solr/licenses/lucene-analysis-common-9.10.0.jar.sha1
@@ -0,0 +1 @@
+92e559808a23f61c818ef90a9ccab3669a25caa0
diff --git a/solr/licenses/lucene-analysis-common-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-common-9.9.2.jar.sha1
deleted file mode 100644
index 7534070c4d8..00000000000
--- a/solr/licenses/lucene-analysis-common-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a4712ee9d87e0f9942a81195dbd5223dbeaa541
diff --git a/solr/licenses/lucene-analysis-icu-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.10.0.jar.sha1
new file mode 100644
index 00000000000..bb9167b274c
--- /dev/null
+++ b/solr/licenses/lucene-analysis-icu-9.10.0.jar.sha1
@@ -0,0 +1 @@
+ed54097d13dbaae6e758c31f55a473ba6566ae8d
diff --git a/solr/licenses/lucene-analysis-icu-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.9.2.jar.sha1
deleted file mode 100644
index cfa86d66b06..00000000000
--- a/solr/licenses/lucene-analysis-icu-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f7e549fdac07140f4cd379a0f517c38434165e95
diff --git a/solr/licenses/lucene-analysis-kuromoji-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.10.0.jar.sha1
new file mode 100644
index 00000000000..753ab0c3970
--- /dev/null
+++ b/solr/licenses/lucene-analysis-kuromoji-9.10.0.jar.sha1
@@ -0,0 +1 @@
+a158d8a7d386c782a10ec15827ff3f0aa6fd8291
diff --git a/solr/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1
deleted file mode 100644
index 0b00dab8d5a..00000000000
--- a/solr/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-eb19738fd3ca85071fef96978a056a7c94d8e793
diff --git a/solr/licenses/lucene-analysis-morfologik-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.10.0.jar.sha1
new file mode 100644
index 00000000000..a350fce8a5e
--- /dev/null
+++ b/solr/licenses/lucene-analysis-morfologik-9.10.0.jar.sha1
@@ -0,0 +1 @@
+7acc74d35684269ffa74909395044e0e02581285
diff --git a/solr/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1
deleted file mode 100644
index cb0a692c3e4..00000000000
--- a/solr/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9958d813d4cfdd890b4611c679ed36775480fa0d
diff --git a/solr/licenses/lucene-analysis-nori-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.10.0.jar.sha1
new file mode 100644
index 00000000000..02a27c36948
--- /dev/null
+++ b/solr/licenses/lucene-analysis-nori-9.10.0.jar.sha1
@@ -0,0 +1 @@
+79eb4c5e1c92b613341d05173dfcdce182fa5f80
diff --git a/solr/licenses/lucene-analysis-nori-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.9.2.jar.sha1
deleted file mode 100644
index 924982f4938..00000000000
--- a/solr/licenses/lucene-analysis-nori-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7e83a83741155ececf9193a4f967e570e170236d
diff --git a/solr/licenses/lucene-analysis-opennlp-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.10.0.jar.sha1
new file mode 100644
index 00000000000..fd09ce85f4e
--- /dev/null
+++ b/solr/licenses/lucene-analysis-opennlp-9.10.0.jar.sha1
@@ -0,0 +1 @@
+adbb75a175ef3d02058795000c1123216538d569
diff --git a/solr/licenses/lucene-analysis-opennlp-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.9.2.jar.sha1
deleted file mode 100644
index 2d311733bd6..00000000000
--- a/solr/licenses/lucene-analysis-opennlp-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1b8bd6cfa7f6c4562a48ff53d6aef0bbc13cd232
diff --git a/solr/licenses/lucene-analysis-phonetic-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.10.0.jar.sha1
new file mode 100644
index 00000000000..499d60f941a
--- /dev/null
+++ b/solr/licenses/lucene-analysis-phonetic-9.10.0.jar.sha1
@@ -0,0 +1 @@
+b6ba8f0ecee48b94911c08ee12c20f059ec38ec5
diff --git a/solr/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1
deleted file mode 100644
index ee774015d07..00000000000
--- a/solr/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dabdea96c7a6d00363b0093a580e7d783efa69a4
diff --git a/solr/licenses/lucene-analysis-smartcn-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.10.0.jar.sha1
new file mode 100644
index 00000000000..35fa9f81cda
--- /dev/null
+++ b/solr/licenses/lucene-analysis-smartcn-9.10.0.jar.sha1
@@ -0,0 +1 @@
+ccf4512816ba9cd5c2cca9182db78a2e48e7e16f
diff --git a/solr/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1
deleted file mode 100644
index 243aa7bac7d..00000000000
--- a/solr/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fb551d9ae6a1bf12bc90a4d26dd8fa3eefac8cb9
diff --git a/solr/licenses/lucene-analysis-stempel-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.10.0.jar.sha1
new file mode 100644
index 00000000000..44254f51899
--- /dev/null
+++ b/solr/licenses/lucene-analysis-stempel-9.10.0.jar.sha1
@@ -0,0 +1 @@
+b596817e70f00bc54d66e82c118f47ca91b9e401
diff --git a/solr/licenses/lucene-analysis-stempel-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.9.2.jar.sha1
deleted file mode 100644
index 0ff52ebcbe7..00000000000
--- a/solr/licenses/lucene-analysis-stempel-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0d495b478861b2d29e0a58d273ca0e6e755292e9
diff --git a/solr/licenses/lucene-backward-codecs-9.10.0.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.10.0.jar.sha1
new file mode 100644
index 00000000000..fa79f9eb492
--- /dev/null
+++ b/solr/licenses/lucene-backward-codecs-9.10.0.jar.sha1
@@ -0,0 +1 @@
+6570ebf974d07025ad4cd9ffaa9927546b534704
diff --git a/solr/licenses/lucene-backward-codecs-9.9.2.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.9.2.jar.sha1
deleted file mode 100644
index 75737688688..00000000000
--- a/solr/licenses/lucene-backward-codecs-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b53707366cf2891bb301f85a44c5108fc2d5d1b5
diff --git a/solr/licenses/lucene-classification-9.10.0.jar.sha1 b/solr/licenses/lucene-classification-9.10.0.jar.sha1
new file mode 100644
index 00000000000..ad03a333748
--- /dev/null
+++ b/solr/licenses/lucene-classification-9.10.0.jar.sha1
@@ -0,0 +1 @@
+cb5bd20fbd26d73f9bda17e6c09666fddaf14918
diff --git a/solr/licenses/lucene-classification-9.9.2.jar.sha1 b/solr/licenses/lucene-classification-9.9.2.jar.sha1
deleted file mode 100644
index ab25a33745a..00000000000
--- a/solr/licenses/lucene-classification-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7a46981131fdd014dfdb935e0155f69d13717a4c
diff --git a/solr/licenses/lucene-codecs-9.10.0.jar.sha1 b/solr/licenses/lucene-codecs-9.10.0.jar.sha1
new file mode 100644
index 00000000000..7f25de5aa7e
--- /dev/null
+++ b/solr/licenses/lucene-codecs-9.10.0.jar.sha1
@@ -0,0 +1 @@
+caab918d047da970783376fc9fe65b3b428d92a2
diff --git a/solr/licenses/lucene-codecs-9.9.2.jar.sha1 b/solr/licenses/lucene-codecs-9.9.2.jar.sha1
deleted file mode 100644
index f98d06444a7..00000000000
--- a/solr/licenses/lucene-codecs-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c97222927eebbdcc191a094c1881708eda4ffd83
diff --git a/solr/licenses/lucene-core-9.10.0.jar.sha1 b/solr/licenses/lucene-core-9.10.0.jar.sha1
new file mode 100644
index 00000000000..9349d6cf52e
--- /dev/null
+++ b/solr/licenses/lucene-core-9.10.0.jar.sha1
@@ -0,0 +1 @@
+64e5624754d59386be5d9159c68f81ff96298704
diff --git a/solr/licenses/lucene-core-9.9.2.jar.sha1 b/solr/licenses/lucene-core-9.9.2.jar.sha1
deleted file mode 100644
index 0a4072dae8a..00000000000
--- a/solr/licenses/lucene-core-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7699f80220fc80b08413902560904623b88beb9f
diff --git a/solr/licenses/lucene-expressions-9.10.0.jar.sha1 b/solr/licenses/lucene-expressions-9.10.0.jar.sha1
new file mode 100644
index 00000000000..11634c69671
--- /dev/null
+++ b/solr/licenses/lucene-expressions-9.10.0.jar.sha1
@@ -0,0 +1 @@
+e2daf2e568fe120e84567505f7c85643bb0b9dd2
diff --git a/solr/licenses/lucene-expressions-9.9.2.jar.sha1 b/solr/licenses/lucene-expressions-9.9.2.jar.sha1
deleted file mode 100644
index eeaf8f4166a..00000000000
--- a/solr/licenses/lucene-expressions-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-045df3828b6460c032a6551040e31ea432b0aad6
diff --git a/solr/licenses/lucene-grouping-9.10.0.jar.sha1 b/solr/licenses/lucene-grouping-9.10.0.jar.sha1
new file mode 100644
index 00000000000..64aac5519f6
--- /dev/null
+++ b/solr/licenses/lucene-grouping-9.10.0.jar.sha1
@@ -0,0 +1 @@
+b82838299e4fa423fc574c1c07405410823f74ce
diff --git a/solr/licenses/lucene-grouping-9.9.2.jar.sha1 b/solr/licenses/lucene-grouping-9.9.2.jar.sha1
deleted file mode 100644
index 7081c91772c..00000000000
--- a/solr/licenses/lucene-grouping-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-72b6c47fd80933d259859d38325e3e020c8e017b
diff --git a/solr/licenses/lucene-highlighter-9.10.0.jar.sha1 b/solr/licenses/lucene-highlighter-9.10.0.jar.sha1
new file mode 100644
index 00000000000..07624dd8687
--- /dev/null
+++ b/solr/licenses/lucene-highlighter-9.10.0.jar.sha1
@@ -0,0 +1 @@
+2f21ade4b4896f1ece2b3a823e1640c762c9d0cf
diff --git a/solr/licenses/lucene-highlighter-9.9.2.jar.sha1 b/solr/licenses/lucene-highlighter-9.9.2.jar.sha1
deleted file mode 100644
index 8568e0f9e58..00000000000
--- a/solr/licenses/lucene-highlighter-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0968d74d6794af65798819304f10ceb947080332
diff --git a/solr/licenses/lucene-join-9.10.0.jar.sha1 b/solr/licenses/lucene-join-9.10.0.jar.sha1
new file mode 100644
index 00000000000..4be822f2367
--- /dev/null
+++ b/solr/licenses/lucene-join-9.10.0.jar.sha1
@@ -0,0 +1 @@
+541b722bb842817e2ec899cd4d0de2a136953f53
diff --git a/solr/licenses/lucene-join-9.9.2.jar.sha1 b/solr/licenses/lucene-join-9.9.2.jar.sha1
deleted file mode 100644
index 34667dadfc6..00000000000
--- a/solr/licenses/lucene-join-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-902e4b65686e29c1489a7cdf43ed2ce3b7fe8ace
diff --git a/solr/licenses/lucene-memory-9.10.0.jar.sha1 b/solr/licenses/lucene-memory-9.10.0.jar.sha1
new file mode 100644
index 00000000000..4af1294f5c9
--- /dev/null
+++ b/solr/licenses/lucene-memory-9.10.0.jar.sha1
@@ -0,0 +1 @@
+06620029b6c7d84480fb7ad1ba0d72963111b765
diff --git a/solr/licenses/lucene-memory-9.9.2.jar.sha1 b/solr/licenses/lucene-memory-9.9.2.jar.sha1
deleted file mode 100644
index 46e380d1835..00000000000
--- a/solr/licenses/lucene-memory-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-08175beb4135c23e6918c822381cd51cd2e118a8
diff --git a/solr/licenses/lucene-misc-9.10.0.jar.sha1 b/solr/licenses/lucene-misc-9.10.0.jar.sha1
new file mode 100644
index 00000000000..ca5eba80e59
--- /dev/null
+++ b/solr/licenses/lucene-misc-9.10.0.jar.sha1
@@ -0,0 +1 @@
+3621206c534d253a0205f8a0293c146ff34d8b03
diff --git a/solr/licenses/lucene-misc-9.9.2.jar.sha1 b/solr/licenses/lucene-misc-9.9.2.jar.sha1
deleted file mode 100644
index 67fc5f8f455..00000000000
--- a/solr/licenses/lucene-misc-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-39b015aa603db42b55f0833193bdfc75d38842ba
diff --git a/solr/licenses/lucene-queries-9.10.0.jar.sha1 b/solr/licenses/lucene-queries-9.10.0.jar.sha1
new file mode 100644
index 00000000000..ff4690c3413
--- /dev/null
+++ b/solr/licenses/lucene-queries-9.10.0.jar.sha1
@@ -0,0 +1 @@
+bbe2360c60a43bf41fbf05d5f0b4f471547217ba
diff --git a/solr/licenses/lucene-queries-9.9.2.jar.sha1 b/solr/licenses/lucene-queries-9.9.2.jar.sha1
deleted file mode 100644
index be6fff50835..00000000000
--- a/solr/licenses/lucene-queries-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-671252594e15280818f56d4b369bc48c0ab00dac
diff --git a/solr/licenses/lucene-queryparser-9.10.0.jar.sha1 b/solr/licenses/lucene-queryparser-9.10.0.jar.sha1
new file mode 100644
index 00000000000..1048ec79107
--- /dev/null
+++ b/solr/licenses/lucene-queryparser-9.10.0.jar.sha1
@@ -0,0 +1 @@
+c50f82d244ea5adac2d2d9295de85ddccc2d45cb
diff --git a/solr/licenses/lucene-queryparser-9.9.2.jar.sha1 b/solr/licenses/lucene-queryparser-9.9.2.jar.sha1
deleted file mode 100644
index 8b0136eba92..00000000000
--- a/solr/licenses/lucene-queryparser-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7cf8dea63ab511ea9a322916198c3abd0402c8b2
diff --git a/solr/licenses/lucene-sandbox-9.10.0.jar.sha1 b/solr/licenses/lucene-sandbox-9.10.0.jar.sha1
new file mode 100644
index 00000000000..502b9e00ee8
--- /dev/null
+++ b/solr/licenses/lucene-sandbox-9.10.0.jar.sha1
@@ -0,0 +1 @@
+80bc56b23b34cddab97557e5ada7cd0558dbf5e5
diff --git a/solr/licenses/lucene-sandbox-9.9.2.jar.sha1 b/solr/licenses/lucene-sandbox-9.9.2.jar.sha1
deleted file mode 100644
index 9bdac742e6b..00000000000
--- a/solr/licenses/lucene-sandbox-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4e2bdc6a5b65dd15b78477cf2c49cf7b707ba757
diff --git a/solr/licenses/lucene-spatial-extras-9.10.0.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.10.0.jar.sha1
new file mode 100644
index 00000000000..0b051707eee
--- /dev/null
+++ b/solr/licenses/lucene-spatial-extras-9.10.0.jar.sha1
@@ -0,0 +1 @@
+055e6aa874b6ec9ddafc2e115055de1445c2df49
diff --git a/solr/licenses/lucene-spatial-extras-9.9.2.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.9.2.jar.sha1
deleted file mode 100644
index 6ff99ed6cb8..00000000000
--- a/solr/licenses/lucene-spatial-extras-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2693d4d4d3b9a0bf5b632ccbb01132eade1c4e14
diff --git a/solr/licenses/lucene-spatial3d-9.10.0.jar.sha1 b/solr/licenses/lucene-spatial3d-9.10.0.jar.sha1
new file mode 100644
index 00000000000..eff49fd4c36
--- /dev/null
+++ b/solr/licenses/lucene-spatial3d-9.10.0.jar.sha1
@@ -0,0 +1 @@
+06945a8b2a703062ce4b286ecceae7182b4f5f44
diff --git a/solr/licenses/lucene-spatial3d-9.9.2.jar.sha1 b/solr/licenses/lucene-spatial3d-9.9.2.jar.sha1
deleted file mode 100644
index 3e18cb044eb..00000000000
--- a/solr/licenses/lucene-spatial3d-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-61866a44eafce499ebbc20bcb75c8b8a60a5449b
diff --git a/solr/licenses/lucene-suggest-9.10.0.jar.sha1 b/solr/licenses/lucene-suggest-9.10.0.jar.sha1
new file mode 100644
index 00000000000..b042144dd7b
--- /dev/null
+++ b/solr/licenses/lucene-suggest-9.10.0.jar.sha1
@@ -0,0 +1 @@
+d2068ad997165a414927e8c0072d0b88741af069
diff --git a/solr/licenses/lucene-suggest-9.9.2.jar.sha1 b/solr/licenses/lucene-suggest-9.9.2.jar.sha1
deleted file mode 100644
index 8489707618c..00000000000
--- a/solr/licenses/lucene-suggest-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-352ad5296f48a482e2b65bb7d5d6ba2977bb035e
diff --git a/solr/licenses/lucene-test-framework-9.10.0.jar.sha1 b/solr/licenses/lucene-test-framework-9.10.0.jar.sha1
new file mode 100644
index 00000000000..33b64fd24ae
--- /dev/null
+++ b/solr/licenses/lucene-test-framework-9.10.0.jar.sha1
@@ -0,0 +1 @@
+3da58b8d40798a45e4073fdc2148095c8a5ed483
diff --git a/solr/licenses/lucene-test-framework-9.9.2.jar.sha1 b/solr/licenses/lucene-test-framework-9.9.2.jar.sha1
deleted file mode 100644
index 947884ee5a0..00000000000
--- a/solr/licenses/lucene-test-framework-9.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-447d9a4b48af97d1bf9086ea463d5fec28bdd0de
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index 6b5c3254bc6..e04a4cb9a9b 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 can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>9.9</luceneMatchVersion>
+ <luceneMatchVersion>9.10</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index f652e0243f5..9b83b3e6db5 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 can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>9.9</luceneMatchVersion>
+ <luceneMatchVersion>9.10</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git a/versions.lock b/versions.lock
index 55f695e5991..bd80c3ae59a 100644
--- a/versions.lock
+++ b/versions.lock
@@ -209,32 +209,32 @@ org.apache.logging.log4j:log4j-jul:2.21.0 (1 constraints: 3705363b)
org.apache.logging.log4j:log4j-layout-template-json:2.21.0 (1 constraints: 3705363b)
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0 (1 constraints: 3705363b)
org.apache.logging.log4j:log4j-web:2.21.0 (1 constraints: 3705363b)
-org.apache.lucene:lucene-analysis-common:9.9.2 (10 constraints: 1a9fe48d)
-org.apache.lucene:lucene-analysis-icu:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-kuromoji:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-morfologik:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-nori:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-opennlp:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-phonetic:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-smartcn:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-stempel:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-backward-codecs:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-classification:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-codecs:9.9.2 (3 constraints: b4258047)
-org.apache.lucene:lucene-core:9.9.2 (26 constraints: b19036b6)
-org.apache.lucene:lucene-expressions:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-grouping:9.9.2 (2 constraints: f21560e5)
-org.apache.lucene:lucene-highlighter:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-join:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-memory:9.9.2 (1 constraints: a00fbc83)
-org.apache.lucene:lucene-misc:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-queries:9.9.2 (6 constraints: de51e688)
-org.apache.lucene:lucene-queryparser:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-sandbox:9.9.2 (1 constraints: d40f3587)
-org.apache.lucene:lucene-spatial-extras:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-spatial3d:9.9.2 (1 constraints: c310c4b9)
-org.apache.lucene:lucene-suggest:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-test-framework:9.9.2 (1 constraints: 16053536)
+org.apache.lucene:lucene-analysis-common:9.10.0 (10 constraints: 96a0f715)
+org.apache.lucene:lucene-analysis-icu:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-kuromoji:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-morfologik:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-nori:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-opennlp:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-phonetic:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-smartcn:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-stempel:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-backward-codecs:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-classification:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-codecs:9.10.0 (3 constraints: 2626bd9c)
+org.apache.lucene:lucene-core:9.10.0 (26 constraints: 8d94ec8e)
+org.apache.lucene:lucene-expressions:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-grouping:9.10.0 (2 constraints: 3e16d907)
+org.apache.lucene:lucene-highlighter:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-join:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-memory:9.10.0 (1 constraints: c60f6a93)
+org.apache.lucene:lucene-misc:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-queries:9.10.0 (6 constraints: c25289f5)
+org.apache.lucene:lucene-queryparser:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-sandbox:9.10.0 (1 constraints: fa0f1797)
+org.apache.lucene:lucene-spatial-extras:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-spatial3d:9.10.0 (1 constraints: e91095ca)
+org.apache.lucene:lucene-suggest:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-test-framework:9.10.0 (1 constraints: 3c05593b)
org.apache.opennlp:opennlp-tools:1.9.4 (2 constraints: fc1dce6d)
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.props
index e5ecd31ae9a..16342c87a34 100644
--- a/versions.props
+++ b/versions.props
@@ -48,7 +48,7 @@ org.apache.httpcomponents:httpcore=4.4.16
org.apache.httpcomponents:httpmime=4.5.14
org.apache.kerby:*=1.0.1
org.apache.logging.log4j:*=2.21.0
-org.apache.lucene:*=9.9.2
+org.apache.lucene:*=9.10.0
org.apache.tika:*=1.28.5
org.apache.tomcat:annotations-api=6.0.53
org.apache.zookeeper:*=3.9.1