Apache Solr open-source search software
SOLR-17471: upgrade Lucene to version 9.12.1 (#2736)
Pierre Salagnacee1e48dce697
diff --git a/dev-docs/lucene-upgrade.md b/dev-docs/lucene-upgrade.mdindex c9ee1a27802..e5ab91e7c9f 100644--- a/dev-docs/lucene-upgrade.md+++ b/dev-docs/lucene-upgrade.md@@ -27,7 +27,7 @@ Create a new branch locally e.g. `git checkout -b lucene940 -t origin/main` for## Build-### `versions.props` update+### `gradle/libs.versions.toml` update```- org.apache.lucene:*=9.3.0@@ -37,7 +37,7 @@ Create a new branch locally e.g. `git checkout -b lucene940 -t origin/main` for### `versions.lock` update```-gradlew --write-locks+gradlew :writeLocks```### `solr/licenses` updatediff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex dd7a5dfff0f..685fe012216 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -39,7 +39,7 @@ apache-httpcomponents-httpcore = "4.4.16"apache-httpcomponents-httpmime = "4.5.14"apache-kafka = "3.7.1"apache-log4j = "2.21.0"-apache-lucene = "9.11.1"+apache-lucene = "9.12.1"apache-opennlp = "1.9.4"apache-poi = "5.2.2"apache-rat = "0.15"diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 9ef3e302af9..b7291e9a23e 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -170,7 +170,7 @@ Bug FixesDependency Upgrades----------------------(No changes)+* SOLR-17471: Upgrade Lucene to 9.12.1. (Pierre Salagnac, Christine Poerschke)Other Changes---------------------diff --git a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.javaindex a7d9305b3c3..cf1c0f18d0a 100644--- a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java+++ b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java@@ -26,8 +26,8 @@ import org.apache.lucene.codecs.KnnVectorsFormat;import org.apache.lucene.codecs.KnnVectorsReader;import org.apache.lucene.codecs.KnnVectorsWriter;import org.apache.lucene.codecs.PostingsFormat;-import org.apache.lucene.codecs.lucene99.Lucene99Codec;-import org.apache.lucene.codecs.lucene99.Lucene99Codec.Mode;+import org.apache.lucene.codecs.lucene912.Lucene912Codec;+import org.apache.lucene.codecs.lucene912.Lucene912Codec.Mode;import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat;import org.apache.lucene.index.SegmentReadState;import org.apache.lucene.index.SegmentWriteState;@@ -97,7 +97,7 @@ public class SchemaCodecFactory extends CodecFactory implements SolrCoreAware {log.debug("Using default compressionMode: {}", compressionMode);}codec =- new Lucene99Codec(compressionMode) {+ new Lucene912Codec(compressionMode) {@Overridepublic PostingsFormat getPostingsFormatForField(String field) {final SchemaField schemaField = core.getLatestSchema().getFieldOrNull(field);diff --git a/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepository.java b/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepository.javaindex 68cf5636fdd..5e45e5ef206 100644--- a/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepository.java+++ b/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepository.java@@ -31,7 +31,6 @@ import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.IndexOutput;import org.apache.lucene.util.IOUtils;import org.apache.solr.common.params.CoreAdminParams;-import org.apache.solr.core.DirectoryFactory;import org.apache.solr.core.backup.Checksum;import org.apache.solr.util.plugin.NamedListInitializedPlugin;@@ -217,9 +216,8 @@ public interface BackupRepository extends NamedListInitializedPlugin, CloseableDirectory sourceDir, String sourceFileName, Directory destDir, String destFileName)throws IOException {boolean success = false;- try (ChecksumIndexInput is =- sourceDir.openChecksumInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE);- IndexOutput os = destDir.createOutput(destFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)) {+ try (ChecksumIndexInput is = sourceDir.openChecksumInput(sourceFileName, IOContext.READONCE);+ IndexOutput os = destDir.createOutput(destFileName, IOContext.READONCE)) {os.copyBytes(is, is.length() - CodecUtil.footerLength());// ensure that index file is not corrupted@@ -300,8 +298,8 @@ public interface BackupRepository extends NamedListInitializedPlugin, CloseableDirectory sourceDir, String sourceFileName, Directory destDir, String destFileName)throws IOException {boolean success = false;- try (IndexInput is = sourceDir.openInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE);- IndexOutput os = destDir.createOutput(destFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)) {+ try (IndexInput is = sourceDir.openInput(sourceFileName, IOContext.READONCE);+ IndexOutput os = destDir.createOutput(destFileName, IOContext.READONCE)) {os.copyBytes(is, is.length());success = true;} finally {diff --git a/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.javaindex 250ca045acf..ade8362ee88 100644--- a/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java+++ b/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java@@ -31,7 +31,7 @@ import org.apache.solr.schema.SimilarityFactory;* <p>Optional settings:** <ul>- * <li>discountOverlaps (bool): Sets {@link ClassicSimilarity#setDiscountOverlaps(boolean)}+ * <li>discountOverlaps (bool): Sets {@link ClassicSimilarity#getDiscountOverlaps()}.* </ul>** @see TFIDFSimilarity@@ -41,13 +41,13 @@ public class ClassicSimilarityFactory extends SimilarityFactory {/*** Init param name for specifying the value to use in {@link- * ClassicSimilarity#setDiscountOverlaps(boolean)}+ * ClassicSimilarity#getDiscountOverlaps()}.*/public static final String DISCOUNT_OVERLAPS = "discountOverlaps";/**- * Controls the value of {@link ClassicSimilarity#setDiscountOverlaps(boolean)} on newly- * constructed instances of {@link ClassicSimilarity}+ * Controls the value of {@link ClassicSimilarity#getDiscountOverlaps()} on newly constructed+ * instances of {@link ClassicSimilarity}*/protected boolean discountOverlaps = true;@@ -59,8 +59,6 @@ public class ClassicSimilarityFactory extends SimilarityFactory {@Overridepublic Similarity getSimilarity() {- ClassicSimilarity sim = new ClassicSimilarity();- sim.setDiscountOverlaps(discountOverlaps);- return sim;+ return new ClassicSimilarity(discountOverlaps);}}diff --git a/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.javaindex df5ea9f1182..7bdb9f8e518 100644--- a/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.java+++ b/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.java@@ -39,8 +39,7 @@ import org.apache.solr.schema.SimilarityFactory;* Optional settings:** <ul>- * <li>discountOverlaps (bool): Sets {@link- * org.apache.lucene.search.similarities.SimilarityBase#setDiscountOverlaps(boolean)}+ * <li>discountOverlaps (bool): Sets {link Similarity#getDiscountOverlaps()}* </ul>** @lucene.experimental@@ -59,9 +58,7 @@ public class DFISimilarityFactory extends SimilarityFactory {@Overridepublic Similarity getSimilarity() {- DFISimilarity sim = new DFISimilarity(independenceMeasure);- sim.setDiscountOverlaps(discountOverlaps);- return sim;+ return new DFISimilarity(independenceMeasure, discountOverlaps);}private Independence parseIndependenceMeasure(String expr) {diff --git a/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.javaindex 61b972f604b..63cca3194f5 100644--- a/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java+++ b/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java@@ -86,7 +86,7 @@ import org.apache.solr.schema.SimilarityFactory;* <p>Optional settings:** <ul>- * <li>discountOverlaps (bool): Sets {@link DFRSimilarity#setDiscountOverlaps(boolean)}+ * <li>discountOverlaps (bool): Sets {@link Similarity#getDiscountOverlaps()}* </ul>** @lucene.experimental@@ -160,8 +160,6 @@ public class DFRSimilarityFactory extends SimilarityFactory {@Overridepublic Similarity getSimilarity() {- DFRSimilarity sim = new DFRSimilarity(basicModel, afterEffect, normalization);- sim.setDiscountOverlaps(discountOverlaps);- return sim;+ return new DFRSimilarity(basicModel, afterEffect, normalization, discountOverlaps);}}diff --git a/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.javaindex 6c387fe93de..b397b9c655a 100644--- a/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java+++ b/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java@@ -56,7 +56,7 @@ import org.apache.solr.schema.SimilarityFactory;* <p>Optional settings:** <ul>- * <li>discountOverlaps (bool): Sets {@link IBSimilarity#setDiscountOverlaps(boolean)}+ * <li>discountOverlaps (bool): Sets {link Similarity#getDiscountOverlaps()}* </ul>** @lucene.experimental@@ -100,8 +100,6 @@ public class IBSimilarityFactory extends SimilarityFactory {@Overridepublic Similarity getSimilarity() {- IBSimilarity sim = new IBSimilarity(distribution, lambda, normalization);- sim.setDiscountOverlaps(discountOverlaps);- return sim;+ return new IBSimilarity(distribution, lambda, normalization, discountOverlaps);}}diff --git a/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.javaindex d23430d45ab..8792e5ff0d7 100644--- a/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.java+++ b/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.java@@ -17,6 +17,7 @@package org.apache.solr.search.similarities;import org.apache.lucene.search.similarities.LMDirichletSimilarity;+import org.apache.lucene.search.similarities.LMSimilarity;import org.apache.lucene.search.similarities.Similarity;import org.apache.solr.common.params.SolrParams;import org.apache.solr.schema.SimilarityFactory;@@ -33,7 +34,7 @@ import org.apache.solr.schema.SimilarityFactory;* <p>Optional settings:** <ul>- * <li>discountOverlaps (bool): Sets {@link LMDirichletSimilarity#setDiscountOverlaps(boolean)}+ * <li>discountOverlaps (bool): Sets {link Similarity#getDiscountOverlaps()}* </ul>** @lucene.experimental@@ -51,9 +52,13 @@ public class LMDirichletSimilarityFactory extends SimilarityFactory {@Overridepublic Similarity getSimilarity() {- LMDirichletSimilarity sim =- (mu != null) ? new LMDirichletSimilarity(mu) : new LMDirichletSimilarity();- sim.setDiscountOverlaps(discountOverlaps);- return sim;++ // Default μ is 2000 in Lucene. Unfortunately, there is no constant we can use+ if (mu == null) {+ mu = 2000f;+ }++ LMSimilarity.CollectionModel model = new LMSimilarity.DefaultCollectionModel();+ return new LMDirichletSimilarity(model, discountOverlaps, mu);}}diff --git a/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.javaindex 1f5549b769f..384dc5d9c37 100644--- a/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.java+++ b/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.java@@ -17,6 +17,7 @@package org.apache.solr.search.similarities;import org.apache.lucene.search.similarities.LMJelinekMercerSimilarity;+import org.apache.lucene.search.similarities.LMSimilarity;import org.apache.lucene.search.similarities.Similarity;import org.apache.solr.common.params.SolrParams;import org.apache.solr.schema.SimilarityFactory;@@ -33,8 +34,7 @@ import org.apache.solr.schema.SimilarityFactory;* <p>Optional settings:** <ul>- * <li>discountOverlaps (bool): Sets {@link- * LMJelinekMercerSimilarity#setDiscountOverlaps(boolean)}+ * <li>discountOverlaps (bool): Sets {link Similarity#getDiscountOverlaps()}* </ul>** @lucene.experimental@@ -52,8 +52,7 @@ public class LMJelinekMercerSimilarityFactory extends SimilarityFactory {@Overridepublic Similarity getSimilarity() {- LMJelinekMercerSimilarity sim = new LMJelinekMercerSimilarity(lambda);- sim.setDiscountOverlaps(discountOverlaps);- return sim;+ LMSimilarity.CollectionModel model = new LMSimilarity.DefaultCollectionModel();+ return new LMJelinekMercerSimilarity(model, discountOverlaps, lambda);}}diff --git a/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.javaindex 8dfc886dcc7..e312398bc48 100644--- a/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java+++ b/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java@@ -104,33 +104,44 @@ import org.apache.solr.common.params.SolrParams;* </code> for SVG diagrams showing how the each function behaves with various settings/inputs.*/public class SweetSpotSimilarityFactory extends ClassicSimilarityFactory {- private SweetSpotSimilarity sim = null;++ private Integer ln_min;+ private Integer ln_max;+ private Float ln_steep;++ private Float hyper_min;+ private Float hyper_max;+ private Double hyper_base;+ private Float hyper_offset;++ private Float baseline_base;+ private Float baseline_min;@Overridepublic void init(SolrParams params) {super.init(params);- Integer ln_min = params.getInt("lengthNormMin");- Integer ln_max = params.getInt("lengthNormMax");- Float ln_steep = params.getFloat("lengthNormSteepness");+ ln_min = params.getInt("lengthNormMin");+ ln_max = params.getInt("lengthNormMax");+ ln_steep = params.getFloat("lengthNormSteepness");if (!allOrNoneNull(ln_min, ln_max, ln_steep)) {throw new SolrException(SERVER_ERROR,"Overriding default lengthNorm settings requires all to be specified: lengthNormMin, lengthNormMax, lengthNormSteepness");}- Float hyper_min = params.getFloat("hyperbolicTfMin");- Float hyper_max = params.getFloat("hyperbolicTfMax");- Double hyper_base = params.getDouble("hyperbolicTfBase");- Float hyper_offset = params.getFloat("hyperbolicTfOffset");+ hyper_min = params.getFloat("hyperbolicTfMin");+ hyper_max = params.getFloat("hyperbolicTfMax");+ hyper_base = params.getDouble("hyperbolicTfBase");+ hyper_offset = params.getFloat("hyperbolicTfOffset");if (!allOrNoneNull(hyper_min, hyper_max, hyper_base, hyper_offset)) {throw new SolrException(SERVER_ERROR,"Overriding default hyperbolicTf settings requires all to be specified: hyperbolicTfMin, hyperbolicTfMax, hyperbolicTfBase, hyperbolicTfOffset");}- Float baseline_base = params.getFloat("baselineTfBase");- Float baseline_min = params.getFloat("baselineTfMin");+ baseline_base = params.getFloat("baselineTfBase");+ baseline_min = params.getFloat("baselineTfMin");if (!allOrNoneNull(baseline_min, baseline_base)) {throw new SolrException(SERVER_ERROR,@@ -142,13 +153,19 @@ public class SweetSpotSimilarityFactory extends ClassicSimilarityFactory {throw new SolrException(SERVER_ERROR, "Can not mix hyperbolicTf settings with baselineTf settings");}+ }+ @Override+ public Similarity getSimilarity() {// pick Similarity impl based on whether hyper tf settings are set- sim = (null != hyper_min) ? new HyperbolicSweetSpotSimilarity() : new SweetSpotSimilarity();+ SweetSpotSimilarity sim =+ (null != hyper_min)+ ? new HyperbolicSweetSpotSimilarity(discountOverlaps)+ : new SweetSpotSimilarity(discountOverlaps);if (null != ln_min) {// overlaps already handled by super factory- sim.setLengthNormFactors(ln_min, ln_max, ln_steep, this.discountOverlaps);+ sim.setLengthNormFactors(ln_min, ln_max, ln_steep);}if (null != hyper_min) {@@ -158,11 +175,7 @@ public class SweetSpotSimilarityFactory extends ClassicSimilarityFactory {if (null != baseline_min) {sim.setBaselineTfFactors(baseline_base, baseline_min);}- }- @Override- public Similarity getSimilarity() {- assert sim != null : "SweetSpotSimilarityFactory was not initialized";return sim;}@@ -181,6 +194,11 @@ public class SweetSpotSimilarityFactory extends ClassicSimilarityFactory {}private static final class HyperbolicSweetSpotSimilarity extends SweetSpotSimilarity {++ private HyperbolicSweetSpotSimilarity(boolean discountOverlaps) {+ super(discountOverlaps);+ }+@Overridepublic float tf(float freq) {return hyperbolicTf(freq);diff --git a/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml b/solr/core/src/test-files/solr/collection1/conf/schema_codec.xmlindex 29e62e3c88c..5095c0c01ac 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml@@ -20,7 +20,7 @@as a way to vet that the configuration actually matters.--><fieldType name="string_direct" class="solr.StrField" postingsFormat="Direct" docValuesFormat="Asserting" />- <fieldType name="string_standard" class="solr.StrField" postingsFormat="Lucene99"/>+ <fieldType name="string_standard" class="solr.StrField" postingsFormat="Lucene912"/><fieldType name="string_disk" class="solr.StrField" />diff --git a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.javaindex 54f7406635d..f5f084da8ab 100644--- a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java+++ b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java@@ -22,7 +22,7 @@ import java.io.IOException;import java.util.Map;import java.util.Set;import org.apache.lucene.codecs.Codec;-import org.apache.lucene.codecs.lucene99.Lucene99Codec.Mode;+import org.apache.lucene.codecs.lucene912.Lucene912Codec.Mode;import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;import org.apache.lucene.index.SegmentInfo;diff --git a/solr/licenses/lucene-analysis-common-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-common-9.11.1.jar.sha1deleted file mode 100644index 2b71b2f9ebf..00000000000--- a/solr/licenses/lucene-analysis-common-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-51286aca019db66311f71496191b4bd7adaf3dcfdiff --git a/solr/licenses/lucene-analysis-common-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-common-9.12.1.jar.sha1new file mode 100644index 00000000000..805ece8fb95--- /dev/null+++ b/solr/licenses/lucene-analysis-common-9.12.1.jar.sha1@@ -0,0 +1 @@+86836497e35c1ab33259d9864ceb280c0016075ediff --git a/solr/licenses/lucene-analysis-icu-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.11.1.jar.sha1deleted file mode 100644index 95765d43eab..00000000000--- a/solr/licenses/lucene-analysis-icu-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-028beadfa152c159d21d880461c06f895052bd33diff --git a/solr/licenses/lucene-analysis-icu-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.12.1.jar.sha1new file mode 100644index 00000000000..d938191bbfd--- /dev/null+++ b/solr/licenses/lucene-analysis-icu-9.12.1.jar.sha1@@ -0,0 +1 @@+abaef4767ad64289e62abdd4606bf6ed2ddea0fddiff --git a/solr/licenses/lucene-analysis-kuromoji-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.11.1.jar.sha1deleted file mode 100644index d51f9c1b6ea..00000000000--- a/solr/licenses/lucene-analysis-kuromoji-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-701c1366189c4410d3cb1f8607df2e50621bfd22diff --git a/solr/licenses/lucene-analysis-kuromoji-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.12.1.jar.sha1new file mode 100644index 00000000000..af4a809392a--- /dev/null+++ b/solr/licenses/lucene-analysis-kuromoji-9.12.1.jar.sha1@@ -0,0 +1 @@+635c41143b896f402589d29e33695dcfabae9cc5diff --git a/solr/licenses/lucene-analysis-morfologik-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.11.1.jar.sha1deleted file mode 100644index 8421387ddb6..00000000000--- a/solr/licenses/lucene-analysis-morfologik-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-20fe70fa74097c35c9aaaa5c0e19ca5f7ac93141diff --git a/solr/licenses/lucene-analysis-morfologik-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.12.1.jar.sha1new file mode 100644index 00000000000..0df56116cac--- /dev/null+++ b/solr/licenses/lucene-analysis-morfologik-9.12.1.jar.sha1@@ -0,0 +1 @@+d8e4716dab6d829e7b37a8b185cbd242650aeb9ediff --git a/solr/licenses/lucene-analysis-nori-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.11.1.jar.sha1deleted file mode 100644index 3cd3de6f22d..00000000000--- a/solr/licenses/lucene-analysis-nori-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-46e8f4f3f2f540307fe7d9f500ddc56c1e74d400diff --git a/solr/licenses/lucene-analysis-nori-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.12.1.jar.sha1new file mode 100644index 00000000000..2ebf1d07eed--- /dev/null+++ b/solr/licenses/lucene-analysis-nori-9.12.1.jar.sha1@@ -0,0 +1 @@+e265410a6a4d9cd23b2e9c73321e6bd307bc1422diff --git a/solr/licenses/lucene-analysis-opennlp-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.11.1.jar.sha1deleted file mode 100644index 3d521c374c6..00000000000--- a/solr/licenses/lucene-analysis-opennlp-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8acc70958b0549705c45587bf315b2884a8eb169diff --git a/solr/licenses/lucene-analysis-opennlp-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.12.1.jar.sha1new file mode 100644index 00000000000..77cf5acafe1--- /dev/null+++ b/solr/licenses/lucene-analysis-opennlp-9.12.1.jar.sha1@@ -0,0 +1 @@+021d892f1946bc238c6e9a651f9446813b715c5adiff --git a/solr/licenses/lucene-analysis-phonetic-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.11.1.jar.sha1deleted file mode 100644index 144a5724a1a..00000000000--- a/solr/licenses/lucene-analysis-phonetic-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-5d8eca81f0d1e5671bf1f1692225f7d8cc7977e8diff --git a/solr/licenses/lucene-analysis-phonetic-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.12.1.jar.sha1new file mode 100644index 00000000000..09dd0aa365c--- /dev/null+++ b/solr/licenses/lucene-analysis-phonetic-9.12.1.jar.sha1@@ -0,0 +1 @@+3787b8edc0cfad21998abc6aeb9d2cbf152b4b26diff --git a/solr/licenses/lucene-analysis-smartcn-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.11.1.jar.sha1deleted file mode 100644index 4cfb7e94652..00000000000--- a/solr/licenses/lucene-analysis-smartcn-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e900ea081428c3fdc7ec7a48f9c392871304476ediff --git a/solr/licenses/lucene-analysis-smartcn-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.12.1.jar.sha1new file mode 100644index 00000000000..eed0ea08e27--- /dev/null+++ b/solr/licenses/lucene-analysis-smartcn-9.12.1.jar.sha1@@ -0,0 +1 @@+e935f600bf153c46f5725198ca9352c32025f274diff --git a/solr/licenses/lucene-analysis-stempel-9.11.1.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.11.1.jar.sha1deleted file mode 100644index 59120fa4610..00000000000--- a/solr/licenses/lucene-analysis-stempel-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-50f4d2400fa6264bf682028d8c7b6bbdd588b496diff --git a/solr/licenses/lucene-analysis-stempel-9.12.1.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.12.1.jar.sha1new file mode 100644index 00000000000..12e57532ee6--- /dev/null+++ b/solr/licenses/lucene-analysis-stempel-9.12.1.jar.sha1@@ -0,0 +1 @@+c4e1c94b1adbd1cb9dbdc0d3c2d2c33beabfc777diff --git a/solr/licenses/lucene-backward-codecs-9.11.1.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.11.1.jar.sha1deleted file mode 100644index d8e756dd606..00000000000--- a/solr/licenses/lucene-backward-codecs-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-948fda53ceeb0fa1b835af5376abec771b2c3fb1diff --git a/solr/licenses/lucene-backward-codecs-9.12.1.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.12.1.jar.sha1new file mode 100644index 00000000000..c8871fa4179--- /dev/null+++ b/solr/licenses/lucene-backward-codecs-9.12.1.jar.sha1@@ -0,0 +1 @@+d0e79d06a0ed021663737e4df777ab7b80cd28c4diff --git a/solr/licenses/lucene-classification-9.11.1.jar.sha1 b/solr/licenses/lucene-classification-9.11.1.jar.sha1deleted file mode 100644index 3d17b3b3af8..00000000000--- a/solr/licenses/lucene-classification-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8a157f57964e1b8b9106b8c70083387f5a212362diff --git a/solr/licenses/lucene-classification-9.12.1.jar.sha1 b/solr/licenses/lucene-classification-9.12.1.jar.sha1new file mode 100644index 00000000000..81a3850dc0d--- /dev/null+++ b/solr/licenses/lucene-classification-9.12.1.jar.sha1@@ -0,0 +1 @@+a64da0d06bedcf7a7a6ca5b13d0b49918717d576diff --git a/solr/licenses/lucene-codecs-9.11.1.jar.sha1 b/solr/licenses/lucene-codecs-9.11.1.jar.sha1deleted file mode 100644index 87712934448..00000000000--- a/solr/licenses/lucene-codecs-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-b1f1f273e1a2a956528dbf2abf4f7300b18648b2diff --git a/solr/licenses/lucene-codecs-9.12.1.jar.sha1 b/solr/licenses/lucene-codecs-9.12.1.jar.sha1new file mode 100644index 00000000000..e65e95728d0--- /dev/null+++ b/solr/licenses/lucene-codecs-9.12.1.jar.sha1@@ -0,0 +1 @@+cf88c401660f80fd7a3c0896c180581126880697diff --git a/solr/licenses/lucene-core-9.11.1.jar.sha1 b/solr/licenses/lucene-core-9.11.1.jar.sha1deleted file mode 100644index d6f1be77240..00000000000--- a/solr/licenses/lucene-core-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8f52ba14b21774f41ce33cf5ca111cbdefeed7f9diff --git a/solr/licenses/lucene-core-9.12.1.jar.sha1 b/solr/licenses/lucene-core-9.12.1.jar.sha1new file mode 100644index 00000000000..2000314c74c--- /dev/null+++ b/solr/licenses/lucene-core-9.12.1.jar.sha1@@ -0,0 +1 @@+91447c90c1180122142773b5baddaf8547124794diff --git a/solr/licenses/lucene-expressions-9.11.1.jar.sha1 b/solr/licenses/lucene-expressions-9.11.1.jar.sha1deleted file mode 100644index cb9f8b66836..00000000000--- a/solr/licenses/lucene-expressions-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e46fbc4fd325ca00ed5a7cacde7ffafa01d7973ediff --git a/solr/licenses/lucene-expressions-9.12.1.jar.sha1 b/solr/licenses/lucene-expressions-9.12.1.jar.sha1new file mode 100644index 00000000000..870d6a91d7e--- /dev/null+++ b/solr/licenses/lucene-expressions-9.12.1.jar.sha1@@ -0,0 +1 @@+667ee99f31c8e42eac70b0adcf8deb4232935430diff --git a/solr/licenses/lucene-facet-9.12.1.jar.sha1 b/solr/licenses/lucene-facet-9.12.1.jar.sha1new file mode 100644index 00000000000..469a8a45fac--- /dev/null+++ b/solr/licenses/lucene-facet-9.12.1.jar.sha1@@ -0,0 +1 @@+265df739cf97862931606395a10a0d0b97ff7f97diff --git a/solr/licenses/lucene-grouping-9.11.1.jar.sha1 b/solr/licenses/lucene-grouping-9.11.1.jar.sha1deleted file mode 100644index 8290e22d3c4..00000000000--- a/solr/licenses/lucene-grouping-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-0bdf9db0134523d2a41123dca1018f4c771c7b23diff --git a/solr/licenses/lucene-grouping-9.12.1.jar.sha1 b/solr/licenses/lucene-grouping-9.12.1.jar.sha1new file mode 100644index 00000000000..7fa34405470--- /dev/null+++ b/solr/licenses/lucene-grouping-9.12.1.jar.sha1@@ -0,0 +1 @@+e4bc3d0aa7eec4f41b4f350de0263a8d5625d2b3diff --git a/solr/licenses/lucene-highlighter-9.11.1.jar.sha1 b/solr/licenses/lucene-highlighter-9.11.1.jar.sha1deleted file mode 100644index 5fd7ac44ddc..00000000000--- a/solr/licenses/lucene-highlighter-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e16cc9c531998a76eb5528147b5f07596f95fad8diff --git a/solr/licenses/lucene-highlighter-9.12.1.jar.sha1 b/solr/licenses/lucene-highlighter-9.12.1.jar.sha1new file mode 100644index 00000000000..ddd10ca6e1c--- /dev/null+++ b/solr/licenses/lucene-highlighter-9.12.1.jar.sha1@@ -0,0 +1 @@+2eeedfcec47dd65969f36e88931ed452291dd43ediff --git a/solr/licenses/lucene-join-9.11.1.jar.sha1 b/solr/licenses/lucene-join-9.11.1.jar.sha1deleted file mode 100644index db5c2e0ad13..00000000000--- a/solr/licenses/lucene-join-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f7d63c04f3cc2ec8d7df73178db20de34cf60667diff --git a/solr/licenses/lucene-join-9.12.1.jar.sha1 b/solr/licenses/lucene-join-9.12.1.jar.sha1new file mode 100644index 00000000000..b03ee165abc--- /dev/null+++ b/solr/licenses/lucene-join-9.12.1.jar.sha1@@ -0,0 +1 @@+3c5e9ff2925a8373ae0d35c1d0a7b2465cebec9fdiff --git a/solr/licenses/lucene-memory-9.11.1.jar.sha1 b/solr/licenses/lucene-memory-9.11.1.jar.sha1deleted file mode 100644index bdd68d82720..00000000000--- a/solr/licenses/lucene-memory-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-4221baad5c40849f641f0f5c1b8e2f2dfcf1e73adiff --git a/solr/licenses/lucene-memory-9.12.1.jar.sha1 b/solr/licenses/lucene-memory-9.12.1.jar.sha1new file mode 100644index 00000000000..e0541f0f417--- /dev/null+++ b/solr/licenses/lucene-memory-9.12.1.jar.sha1@@ -0,0 +1 @@+e80eecfb1dcc324140387c8357c81e12c2a01937diff --git a/solr/licenses/lucene-misc-9.11.1.jar.sha1 b/solr/licenses/lucene-misc-9.11.1.jar.sha1deleted file mode 100644index 53bc1cb906b..00000000000--- a/solr/licenses/lucene-misc-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a3ecdb999c3d3435ead88771ce215834bd8be7b8diff --git a/solr/licenses/lucene-misc-9.12.1.jar.sha1 b/solr/licenses/lucene-misc-9.12.1.jar.sha1new file mode 100644index 00000000000..bed6c11b854--- /dev/null+++ b/solr/licenses/lucene-misc-9.12.1.jar.sha1@@ -0,0 +1 @@+4e65d01d1c23f3f49dc325d552701bbefafee7eediff --git a/solr/licenses/lucene-queries-9.11.1.jar.sha1 b/solr/licenses/lucene-queries-9.11.1.jar.sha1deleted file mode 100644index d8e030fc1f2..00000000000--- a/solr/licenses/lucene-queries-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-027fc885a0442a0442f426f7fea9743f6fcf3c43diff --git a/solr/licenses/lucene-queries-9.12.1.jar.sha1 b/solr/licenses/lucene-queries-9.12.1.jar.sha1new file mode 100644index 00000000000..1cda38477b3--- /dev/null+++ b/solr/licenses/lucene-queries-9.12.1.jar.sha1@@ -0,0 +1 @@+14f24315041b686683dba4bc679ca7dc6a505906diff --git a/solr/licenses/lucene-queryparser-9.11.1.jar.sha1 b/solr/licenses/lucene-queryparser-9.11.1.jar.sha1deleted file mode 100644index 1f69eb506fd..00000000000--- a/solr/licenses/lucene-queryparser-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ad6e5b135e1e284d4462d717086ce13a3ce01b4adiff --git a/solr/licenses/lucene-queryparser-9.12.1.jar.sha1 b/solr/licenses/lucene-queryparser-9.12.1.jar.sha1new file mode 100644index 00000000000..9baf9838b20--- /dev/null+++ b/solr/licenses/lucene-queryparser-9.12.1.jar.sha1@@ -0,0 +1 @@+aa6df09a99f8881d843e9863aa1713dc9f3ed24fdiff --git a/solr/licenses/lucene-sandbox-9.11.1.jar.sha1 b/solr/licenses/lucene-sandbox-9.11.1.jar.sha1deleted file mode 100644index 6613da2336a..00000000000--- a/solr/licenses/lucene-sandbox-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-9d6a88d9cb7f206c12d13c4fe48f8c7a973ebdb5diff --git a/solr/licenses/lucene-sandbox-9.12.1.jar.sha1 b/solr/licenses/lucene-sandbox-9.12.1.jar.sha1new file mode 100644index 00000000000..87836cb52c9--- /dev/null+++ b/solr/licenses/lucene-sandbox-9.12.1.jar.sha1@@ -0,0 +1 @@+1a66485629d60779f039fc26360f4374ef1496e7diff --git a/solr/licenses/lucene-spatial-extras-9.11.1.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.11.1.jar.sha1deleted file mode 100644index ed1128ece9b..00000000000--- a/solr/licenses/lucene-spatial-extras-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-d3938d4f63a29a6e8396416ec6e6e835826e7734diff --git a/solr/licenses/lucene-spatial-extras-9.12.1.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.12.1.jar.sha1new file mode 100644index 00000000000..3495009b5a5--- /dev/null+++ b/solr/licenses/lucene-spatial-extras-9.12.1.jar.sha1@@ -0,0 +1 @@+0a7379410eff21676472adc8ea76a57891ec83c2diff --git a/solr/licenses/lucene-spatial3d-9.11.1.jar.sha1 b/solr/licenses/lucene-spatial3d-9.11.1.jar.sha1deleted file mode 100644index f6dc1cf4979..00000000000--- a/solr/licenses/lucene-spatial3d-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-d9c48cf29e8736e6ce6cd81c614367b10210523cdiff --git a/solr/licenses/lucene-spatial3d-9.12.1.jar.sha1 b/solr/licenses/lucene-spatial3d-9.12.1.jar.sha1new file mode 100644index 00000000000..4dea89bd83e--- /dev/null+++ b/solr/licenses/lucene-spatial3d-9.12.1.jar.sha1@@ -0,0 +1 @@+d2fdea4edabb1f616f494999651c43abfd0aa124diff --git a/solr/licenses/lucene-suggest-9.11.1.jar.sha1 b/solr/licenses/lucene-suggest-9.11.1.jar.sha1deleted file mode 100644index 2d79215b57e..00000000000--- a/solr/licenses/lucene-suggest-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-9cceafd67d032d2a507e81f797e05eb284849987diff --git a/solr/licenses/lucene-suggest-9.12.1.jar.sha1 b/solr/licenses/lucene-suggest-9.12.1.jar.sha1new file mode 100644index 00000000000..7cceda02bf6--- /dev/null+++ b/solr/licenses/lucene-suggest-9.12.1.jar.sha1@@ -0,0 +1 @@+0660e0996ec7653fe0c13c608137e264645eecacdiff --git a/solr/licenses/lucene-test-framework-9.11.1.jar.sha1 b/solr/licenses/lucene-test-framework-9.11.1.jar.sha1deleted file mode 100644index bce92787396..00000000000--- a/solr/licenses/lucene-test-framework-9.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-9a3c349131233d2b5c258dff0cac77627525c14adiff --git a/solr/licenses/lucene-test-framework-9.12.1.jar.sha1 b/solr/licenses/lucene-test-framework-9.12.1.jar.sha1new file mode 100644index 00000000000..f7a37882d52--- /dev/null+++ b/solr/licenses/lucene-test-framework-9.12.1.jar.sha1@@ -0,0 +1 @@+d348aac4eff0371888f45b2aaa9034922b96b466diff --git a/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java b/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.javaindex 13f9f78bcd5..f2b8867b1b8 100644--- a/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java+++ b/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java@@ -344,8 +344,8 @@ public class GCSBackupRepository extends AbstractBackupRepository {final BlobInfo blobInfo = BlobInfo.newBuilder(bucketName, blobName).build();try (IndexInput input =shouldVerifyChecksum- ? sourceDir.openChecksumInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)- : sourceDir.openInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)) {+ ? sourceDir.openChecksumInput(sourceFileName, IOContext.READONCE)+ : sourceDir.openInput(sourceFileName, IOContext.READONCE)) {if (input.length() <= CodecUtil.footerLength()) {throw new CorruptIndexException("file is too small:" + input.length(), input);}diff --git a/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.java b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.javaindex 122dcc11918..29b6daffb55 100644--- a/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.java+++ b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.java@@ -38,7 +38,6 @@ import org.apache.lucene.store.IndexOutput;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.StrUtils;-import org.apache.solr.core.DirectoryFactory;import org.apache.solr.core.backup.repository.AbstractBackupRepository;import org.apache.solr.core.backup.repository.BackupRepository;import org.slf4j.Logger;@@ -280,8 +279,8 @@ public class S3BackupRepository extends AbstractBackupRepository {try (IndexInput indexInput =shouldVerifyChecksum- ? sourceDir.openChecksumInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)- : sourceDir.openInput(sourceFileName, DirectoryFactory.IOCONTEXT_NO_CACHE)) {+ ? sourceDir.openChecksumInput(sourceFileName, IOContext.READONCE)+ : sourceDir.openInput(sourceFileName, IOContext.READONCE)) {if (indexInput.length() <= CodecUtil.footerLength()) {throw new CorruptIndexException("file is too small:" + indexInput.length(), indexInput);}diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.javaindex 71617a1f028..498b0788ab0 100644--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java@@ -33,7 +33,6 @@ import org.apache.lucene.store.Directory;import org.apache.lucene.store.IOContext;import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.IndexOutput;-import org.apache.lucene.store.NIOFSDirectory;import org.apache.lucene.store.OutputStreamIndexOutput;import org.apache.solr.cloud.api.collections.AbstractBackupRepositoryTest;import org.apache.solr.common.util.NamedList;@@ -187,8 +186,9 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {CodecUtil.writeFooter(indexOutput);}- Directory sourceDir = new NIOFSDirectory(tmp.toPath());- repo.copyIndexFileFrom(sourceDir, "from-file", new URI("s3://to-folder"), "to-file");+ try (Directory sourceDir = newFSDirectory(tmp.toPath())) {+ repo.copyIndexFileFrom(sourceDir, "from-file", new URI("s3://to-folder"), "to-file");+ }// Sanity check: we do have different filesFile actualSource = new File(tmp, "from-file");@@ -208,12 +208,13 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {// Local folder for destinationFile tmp = temporaryFolder.newFolder();- Directory destDir = new NIOFSDirectory(tmp.toPath());// Directly create a file on S3pushObject("from-file", content);- repo.copyIndexFileTo(new URI("s3:///"), "from-file", destDir, "to-file");+ try (Directory destDir = newFSDirectory(tmp.toPath())) {+ repo.copyIndexFileTo(new URI("s3:///"), "from-file", destDir, "to-file");+ }// Sanity check: we do have different filesFile actualSource = pullObject("from-file");diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xmlindex 3cec6a4e578..4ca8a8db187 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.11</luceneMatchVersion>+ <luceneMatchVersion>9.12</luceneMatchVersion><!-- Data Directorydiff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xmlindex 0cf3a85a63c..194d7e5dfe5 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.11</luceneMatchVersion>+ <luceneMatchVersion>9.12</luceneMatchVersion><!-- Data Directorydiff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.javaindex 34b0d4a2b77..56db52cc9cb 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java@@ -40,7 +40,6 @@ import org.apache.lucene.store.FilterDirectory;import org.apache.lucene.store.IOContext;import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.IndexOutput;-import org.apache.lucene.store.NIOFSDirectory;import org.apache.lucene.store.OutputStreamIndexOutput;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.CoreAdminParams;@@ -337,7 +336,7 @@ public abstract class AbstractBackupRepositoryTest extends SolrTestCaseJ4 {SolrResourceLoader resourceLoader)throws IOException, URISyntaxException {try (BackupRepository repo = repoFactory.newInstance(resourceLoader, repoName);- Directory directory = new NIOFSDirectory(dir.toPath())) {+ Directory directory = newFSDirectory(dir.toPath())) {URI destinationDir = repo.resolve(getBaseUri(), "destination-folder");repo.copyIndexFileFrom(directory, fileName, destinationDir, fileName);}@@ -352,8 +351,8 @@ public abstract class AbstractBackupRepositoryTest extends SolrTestCaseJ4 {SolrResourceLoader resourceLoader)throws IOException {try (BackupRepository repo = repoFactory.newInstance(resourceLoader, repoName);- Directory sourceDirectory = new NIOFSDirectory(sourceDir.toPath());- Directory destinationDirectory = new NIOFSDirectory(destinationDir.toPath())) {+ Directory sourceDirectory = newFSDirectory(sourceDir.toPath());+ Directory destinationDirectory = newFSDirectory(destinationDir.toPath())) {repo.copyIndexFileFrom(sourceDirectory, fileName, destinationDirectory, fileName);}}diff --git a/versions.lock b/versions.lockindex b380f0a30ec..0bec5572d1d 100644--- a/versions.lock+++ b/versions.lock@@ -280,32 +280,33 @@"org.apache.logging.log4j:log4j-layout-template-json:2.21.0" : "e20caca6,refs=19","org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0" : "ad222d06,refs=81","org.apache.logging.log4j:log4j-web:2.21.0" : "e20caca6,refs=19",- "org.apache.lucene:lucene-analysis-common:9.11.1" : "e60c688a,refs=119",- "org.apache.lucene:lucene-analysis-icu:9.11.1" : "07070cdb,refs=8",- "org.apache.lucene:lucene-analysis-kuromoji:9.11.1" : "90067a87,refs=77",- "org.apache.lucene:lucene-analysis-morfologik:9.11.1" : "e3ddf06b,refs=6",- "org.apache.lucene:lucene-analysis-nori:9.11.1" : "90067a87,refs=77",- "org.apache.lucene:lucene-analysis-opennlp:9.11.1" : "07070cdb,refs=8",- "org.apache.lucene:lucene-analysis-phonetic:9.11.1" : "90067a87,refs=77",- "org.apache.lucene:lucene-analysis-smartcn:9.11.1" : "e3ddf06b,refs=6",- "org.apache.lucene:lucene-analysis-stempel:9.11.1" : "e3ddf06b,refs=6",- "org.apache.lucene:lucene-backward-codecs:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-classification:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-codecs:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-core:9.11.1" : "e60c688a,refs=119",- "org.apache.lucene:lucene-expressions:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-grouping:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-highlighter:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-join:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-memory:9.11.1" : "90067a87,refs=77",- "org.apache.lucene:lucene-misc:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-queries:9.11.1" : "e60c688a,refs=119",- "org.apache.lucene:lucene-queryparser:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-sandbox:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-spatial-extras:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-spatial3d:9.11.1" : "51c1a817,refs=79",- "org.apache.lucene:lucene-suggest:9.11.1" : "57e9f35b,refs=81",- "org.apache.lucene:lucene-test-framework:9.11.1" : "64a0cd23,refs=52",+ "org.apache.lucene:lucene-analysis-common:9.12.1" : "e60c688a,refs=119",+ "org.apache.lucene:lucene-analysis-icu:9.12.1" : "07070cdb,refs=8",+ "org.apache.lucene:lucene-analysis-kuromoji:9.12.1" : "90067a87,refs=77",+ "org.apache.lucene:lucene-analysis-morfologik:9.12.1" : "e3ddf06b,refs=6",+ "org.apache.lucene:lucene-analysis-nori:9.12.1" : "90067a87,refs=77",+ "org.apache.lucene:lucene-analysis-opennlp:9.12.1" : "07070cdb,refs=8",+ "org.apache.lucene:lucene-analysis-phonetic:9.12.1" : "90067a87,refs=77",+ "org.apache.lucene:lucene-analysis-smartcn:9.12.1" : "e3ddf06b,refs=6",+ "org.apache.lucene:lucene-analysis-stempel:9.12.1" : "e3ddf06b,refs=6",+ "org.apache.lucene:lucene-backward-codecs:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-classification:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-codecs:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-core:9.12.1" : "e60c688a,refs=119",+ "org.apache.lucene:lucene-expressions:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-facet:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-grouping:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-highlighter:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-join:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-memory:9.12.1" : "90067a87,refs=77",+ "org.apache.lucene:lucene-misc:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-queries:9.12.1" : "e60c688a,refs=119",+ "org.apache.lucene:lucene-queryparser:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-sandbox:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-spatial-extras:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-spatial3d:9.12.1" : "51c1a817,refs=79",+ "org.apache.lucene:lucene-suggest:9.12.1" : "57e9f35b,refs=81",+ "org.apache.lucene:lucene-test-framework:9.12.1" : "64a0cd23,refs=52","org.apache.opennlp:opennlp-tools:1.9.4" : "fbf7fa7b,refs=18","org.apache.pdfbox:fontbox:2.0.26" : "50a667d1,refs=5","org.apache.pdfbox:jbig2-imageio:3.0.4" : "50a667d1,refs=5",