Apache Solr open-source search software
SOLR-16204: Update lucene dependency version to 9.1.0 (#872)
Elia Porciani98aeb2754b25
diff --git a/gradle/testing/randomization.gradle b/gradle/testing/randomization.gradleindex 295b656403a..8d61a35e8e4 100644--- a/gradle/testing/randomization.gradle+++ b/gradle/testing/randomization.gradle@@ -191,7 +191,7 @@ allprojects {// to each project's build/ configuration but it seems compact enough to keep it here for now.if (Boolean.parseBoolean(testOptionsResolved["tests.useSecurityManager"])) {systemProperty 'common-solr.dir', commonSolrDir- systemProperty 'java.security.manager', "org.apache.lucene.util.TestSecurityManager"+ systemProperty 'java.security.manager', "org.apache.lucene.tests.util.TestSecurityManager"systemProperty 'java.security.policy', file("${resources}/policies/solr-tests.policy")def gradleUserHome = project.gradle.getGradleUserHomeDir()diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 50a3f29d049..a18302d15f0 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -105,6 +105,8 @@ Other ChangesBuild---------------------+* SOLR-16204: Change Lucene dependency to Lucene 9.1.0 (Elia Porciani via Alessandro Benedetti)+* SOLR-16053: Upgrade scriptDepVersions (Kevin Risden)* SOLR-16050: Upgrade to errorprone 2.11.0 (Kevin Risden)diff --git a/solr/core/build.gradle b/solr/core/build.gradleindex 6f7a93b154e..adea2e71297 100644--- a/solr/core/build.gradle+++ b/solr/core/build.gradle@@ -87,6 +87,7 @@ dependencies {runtimeOnly "org.apache.lucene:lucene-analysis-phonetic"runtimeOnly "org.apache.lucene:lucene-backward-codecs"implementation "org.apache.lucene:lucene-codecs"+ implementation "org.apache.lucene:lucene-backward-codecs"implementation "org.apache.lucene:lucene-classification"implementation "org.apache.lucene:lucene-expressions"implementation "org.apache.lucene:lucene-grouping"@@ -98,6 +99,7 @@ dependencies {implementation "org.apache.lucene:lucene-spatial-extras"implementation "org.apache.lucene:lucene-suggest"+// Collections & lang utilitiesimplementation 'com.google.guava:guava'implementation 'org.apache.commons:commons-lang3'diff --git a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.javaindex c67ef30968e..2e896693d93 100644--- a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java+++ b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java@@ -19,13 +19,14 @@ package org.apache.solr.core;import java.lang.invoke.MethodHandles;import java.util.Arrays;import java.util.Locale;+import org.apache.lucene.backward_codecs.lucene90.Lucene90HnswVectorsFormat;import org.apache.lucene.codecs.Codec;import org.apache.lucene.codecs.DocValuesFormat;import org.apache.lucene.codecs.KnnVectorsFormat;import org.apache.lucene.codecs.PostingsFormat;-import org.apache.lucene.codecs.lucene90.Lucene90Codec;-import org.apache.lucene.codecs.lucene90.Lucene90Codec.Mode;-import org.apache.lucene.codecs.lucene90.Lucene90HnswVectorsFormat;+import org.apache.lucene.codecs.lucene91.Lucene91Codec;+import org.apache.lucene.codecs.lucene91.Lucene91Codec.Mode;+import org.apache.lucene.codecs.lucene91.Lucene91HnswVectorsFormat;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;import org.apache.solr.common.util.NamedList;@@ -92,7 +93,7 @@ public class SchemaCodecFactory extends CodecFactory implements SolrCoreAware {log.debug("Using default compressionMode: {}", compressionMode);}codec =- new Lucene90Codec(compressionMode) {+ new Lucene91Codec(compressionMode) {@Overridepublic PostingsFormat getPostingsFormatForField(String field) {final SchemaField schemaField = core.getLatestSchema().getFieldOrNull(field);@@ -125,7 +126,12 @@ public class SchemaCodecFactory extends CodecFactory implements SolrCoreAware {DenseVectorField vectorType = (DenseVectorField) fieldType;String knnVectorFormatName = vectorType.getCodecFormat();if (knnVectorFormatName != null) {- if (knnVectorFormatName.equals(Lucene90HnswVectorsFormat.class.getSimpleName())) {+ if (knnVectorFormatName.equals(Lucene91HnswVectorsFormat.class.getSimpleName())) {+ int maxConn = vectorType.getHnswMaxConn();+ int beamWidth = vectorType.getHnswBeamWidth();+ return new Lucene91HnswVectorsFormat(maxConn, beamWidth);+ } else if (knnVectorFormatName.equals(+ Lucene90HnswVectorsFormat.class.getSimpleName())) {int maxConn = vectorType.getHnswMaxConn();int beamWidth = vectorType.getHnswBeamWidth();return new Lucene90HnswVectorsFormat(maxConn, beamWidth);diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.javaindex b81b4dc76ad..7e210c6e611 100644--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java@@ -500,7 +500,7 @@ public class QueryComponent extends SearchComponent {// :TODO: would be simpler to always serialize every position of SortField[]if (type == SortField.Type.SCORE || type == SortField.Type.DOC) continue;- FieldComparator<?> comparator = sortField.getComparator(1, 0);+ FieldComparator<?> comparator = sortField.getComparator(1, true);LeafFieldComparator leafComparator = null;Object[] vals = new Object[nDocs];diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.javaindex 3d552320d4c..6caf39f2bd8 100644--- a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java@@ -1244,7 +1244,7 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore@Overridepublic FieldComparator<Integer> newComparator(- String fieldName, final int numHits, int sortPos, boolean reversed) {+ String fieldName, final int numHits, boolean enableSkipping, boolean reversed) {return new SimpleFieldComparator<>() {final int[] values = new int[numHits];int bottomVal;diff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java b/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.javaindex 9c3ab085a23..5fec954620c 100644--- a/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java+++ b/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java@@ -155,7 +155,7 @@ public class ShardFieldSortedHitQueue extends PriorityQueue<ShardDoc> {Comparator<ShardDoc> comparatorFieldComparator(SortField sortField) {@SuppressWarnings({"rawtypes"})- final FieldComparator fieldComparator = sortField.getComparator(0, 0);+ final FieldComparator fieldComparator = sortField.getComparator(0, true);return new ShardComparator(sortField) {// Since the PriorityQueue keeps the biggest elements by default,// we need to reverse the field compare ordering so that thediff --git a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.javaindex c6cb1158c92..e19c6a7f0bb 100644--- a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java+++ b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java@@ -282,9 +282,9 @@ public final class SlowCompositeReaderWrapper extends LeafReader {}@Override- public TopDocs searchNearestVectors(String field, float[] target, int k, Bits acceptDocs)- throws IOException {- return null; // because not supported. Throw UOE?+ public TopDocs searchNearestVectors(+ String field, float[] target, int k, Bits acceptDocs, int visitedLimit) throws IOException {+ return null;}@Overridediff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyNumericRangeQuery.java b/solr/core/src/java/org/apache/solr/legacy/LegacyNumericRangeQuery.javaindex 3e63ac84fb2..130a6d4e1ee 100644--- a/solr/core/src/java/org/apache/solr/legacy/LegacyNumericRangeQuery.java+++ b/solr/core/src/java/org/apache/solr/legacy/LegacyNumericRangeQuery.java@@ -188,7 +188,7 @@ public final class LegacyNumericRangeQuery<T extends Number> extends MultiTermQuT max,final boolean minInclusive,final boolean maxInclusive) {- super(field);+ super(field, MultiTermQuery.CONSTANT_SCORE_REWRITE);if (precisionStep < 1) throw new IllegalArgumentException("precisionStep must be >=1");this.precisionStep = precisionStep;this.dataType = Objects.requireNonNull(dataType, "LegacyNumericType must not be null");diff --git a/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java b/solr/core/src/java/org/apache/solr/schema/DenseVectorField.javaindex c48ee140e97..59cf68713f0 100644--- a/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java+++ b/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java@@ -17,14 +17,15 @@package org.apache.solr.schema;import static java.util.Optional.ofNullable;-import static org.apache.lucene.codecs.lucene90.Lucene90HnswVectorsFormat.DEFAULT_BEAM_WIDTH;-import static org.apache.lucene.codecs.lucene90.Lucene90HnswVectorsFormat.DEFAULT_MAX_CONN;+import static org.apache.lucene.codecs.lucene91.Lucene91HnswVectorsFormat.DEFAULT_BEAM_WIDTH;+import static org.apache.lucene.codecs.lucene91.Lucene91HnswVectorsFormat.DEFAULT_MAX_CONN;import java.util.ArrayList;import java.util.List;import java.util.Locale;import java.util.Map;-import org.apache.lucene.codecs.lucene90.Lucene90HnswVectorsFormat;+import org.apache.lucene.backward_codecs.lucene90.Lucene90HnswVectorsFormat;+import org.apache.lucene.codecs.lucene91.Lucene91HnswVectorsFormat;import org.apache.lucene.document.KnnVectorField;import org.apache.lucene.index.IndexableField;import org.apache.lucene.index.VectorSimilarityFunction;@@ -42,8 +43,9 @@ import org.apache.solr.uninverting.UninvertingReader;* {@link org.apache.lucene.search.KnnVectorQuery} for more details. It supports a fixed cardinality* dimension for the vector and a fixed similarity function. The default similarity is* EUCLIDEAN_HNSW (L2). The default index codec format is specified in the Lucene Codec constructor.- * For Lucene 9.0 e.g. See {@link org.apache.lucene.codecs.lucene90.Lucene90Codec} Currently only- * {@link org.apache.lucene.codecs.lucene90.Lucene90HnswVectorsFormat} is supported for advanced+ * For Lucene 9.1 e.g. See {@link org.apache.lucene.codecs.lucene91.Lucene91Codec} Currently {@link+ * org.apache.lucene.backward_codecs.lucene90.Lucene90HnswVectorsFormat} and {@link+ * org.apache.lucene.codecs.lucene91.Lucene91HnswVectorsFormat} are supported for advanced* hyper-parameter customisation. See {@link org.apache.lucene.util.hnsw.HnswGraph} for more details* about the implementation. <br>* Only {@code Indexed} and {@code Stored} attributes are supported.@@ -63,16 +65,17 @@ public class DenseVectorField extends FloatPointField {private String codecFormat;/**- * This parameter is coupled with the {@link Lucene90HnswVectorsFormat} format implementation.- * Controls how many of the nearest neighbor candidates are connected to the new node. Defaults to- * {@link Lucene90HnswVectorsFormat#DEFAULT_MAX_CONN}. See {@link HnswGraph} for more details.+ * This parameter is coupled with the {@link Lucene90HnswVectorsFormat} and {@link+ * Lucene91HnswVectorsFormat} format implementations. Controls how many of the nearest neighbor+ * candidates are connected to the new node. Defaults to {@link+ * Lucene91HnswVectorsFormat#DEFAULT_MAX_CONN}. See {@link HnswGraph} for more details.*/private int hnswMaxConn;/**- * This parameter is coupled with the {@link Lucene90HnswVectorsFormat} format implementation. The- * number of candidate neighbors to track while searching the graph for each newly inserted node.- * Defaults to to {@link Lucene90HnswVectorsFormat#DEFAULT_BEAM_WIDTH}. See {@link HnswGraph} for- * details.+ * This parameter is coupled with the {@link Lucene90HnswVectorsFormat} and {@link+ * Lucene91HnswVectorsFormat} format implementations. The number of candidate neighbors to track+ * while searching the graph for each newly inserted node. Defaults to to {@link+ * Lucene91HnswVectorsFormat#DEFAULT_BEAM_WIDTH}. See {@link HnswGraph} for details.*/private int hnswBeamWidth;diff --git a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.javaindex a6baf36c0f8..f5bba30093b 100644--- a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java+++ b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java@@ -270,7 +270,7 @@ public class LatLonPointSpatialField@SuppressWarnings("unchecked")final FieldComparator<Double> comparator =- (FieldComparator<Double>) getSortField(false).getComparator(1, 1);+ (FieldComparator<Double>) getSortField(false).getComparator(1, false);final LeafFieldComparator leafComparator = comparator.getLeafComparator(ctx);final double mult = multiplier; // so it's a local fielddiff --git a/solr/core/src/java/org/apache/solr/schema/RandomSortField.java b/solr/core/src/java/org/apache/solr/schema/RandomSortField.javaindex 3c1503f3905..c50efdb7125 100644--- a/solr/core/src/java/org/apache/solr/schema/RandomSortField.java+++ b/solr/core/src/java/org/apache/solr/schema/RandomSortField.java@@ -109,8 +109,8 @@ public class RandomSortField extends FieldType {new FieldComparatorSource() {@Overridepublic FieldComparator<Integer> newComparator(- final String fieldname, final int numHits, int sortPos, boolean reversed) {- return new SimpleFieldComparator<Integer>() {+ final String fieldname, final int numHits, boolean enableSkipping, boolean reversed) {+ return new SimpleFieldComparator<>() {int seed;private final int[] values = new int[numHits];int bottomVal;@@ -197,6 +197,5 @@ public class RandomSortField extends FieldType {public int hashCode() {return field.hashCode();}- ;}}diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.javaindex beeadac2180..1736e193088 100644--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java@@ -3533,7 +3533,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {for (int clause = 0; clause < numClauses; clause++) {SortField sf = sorts[clause];// we only need one slot for every comparator- fieldComparators[clause] = sf.getComparator(1, clause);+ fieldComparators[clause] = sf.getComparator(1, clause == 0);reverseMul[clause] = sf.getReverse() ? -1 : 1;}groupHeadValues = new Object[initNumGroups][];diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.javaindex 10e1b65bcba..8b11ff396d4 100644--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java@@ -395,10 +395,6 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIreturn docFetcher;}- List<LeafReaderContext> getLeafContexts() {- return super.leafContexts;- }-public StatsCache getStatsCache() {return statsCache;}diff --git a/solr/core/src/java/org/apache/solr/search/join/ChildFieldValueSourceParser.java b/solr/core/src/java/org/apache/solr/search/join/ChildFieldValueSourceParser.javaindex f3ec441cfaa..60e504cb1fa 100644--- a/solr/core/src/java/org/apache/solr/search/join/ChildFieldValueSourceParser.java+++ b/solr/core/src/java/org/apache/solr/search/join/ChildFieldValueSourceParser.java@@ -131,8 +131,8 @@ public class ChildFieldValueSourceParser extends ValueSourceParser {childField.getName(), type, reverse, parentFilter, childFilter) {@SuppressWarnings("unchecked")@Override- public FieldComparator<?> getComparator(int numHits, int sortPos) {- final FieldComparator<?> comparator = super.getComparator(numHits, sortPos);+ public FieldComparator<?> getComparator(int numHits, boolean enableSkipping) {+ final FieldComparator<?> comparator = super.getComparator(numHits, enableSkipping);return type == Type.STRING? new BytesToStringComparator((FieldComparator<BytesRef>) comparator): comparator;diff --git a/solr/core/src/java/org/apache/solr/util/TestInjection.java b/solr/core/src/java/org/apache/solr/util/TestInjection.javaindex ea7d6418fb9..c4f0b99cb0b 100644--- a/solr/core/src/java/org/apache/solr/util/TestInjection.java+++ b/solr/core/src/java/org/apache/solr/util/TestInjection.java@@ -65,7 +65,7 @@ public class TestInjection {private static final Pattern ENABLED_PERCENT =Pattern.compile("(true|false)(?:\\:(\\d+))?$", Pattern.CASE_INSENSITIVE);- private static final String LUCENE_TEST_CASE_FQN = "org.apache.lucene.util.LuceneTestCase";+ private static final String LUCENE_TEST_CASE_FQN = "org.apache.lucene.tests.util.LuceneTestCase";/*** If null, then we are not being run as part of a test, and all TestInjection events should bediff --git a/solr/core/src/test-files/solr/collection1/conf/schema-densevector-codec-hyperparamer.xml b/solr/core/src/test-files/solr/collection1/conf/schema-densevector-codec-hyperparamer.xmlindex bbd78e480fa..132abefed32 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-densevector-codec-hyperparamer.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-densevector-codec-hyperparamer.xml@@ -21,13 +21,16 @@<schema name="schema-densevector-codec-hyperparamer" version="1.0"><fieldType name="string" class="solr.StrField" multiValued="true"/><fieldType name="knn_vector_default" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine"/>- <fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine" codecFormat="Lucene90HnswVectorsFormat" hnswMaxConnections="10" hnswBeamWidth="40"/>- <fieldType name="knn_vector2" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine" codecFormat="Lucene90HnswVectorsFormat" hnswMaxConnections="6" hnswBeamWidth="60"/>+ <fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine" codecFormat="Lucene91HnswVectorsFormat" hnswMaxConnections="10" hnswBeamWidth="40"/>+ <fieldType name="knn_vector2" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine" codecFormat="Lucene91HnswVectorsFormat" hnswMaxConnections="6" hnswBeamWidth="60"/>+ <fieldType name="knn_vector3" class="solr.DenseVectorField" vectorDimension="5" similarityFunction="cosine" codecFormat="Lucene90HnswVectorsFormat" hnswMaxConnections="8" hnswBeamWidth="46"/>+<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/><field name="vector_default" type="knn_vector_default" indexed="true" stored="true" /><field name="vector" type="knn_vector" indexed="true" stored="true" /><field name="vector2" type="knn_vector2" indexed="true" stored="true" />+ <field name="vector3" type="knn_vector3" indexed="true" stored="true" /><uniqueKey>id</uniqueKey>diff --git a/solr/core/src/test/org/apache/solr/CursorPagingTest.java b/solr/core/src/test/org/apache/solr/CursorPagingTest.javaindex 0fba2d9971a..cbd55567570 100644--- a/solr/core/src/test/org/apache/solr/CursorPagingTest.java+++ b/solr/core/src/test/org/apache/solr/CursorPagingTest.java@@ -36,8 +36,8 @@ import java.util.function.Consumer;import java.util.stream.Collectors;import java.util.stream.IntStream;import org.apache.commons.lang3.StringUtils;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.SentinelIntSet;-import org.apache.lucene.util.TestUtil;import org.apache.lucene.util.mutable.MutableValueInt;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;diff --git a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.javaindex ff52ff05368..fd2e1297599 100644--- a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java+++ b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java@@ -18,7 +18,7 @@ package org.apache.solr;import java.util.Arrays;import java.util.List;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.response.IntervalFacet.Count;diff --git a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.javaindex a76dfaee738..8b9fc1c48fe 100644--- a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java+++ b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java@@ -22,7 +22,7 @@ import java.net.URL;import java.util.ArrayList;import java.util.Enumeration;import java.util.List;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.core.SolrInfoBean;import org.apache.solr.handler.admin.LukeRequestHandler;import org.apache.solr.handler.component.SearchComponent;diff --git a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.javaindex 7b726466e1d..e91c01124dc 100644--- a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java+++ b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java@@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.containsString;import java.io.IOException;import java.util.List;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressPointFields;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java b/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.javaindex 1b14bf89a2f..6165c4737e8 100644--- a/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java+++ b/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java@@ -16,7 +16,7 @@*/package org.apache.solr;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.response.QueryResponse;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.javaindex ae29ddc315a..3a33687c668 100644--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java@@ -32,7 +32,7 @@ import java.util.concurrent.Callable;import java.util.concurrent.ExecutorCompletionService;import java.util.concurrent.Future;import org.apache.commons.lang3.StringUtils;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;diff --git a/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java b/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.javaindex 4dc4f2e0f18..4c60ddf1d6e 100644--- a/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java+++ b/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java@@ -18,7 +18,7 @@ package org.apache.solr;import java.io.IOException;import org.apache.lucene.search.TimeLimitingCollector;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.javaindex e52b1e43de0..c95db2c5f2e 100644--- a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java+++ b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java@@ -22,8 +22,8 @@ import java.util.Arrays;import java.util.List;import java.util.Map;import java.util.Random;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.schema.IntPointField;diff --git a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomFaceting.javaindex afd621af84b..7cf341ea2e8 100644--- a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java+++ b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java@@ -30,8 +30,8 @@ import java.util.Random;import java.util.Set;import java.util.function.Consumer;import java.util.regex.Pattern;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.common.SolrException.ErrorCode;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.Utils;diff --git a/solr/core/src/test/org/apache/solr/analysis/ProtectedTermFilterFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/ProtectedTermFilterFactoryTest.javaindex 5b70f6013af..d5e2ddc08b3 100644--- a/solr/core/src/test/org/apache/solr/analysis/ProtectedTermFilterFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/analysis/ProtectedTermFilterFactoryTest.java@@ -19,9 +19,9 @@ package org.apache.solr.analysis;import java.util.HashMap;import java.util.Map;-import org.apache.lucene.analysis.BaseTokenStreamTestCase;import org.apache.lucene.analysis.TokenStream;import org.apache.lucene.analysis.miscellaneous.ProtectedTermFilterFactory;+import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;import org.apache.lucene.util.ResourceLoader;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.core.SolrResourceLoader;diff --git a/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.javaindex 935d0ce6b9a..8746113ec8d 100644--- a/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java+++ b/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java@@ -16,7 +16,7 @@*/package org.apache.solr.analysis;-import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;+import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;import static org.mockito.Mockito.spy;import static org.mockito.Mockito.times;import static org.mockito.Mockito.verify;diff --git a/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.javaindex 0630bbe54bf..62c5f65a1a3 100644--- a/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java+++ b/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java@@ -18,9 +18,9 @@ package org.apache.solr.analysis;import java.util.HashMap;import java.util.Map;-import org.apache.lucene.analysis.BaseTokenStreamTestCase;import org.apache.lucene.analysis.TokenStream;import org.apache.lucene.analysis.miscellaneous.WordDelimiterFilterFactory;+import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;import org.apache.lucene.util.ResourceLoader;import org.apache.lucene.util.Version;import org.apache.solr.SolrTestCaseJ4;diff --git a/solr/core/src/test/org/apache/solr/backcompat/TestLuceneIndexBackCompat.java.ignored b/solr/core/src/test/org/apache/solr/backcompat/TestLuceneIndexBackCompat.java.ignoredindex 9ef5113896f..c9a11d44fb2 100644--- a/solr/core/src/test/org/apache/solr/backcompat/TestLuceneIndexBackCompat.java.ignored+++ b/solr/core/src/test/org/apache/solr/backcompat/TestLuceneIndexBackCompat.java.ignored@@ -27,8 +27,8 @@ import java.util.Properties;import org.apache.commons.io.FileUtils;import org.apache.lucene.backward_index.TestBackwardsCompatibility;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.CommonParams;import org.apache.solr.util.TestHarness;diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.javaindex 81ea1912edd..aaca894c3cf 100644--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.cloud;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.javaindex ad93969a28a..537a717c249 100644--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.cloud;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;/*diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.javaindex ce71002953d..36417ae137b 100644--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java@@ -23,7 +23,7 @@ import java.util.HashSet;import java.util.List;import java.util.Set;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.javaindex 754324b1698..3d1ff3e0eee 100644--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.cloud;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;/** Implementation moved to AbstractChaosMonkeySafeLeaderTestBase as is used by HDFS contrib module testdiff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.javaindex cac8ae92d98..0a124932373 100644--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java@@ -21,7 +21,7 @@ import java.util.ArrayList;import java.util.EnumSet;import java.util.List;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.javaindex 8c38e40a312..ed3156d8750 100644--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java@@ -24,7 +24,7 @@ import java.util.Set;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.cloud.api.collections.ShardSplitTest;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java b/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.javaindex 6a6bb670652..6ff081ae7ab 100644--- a/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java@@ -22,7 +22,7 @@ import java.util.Date;import java.util.Locale;import java.util.concurrent.TimeUnit;import org.apache.commons.io.FileUtils;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.javaindex c08b4550716..86d1aab1ff7 100644--- a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java@@ -29,7 +29,7 @@ import java.lang.invoke.MethodHandles;import java.util.LinkedHashMap;import java.util.Map;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java b/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.javaindex abc0e4f2343..3c484011dfa 100644--- a/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java@@ -20,7 +20,7 @@ import java.io.IOException;import java.lang.invoke.MethodHandles;import java.util.Map;import java.util.Set;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.ClusterState;diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.javaindex 87db1a0df67..01c7355f156 100644--- a/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java@@ -28,7 +28,7 @@ import java.util.concurrent.Semaphore;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicReference;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.javaindex cafba446fff..95aad74ba04 100644--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java@@ -37,8 +37,8 @@ import java.util.Objects;import java.util.Optional;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicReference;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java b/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.javaindex f573dfa851f..39202ac18d5 100644--- a/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java@@ -19,7 +19,7 @@ package org.apache.solr.cloud;import java.io.IOException;import java.lang.invoke.MethodHandles;import java.util.concurrent.atomic.AtomicReference;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java b/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.javaindex 83fce07ab05..5125c88d4bd 100644--- a/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java@@ -21,7 +21,7 @@ import java.nio.file.Path;import java.util.concurrent.Executors;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.TimeoutException;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.cloud.ConnectionManager;import org.apache.solr.common.cloud.SolrZkClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.javaindex b26644009f6..795dff05d1e 100644--- a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java@@ -30,9 +30,9 @@ import java.util.Map;import java.util.function.Consumer;import java.util.stream.IntStream;import org.apache.commons.lang3.StringUtils;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.SentinelIntSet;-import org.apache.lucene.util.TestUtil;import org.apache.solr.CursorPagingTest;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.javaindex 64378b9eded..182c668f11b 100644--- a/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java@@ -27,7 +27,7 @@ import java.util.Map;import java.util.Objects;import java.util.Set;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpSolrClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.javaindex f4a84473735..701b516d212 100644--- a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java@@ -30,7 +30,7 @@ import java.util.Set;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.JSONTestUtil;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.javaindex 1a0d68745a2..6e6b204233e 100644--- a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java@@ -17,7 +17,7 @@package org.apache.solr.cloud;-import static org.apache.lucene.util.LuceneTestCase.random;+import static org.apache.lucene.tests.util.LuceneTestCase.random;import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;import java.io.IOException;diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.javaindex 54b0d5890c9..72dd88c3fc8 100644--- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java@@ -27,8 +27,8 @@ import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.cloud.SocketProxy;diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.javaindex e2f8595994e..50b5cfc1701 100644--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java@@ -32,7 +32,7 @@ import java.util.Map;import java.util.Optional;import java.util.Set;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.JSONTestUtil;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionWithTlogReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionWithTlogReplicasTest.javaindex 7df2c0fefb8..b5100e895e6 100644--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionWithTlogReplicasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionWithTlogReplicasTest.java@@ -18,7 +18,7 @@package org.apache.solr.cloud;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;@LuceneTestCase.Slowdiff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.javaindex 0c901b06782..326aecd15e1 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java@@ -20,7 +20,7 @@ import java.io.IOException;import java.util.ArrayList;import java.util.List;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.javaindex 8eeaeeacdf9..8c3ab1475de 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java@@ -29,7 +29,7 @@ import java.util.Map;import java.util.concurrent.Executors;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.cloud.OnReconnect;import org.apache.solr.common.cloud.SolrZkClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.javaindex 5f4b4b10919..f8864efaa79 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java@@ -22,7 +22,7 @@ import java.util.HashSet;import java.util.List;import java.util.Set;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderFailureAfterFreshStartTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderFailureAfterFreshStartTest.javaindex da91ad20219..479e40a0102 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderFailureAfterFreshStartTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderFailureAfterFreshStartTest.java@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;import org.apache.commons.codec.digest.DigestUtils;import org.apache.commons.lang3.RandomStringUtils;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.cloud.ZkTestServer.LimitViolationAction;diff --git a/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java b/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.javaindex fad66498845..db41e736f9e 100644--- a/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java@@ -20,7 +20,7 @@ import java.io.IOException;import java.lang.invoke.MethodHandles;import java.util.Map;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java b/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.javaindex fd1de1b0f0c..8fade264add 100644--- a/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java@@ -22,7 +22,7 @@ import java.nio.file.Files;import java.nio.file.StandardOpenOption;import java.util.ArrayList;import java.util.List;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.javaindex 8e8a9e77ef4..645abaef67b 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java@@ -48,7 +48,7 @@ import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;import javax.xml.parsers.ParserConfigurationException;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.cloud.DistributedQueue;diff --git a/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.java b/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.javaindex f84baff62de..09a32368a9d 100644--- a/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.java@@ -25,7 +25,7 @@ import java.util.Map;import java.util.concurrent.CountDownLatch;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.ZkStateReader;diff --git a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.javaindex 7d13cc98715..5ba8c729108 100644--- a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java@@ -36,7 +36,7 @@ import java.util.Set;import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;import org.apache.commons.lang3.RandomStringUtils;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.javaindex 92305724305..acf2a3b7f44 100644--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.cloud;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.junit.Test;/*diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.javaindex 65e278716b4..a68e58cfa4c 100644--- a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java@@ -27,7 +27,7 @@ import java.util.Set;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import org.apache.commons.lang3.StringUtils;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/cloud/RestartWhileUpdatingTest.java b/solr/core/src/test/org/apache/solr/cloud/RestartWhileUpdatingTest.javaindex aceb8a2f678..41ba9e00d1d 100644--- a/solr/core/src/test/org/apache/solr/cloud/RestartWhileUpdatingTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/RestartWhileUpdatingTest.java@@ -16,8 +16,8 @@*/package org.apache.solr.cloud;-import org.apache.lucene.util.LuceneTestCase.Nightly;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Nightly;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.junit.Test;@Slowdiff --git a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.javaindex 496ca4eed9d..7f72b4074fe 100644--- a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java@@ -23,8 +23,8 @@ import java.util.Locale;import java.util.Map;import java.util.Properties;import org.apache.commons.lang3.StringUtils;-import org.apache.lucene.util.LuceneTestCase.AwaitsFix;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettyConfig;diff --git a/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java b/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.javaindex cf217eb6b6e..cda512936f5 100644--- a/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.cloud;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.junit.Test;/**diff --git a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.javaindex 2ee24eba86f..6c78f20f176 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java@@ -22,7 +22,7 @@ import javax.servlet.FilterChain;import javax.servlet.http.HttpServletRequest;import javax.servlet.http.HttpServletResponse;import org.apache.http.HttpRequestInterceptor;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.javaindex e0413e80a2c..6af06e6ae77 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java@@ -24,8 +24,8 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.Random;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.javaindex 2437f11ed9c..43757f7be51 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java@@ -36,7 +36,7 @@ import java.util.List;import java.util.Map;import java.util.Set;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.response.FieldStatsInfo;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.javaindex 7bbb1a7cdd4..8771606049e 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java@@ -25,7 +25,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;import java.util.Random;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java b/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.javaindex 85f93daf527..890faddbbd2 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java@@ -22,7 +22,7 @@ import java.util.HashMap;import java.util.HashSet;import java.util.List;import java.util.Map;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.cloud.CompositeIdRouter;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.javaindex 9e4eb98cf16..f7019344d63 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java@@ -21,7 +21,7 @@ import java.lang.invoke.MethodHandles;import java.nio.file.Path;import java.util.Collections;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase.BadApple;+import org.apache.lucene.tests.util.LuceneTestCase.BadApple;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.cloud.SolrZkClient;import org.apache.solr.core.CloudConfig;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.javaindex 1604c9b0860..eedcdea87c7 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java@@ -31,8 +31,8 @@ import org.apache.http.conn.ssl.SSLConnectionSocketFactory;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.http.impl.client.HttpClientBuilder;import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;+import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;import org.apache.lucene.util.Constants;-import org.apache.lucene.util.TestRuleRestoreSystemProperties;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettyConfig;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.javaindex 8ff46075e1f..e3758110887 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java@@ -33,7 +33,7 @@ import org.apache.http.client.HttpClient;import org.apache.http.client.methods.HttpGet;import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.StringEntity;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.javaindex d44b13e8ca1..cea8d56b7c4 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java@@ -28,7 +28,7 @@ import java.io.IOException;import java.util.EnumSet;import java.util.List;import java.util.Map;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.javaindex 3efd579057b..0e334404092 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java@@ -35,7 +35,7 @@ import javax.xml.stream.XMLStreamConstants;import javax.xml.stream.XMLStreamException;import javax.xml.stream.XMLStreamReader;import org.apache.commons.io.FilenameUtils;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.javaindex 9eb53fa6905..b69fa28a31d 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java@@ -26,7 +26,7 @@ import java.util.List;import java.util.Map;import java.util.Set;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrQuery;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.javaindex 2f7bc18198f..c8bcfe99876 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java@@ -29,7 +29,7 @@ import java.util.TreeMap;import java.util.TreeSet;import java.util.concurrent.ExecutorService;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java b/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.javaindex 9316101b5ba..fb4a7a68473 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java@@ -20,7 +20,7 @@ import java.lang.invoke.MethodHandles;import java.nio.file.Paths;import java.util.HashMap;import java.util.Map;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.schema.SchemaRequest.Field;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.javaindex 306c5369c31..eb3bc09fc26 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java@@ -30,8 +30,8 @@ import java.util.concurrent.ExecutionException;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;import java.util.concurrent.atomic.AtomicLong;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.javaindex 1052241cf92..b1e2f5b52de 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicLong;import org.apache.commons.math3.primes.Primes;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java b/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.javaindex 00d57f33c1a..9a0ee3caafa 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java@@ -24,8 +24,8 @@ import java.util.List;import java.util.concurrent.Callable;import java.util.concurrent.ExecutorService;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.common.cloud.SolrZkClient;import org.apache.solr.common.cloud.ZkStateReader;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.javaindex 29df9d30817..6ce8ec5edf1 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java@@ -26,7 +26,7 @@ import java.util.List;import java.util.Map;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;-import org.apache.lucene.util.LuceneTestCase.AwaitsFix;+import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;import org.apache.solr.JSONTestUtil;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.javaindex d751ccddced..1625745214e 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java@@ -38,7 +38,7 @@ import org.apache.http.client.methods.HttpGet;import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.StringEntity;import org.apache.lucene.index.IndexWriter;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.javaindex 0a365d25b10..740b3f565cc 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java@@ -35,7 +35,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;import java.util.Random;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java b/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.javaindex 4ff1e64e1bd..ec1bad7ce52 100644--- a/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java@@ -16,8 +16,8 @@*/package org.apache.solr.cloud;-import org.apache.lucene.util.LuceneTestCase.Nightly;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Nightly;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java b/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.javaindex e2c35b58b6c..915018a4e9d 100644--- a/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java@@ -22,7 +22,7 @@ import java.util.HashMap;import java.util.HashSet;import java.util.Map;import java.util.Set;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.java b/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.javaindex 78e7bf07a0f..615f67aea31 100644--- a/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.java+++ b/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.java@@ -32,7 +32,7 @@ import org.apache.lucene.index.ExitableDirectoryReader;import org.apache.lucene.index.IndexWriter;import org.apache.lucene.index.QueryTimeout;import org.apache.lucene.store.Directory;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.core.SolrCore;import org.apache.solr.core.StandardIndexReaderFactory;diff --git a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.javaindex 745deb740f7..9c42c25b246 100644--- a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.cloud;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.javaindex 4da6d64a2b7..cdfb9c4a153 100644--- a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java@@ -29,7 +29,7 @@ import java.util.List;import java.util.Properties;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicReference;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.cloud.ClusterProperties;import org.apache.solr.common.cloud.SolrZkClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionTooManyReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionTooManyReplicasTest.javaindex 134834d8e76..126b167f1c0 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionTooManyReplicasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionTooManyReplicasTest.java@@ -19,7 +19,7 @@ package org.apache.solr.cloud.api.collections;import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.javaindex 4707f2a73ea..7ababd32309 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java@@ -24,8 +24,8 @@ import java.util.concurrent.CountDownLatch;import java.util.concurrent.ExecutorService;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.javaindex dbd150d1f6b..01c0e9f1325 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.cloud.api.collections;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;/** Tests the Cloud Collections API. */@Slowdiff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.javaindex fd20606e34c..51678f06d5f 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java@@ -20,7 +20,7 @@ import java.io.IOException;import java.lang.invoke.MethodHandles;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicReference;-import org.apache.lucene.util.LuceneTestCase.Nightly;+import org.apache.lucene.tests.util.LuceneTestCase.Nightly;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.javaindex f7222773644..35dc1247f48 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.java@@ -21,7 +21,7 @@ import static org.apache.solr.common.cloud.ZkStateReader.REPLICATION_FACTOR;import static org.apache.solr.common.params.ShardParams._ROUTE_;import java.util.Map;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.javaindex a8a2a990cc9..1c1f3536b76 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java@@ -17,7 +17,7 @@package org.apache.solr.cloud.api.collections;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.junit.BeforeClass;// Backups do checksum validation against a footer value not present in 'SimpleText'diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.javaindex acd66c6254d..96e8dc1d6fa 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java@@ -34,7 +34,7 @@ import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicReference;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.javaindex 69ae6a08a99..cf11cdd84e1 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.java@@ -26,7 +26,7 @@ import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.Set;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestLocalFSCloudBackupRestore.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestLocalFSCloudBackupRestore.javaindex 66d2c5c0d2e..70aa80cbe64 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestLocalFSCloudBackupRestore.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestLocalFSCloudBackupRestore.java@@ -22,7 +22,7 @@ import java.net.URI;import org.apache.lucene.store.Directory;import org.apache.lucene.store.IOContext;import org.apache.lucene.store.IndexInput;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.javaindex 71aa66447ef..48e4a9c2966 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.java@@ -20,7 +20,7 @@ import java.io.IOException;import java.util.ArrayList;import java.util.List;import java.util.Map;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkCollectionPropsCachingTest.java b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkCollectionPropsCachingTest.javaindex 2e69f58bee9..7d11657b3db 100644--- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkCollectionPropsCachingTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkCollectionPropsCachingTest.java@@ -19,7 +19,7 @@ package org.apache.solr.cloud.overseer;import java.io.IOException;import java.lang.invoke.MethodHandles;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;diff --git a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.javaindex e2a7eb46480..c395e0b3682 100755--- a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java@@ -21,7 +21,7 @@ import java.io.InputStream;import java.nio.file.Path;import java.nio.file.Paths;import java.util.Properties;-import org.apache.lucene.mockfile.FilterPath;+import org.apache.lucene.tests.mockfile.FilterPath;import org.apache.solr.SolrTestCase;import org.apache.solr.common.util.NamedList;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.javaindex 9db7ee9d5be..a194af74166 100644--- a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java+++ b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java@@ -26,7 +26,7 @@ import org.apache.lucene.search.Query;import org.apache.lucene.search.Sort;import org.apache.lucene.search.SortField;import org.apache.lucene.search.TermQuery;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.search.QueryResultKey;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.javaindex 2d05f11e00f..c309eddc709 100644--- a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java+++ b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java@@ -19,13 +19,13 @@ package org.apache.solr.core;import java.io.IOException;import java.util.Map;import org.apache.lucene.codecs.Codec;-import org.apache.lucene.codecs.lucene90.Lucene90Codec.Mode;import org.apache.lucene.codecs.lucene90.Lucene90StoredFieldsFormat;+import org.apache.lucene.codecs.lucene91.Lucene91Codec.Mode;import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;import org.apache.lucene.index.SegmentInfo;import org.apache.lucene.index.SegmentInfos;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.NamedList;diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java b/solr/core/src/test/org/apache/solr/core/TestSolrXml.javaindex 17803fbbb4c..0eda0db0567 100644--- a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java+++ b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java@@ -28,7 +28,7 @@ import java.util.Properties;import java.util.Set;import java.util.stream.Collectors;import org.apache.commons.exec.OS;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;import org.apache.solr.update.UpdateShardHandlerConfig;diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.javaindex 81a16fbabe2..9e19036acc1 100644--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java@@ -24,9 +24,9 @@ import java.util.Map;import java.util.Optional;import java.util.function.Function;import java.util.stream.Collectors;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.javaindex 81684695c88..8ec6bd90ee0 100644--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java@@ -30,9 +30,9 @@ import org.apache.lucene.index.IndexCommit;import org.apache.lucene.index.IndexNotFoundException;import org.apache.lucene.store.Directory;import org.apache.lucene.store.NIOFSDirectory;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;diff --git a/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.javaindex 012daa047ca..645d838935c 100644--- a/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java@@ -23,7 +23,7 @@ import java.io.Reader;import java.nio.charset.StandardCharsets;import java.util.Collections;import java.util.List;-import org.apache.lucene.analysis.MockTokenizer;+import org.apache.lucene.tests.analysis.MockTokenizer;import org.apache.solr.client.solrj.request.DocumentAnalysisRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.SolrInputField;diff --git a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.javaindex 5543e9e2bbf..acabc717381 100644--- a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java@@ -21,7 +21,6 @@ import java.util.ArrayList;import java.util.Collections;import java.util.List;import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.analysis.MockTokenizer;import org.apache.lucene.analysis.TokenFilter;import org.apache.lucene.analysis.TokenFilterFactory;import org.apache.lucene.analysis.TokenStream;@@ -33,6 +32,7 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer;import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;import org.apache.lucene.analysis.tokenattributes.FlagsAttribute;import org.apache.lucene.analysis.tokenattributes.FlagsAttributeImpl;+import org.apache.lucene.tests.analysis.MockTokenizer;import org.apache.lucene.util.AttributeFactory;import org.apache.solr.analysis.TokenizerChain;import org.apache.solr.client.solrj.request.FieldAnalysisRequest;diff --git a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.javaindex 6ac93f84833..94e1544c3c9 100644--- a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java+++ b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java@@ -25,7 +25,7 @@ import java.net.URL;import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Properties;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java b/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.javaindex 13b6e219dd3..40077d2b3e2 100644--- a/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java+++ b/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java@@ -19,7 +19,7 @@ package org.apache.solr.handler;import static org.apache.solr.handler.ReplicationTestHelper.*;import java.io.IOException;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/handler/TestIncrementalCoreBackup.java b/solr/core/src/test/org/apache/solr/handler/TestIncrementalCoreBackup.javaindex d1b2ab95a67..12c0c9977aa 100644--- a/solr/core/src/test/org/apache/solr/handler/TestIncrementalCoreBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestIncrementalCoreBackup.java@@ -22,7 +22,7 @@ import java.nio.file.Path;import java.nio.file.Paths;import java.util.Arrays;import org.apache.lucene.index.IndexCommit;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.core.CoreContainer;diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.javaindex f228183317f..362202b50c7 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java@@ -33,9 +33,9 @@ import org.apache.lucene.index.IndexReader;import org.apache.lucene.store.Directory;import org.apache.lucene.store.FSDirectory;import org.apache.lucene.store.NIOFSDirectory;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.Constants;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.javaindex 5099adbb37c..e42982272a5 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java@@ -37,8 +37,8 @@ import org.apache.lucene.search.MatchAllDocsQuery;import org.apache.lucene.search.TopDocs;import org.apache.lucene.store.Directory;import org.apache.lucene.store.NIOFSDirectory;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.javaindex 82a562a9f87..2095fa45736 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicReference;import java.util.function.BooleanSupplier;import java.util.function.Function;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;diff --git a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.javaindex 60290504aad..983aad7058a 100644--- a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java+++ b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java@@ -25,8 +25,8 @@ import java.nio.file.Path;import java.nio.file.Paths;import java.util.Properties;import org.apache.lucene.index.IndexFileNames;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;diff --git a/solr/core/src/test/org/apache/solr/handler/TestSnapshotCoreBackup.java b/solr/core/src/test/org/apache/solr/handler/TestSnapshotCoreBackup.javaindex f86ef0b3a4e..e10cbde5263 100644--- a/solr/core/src/test/org/apache/solr/handler/TestSnapshotCoreBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestSnapshotCoreBackup.java@@ -24,8 +24,8 @@ import org.apache.lucene.index.DirectoryReader;import org.apache.lucene.index.IndexCommit;import org.apache.lucene.store.Directory;import org.apache.lucene.store.FSDirectory;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.core.CoreContainer;diff --git a/solr/core/src/test/org/apache/solr/handler/TestStressIncrementalBackup.java b/solr/core/src/test/org/apache/solr/handler/TestStressIncrementalBackup.javaindex 509495cf29d..6fdd8c83e5b 100644--- a/solr/core/src/test/org/apache/solr/handler/TestStressIncrementalBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestStressIncrementalBackup.java@@ -23,7 +23,7 @@ import java.lang.invoke.MethodHandles;import java.nio.file.Path;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicReference;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java b/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.javaindex ec7a116ed76..e862211701d 100644--- a/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java@@ -33,9 +33,9 @@ import org.apache.lucene.index.DirectoryReader;import org.apache.lucene.index.Term;import org.apache.lucene.store.Directory;import org.apache.lucene.store.FSDirectory;-import org.apache.lucene.util.LuceneTestCase.Nightly;-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Nightly;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java b/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.javaindex 0ae0ede103a..3e35bae0482 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java@@ -29,9 +29,9 @@ import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.LeafReader;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.index.StoredFieldVisitor;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.Bits;import org.apache.lucene.util.RamUsageEstimator;-import org.apache.lucene.util.TestUtil;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.javaindex 9ed5c6f31a1..13db5a5d8cf 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java@@ -18,8 +18,8 @@ package org.apache.solr.handler.component;import java.util.HashMap;import java.util.Map;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocumentList;diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.javaindex 942cca9e74b..37329333fe3 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java@@ -19,7 +19,7 @@ package org.apache.solr.handler.component;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import java.nio.ByteBuffer;import java.util.Objects;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.response.SolrQueryResponse;diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.javaindex 0b308351e89..c280486b3ae 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java@@ -20,8 +20,8 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.List;import junit.framework.Assert;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.LuceneTestCase.SuppressTempFileChecks;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.javaindex 6cdd4296e4e..ea3d596f7cf 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java@@ -20,7 +20,7 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.List;import junit.framework.Assert;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.util.NamedList;diff --git a/solr/core/src/test/org/apache/solr/handler/component/FacetPivot2CollectionsTest.java b/solr/core/src/test/org/apache/solr/handler/component/FacetPivot2CollectionsTest.javaindex ab9eeb3889f..c188947954f 100644--- a/solr/core/src/test/org/apache/solr/handler/component/FacetPivot2CollectionsTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/FacetPivot2CollectionsTest.java@@ -22,7 +22,7 @@ import java.util.HashMap;import java.util.Map;import java.util.Random;import org.apache.commons.lang3.RandomStringUtils;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/handler/component/MoreLikeThisComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/MoreLikeThisComponentTest.javaindex ffc3cbde8de..28e8f817f57 100644--- a/solr/core/src/test/org/apache/solr/handler/component/MoreLikeThisComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/MoreLikeThisComponentTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.handler.component;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.javaindex 543fe94de7a..0b9aa279d6f 100644--- a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java@@ -18,8 +18,8 @@ package org.apache.solr.handler.component;import java.io.File;import java.util.*;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.LuceneTestCase.SuppressTempFileChecks;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.javaindex 345d953b9f6..0f2d98a304e 100644--- a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java@@ -16,8 +16,8 @@*/package org.apache.solr.handler.component;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.Constants;-import org.apache.lucene.util.TestUtil;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.common.params.ShardParams;import org.apache.solr.common.params.TermVectorParams;diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.javaindex b41cfc02633..3ed50c984b1 100644--- a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java+++ b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java@@ -27,8 +27,8 @@ import java.util.List;import java.util.Map;import java.util.concurrent.atomic.AtomicLong;import java.util.stream.IntStream;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.response.FieldStatsInfo;diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java b/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.javaindex cc7478cdd80..c7b6e796f80 100644--- a/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java+++ b/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java@@ -19,7 +19,7 @@ package org.apache.solr.handler.component;import java.util.ArrayList;import java.util.Arrays;import java.util.List;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.util.SuppressForbidden;diff --git a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.javaindex eaa9afd5f18..8770407ed70 100644--- a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java+++ b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java@@ -28,7 +28,7 @@ import java.util.List;import java.util.Locale;import java.util.Map;import java.util.Set;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.StreamParams;diff --git a/solr/core/src/test/org/apache/solr/index/TestSlowCompositeReaderWrapper.java b/solr/core/src/test/org/apache/solr/index/TestSlowCompositeReaderWrapper.javaindex 32d52f5d3a0..9862ac06ddd 100644--- a/solr/core/src/test/org/apache/solr/index/TestSlowCompositeReaderWrapper.java+++ b/solr/core/src/test/org/apache/solr/index/TestSlowCompositeReaderWrapper.java@@ -32,10 +32,10 @@ import org.apache.lucene.index.MultiDocValues.MultiSortedDocValues;import org.apache.lucene.index.MultiDocValues.MultiSortedSetDocValues;import org.apache.lucene.index.MultiTerms;import org.apache.lucene.index.NoMergePolicy;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;public class TestSlowCompositeReaderWrapper extends SolrTestCase {diff --git a/solr/core/src/test/org/apache/solr/legacy/TestLegacyField.java b/solr/core/src/test/org/apache/solr/legacy/TestLegacyField.javaindex 69348fcee6e..465f82ded88 100644--- a/solr/core/src/test/org/apache/solr/legacy/TestLegacyField.java+++ b/solr/core/src/test/org/apache/solr/legacy/TestLegacyField.java@@ -17,9 +17,9 @@package org.apache.solr.legacy;import java.io.StringReader;-import org.apache.lucene.analysis.CannedTokenStream;-import org.apache.lucene.analysis.Token;import org.apache.lucene.document.Field;+import org.apache.lucene.tests.analysis.CannedTokenStream;+import org.apache.lucene.tests.analysis.Token;import org.apache.lucene.util.BytesRef;import org.apache.solr.SolrTestCase;diff --git a/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.java b/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.javaindex 746a6aa4dda..80c1faa6032 100644--- a/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.java+++ b/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.java@@ -17,11 +17,11 @@package org.apache.solr.legacy;import java.io.IOException;-import org.apache.lucene.analysis.BaseTokenStreamTestCase;-import org.apache.lucene.analysis.CannedTokenStream;-import org.apache.lucene.analysis.Token;import org.apache.lucene.analysis.TokenStream;import org.apache.lucene.document.Field;+import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;+import org.apache.lucene.tests.analysis.CannedTokenStream;+import org.apache.lucene.tests.analysis.Token;import org.apache.solr.legacy.LegacyNumericTokenStream.LegacyNumericTermAttribute;/** test tokenstream reuse by DefaultIndexingChain */diff --git a/solr/core/src/test/org/apache/solr/legacy/TestLegacyTerms.java b/solr/core/src/test/org/apache/solr/legacy/TestLegacyTerms.javaindex 64f2f78d1fc..6de741d1ac6 100644--- a/solr/core/src/test/org/apache/solr/legacy/TestLegacyTerms.java+++ b/solr/core/src/test/org/apache/solr/legacy/TestLegacyTerms.java@@ -20,10 +20,10 @@ import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.MultiTerms;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.index.Terms;import org.apache.lucene.index.TermsEnum;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.index.RandomIndexWriter;import org.apache.lucene.util.NumericUtils;import org.apache.solr.SolrTestCase;diff --git a/solr/core/src/test/org/apache/solr/legacy/TestMultiValuedNumericRangeQuery.java b/solr/core/src/test/org/apache/solr/legacy/TestMultiValuedNumericRangeQuery.javaindex 0fabdc995ab..c38a405471c 100644--- a/solr/core/src/test/org/apache/solr/legacy/TestMultiValuedNumericRangeQuery.java+++ b/solr/core/src/test/org/apache/solr/legacy/TestMultiValuedNumericRangeQuery.java@@ -19,17 +19,17 @@ package org.apache.solr.legacy;import java.text.DecimalFormat;import java.text.DecimalFormatSymbols;import java.util.Locale;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;import org.apache.lucene.index.IndexReader;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.TermRangeQuery;import org.apache.lucene.search.TopDocs;import org.apache.lucene.search.TopScoreDocCollector;import org.apache.lucene.store.Directory;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;public class TestMultiValuedNumericRangeQuery extends SolrTestCase {diff --git a/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery32.java b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery32.javaindex a79548bb59b..1f2b6ed9750 100644--- a/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery32.java+++ b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery32.java@@ -16,24 +16,24 @@*/package org.apache.solr.legacy;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;import org.apache.lucene.index.DirectoryReader;import org.apache.lucene.index.IndexReader;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.MultiTermQuery;import org.apache.lucene.search.Query;-import org.apache.lucene.search.QueryUtils;import org.apache.lucene.search.ScoreDoc;import org.apache.lucene.search.Sort;import org.apache.lucene.search.TopDocs;import org.apache.lucene.search.TopFieldCollector;import org.apache.lucene.search.TopScoreDocCollector;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.search.QueryUtils;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.NumericUtils;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.java b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.javaindex 92d81956e8c..5939180154a 100644--- a/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.java+++ b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.java@@ -16,24 +16,24 @@*/package org.apache.solr.legacy;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;import org.apache.lucene.index.DirectoryReader;import org.apache.lucene.index.IndexReader;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.MultiTermQuery;import org.apache.lucene.search.Query;-import org.apache.lucene.search.QueryUtils;import org.apache.lucene.search.ScoreDoc;import org.apache.lucene.search.Sort;import org.apache.lucene.search.TopDocs;import org.apache.lucene.search.TopFieldCollector;import org.apache.lucene.search.TopScoreDocCollector;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.search.QueryUtils;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.NumericUtils;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.java b/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.javaindex e05c664973b..d2b1f6e921c 100644--- a/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.java+++ b/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.java@@ -16,11 +16,11 @@*/package org.apache.solr.legacy;-import org.apache.lucene.analysis.BaseTokenStreamTestCase;import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;import org.apache.lucene.analysis.tokenattributes.CharTermAttributeImpl;import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;import org.apache.lucene.analysis.tokenattributes.TypeAttribute;+import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;import org.apache.lucene.util.AttributeImpl;import org.apache.lucene.util.BytesRef;import org.apache.solr.legacy.LegacyNumericTokenStream.LegacyNumericTermAttributeImpl;diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricManagerTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricManagerTest.javaindex f82440f6bdc..3bfc2691f54 100644--- a/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricManagerTest.java+++ b/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricManagerTest.java@@ -24,7 +24,7 @@ import java.util.HashMap;import java.util.Map;import java.util.Random;import java.util.stream.Collectors;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.core.PluginInfo;diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.javaindex 54f1f55d92f..30dce4a9761 100644--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java@@ -24,7 +24,7 @@ import java.util.HashMap;import java.util.Map;import java.util.Random;import java.util.Set;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.util.NamedList;import org.apache.solr.core.PluginInfo;diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.javaindex bdb996297a0..c0ff0827d57 100644--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java@@ -19,7 +19,7 @@ package org.apache.solr.metrics;import java.util.HashMap;import java.util.Map;import java.util.Random;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.core.PluginInfo;diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.javaindex 12ce35affcd..c0a80e2a843 100644--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java@@ -21,7 +21,7 @@ import java.util.ArrayList;import java.util.HashMap;import java.util.Map;import java.util.Random;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.core.SolrInfoBean;public final class SolrMetricTestUtils {diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.javaindex 8bb3b415989..d4334ba113b 100644--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java@@ -26,7 +26,7 @@ import java.nio.file.Files;import java.nio.file.Path;import java.util.Map;import java.util.Random;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.NodeConfig;diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.javaindex fa84f7c1218..ffcd88fa1d2 100644--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java@@ -28,7 +28,7 @@ import javax.management.MBeanServer;import javax.management.MBeanServerFactory;import javax.management.ObjectInstance;import javax.management.ObjectName;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.core.PluginInfo;diff --git a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.javaindex 1a63020b4b5..e4de7fe09dc 100644--- a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java+++ b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java@@ -26,7 +26,7 @@ import java.net.URL;import java.net.URLEncoder;import java.nio.charset.StandardCharsets;import org.apache.commons.io.IOUtils;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;diff --git a/solr/core/src/test/org/apache/solr/request/TestUnInvertedFieldException.java b/solr/core/src/test/org/apache/solr/request/TestUnInvertedFieldException.javaindex 6aebf820f6c..5c1d11e6d61 100644--- a/solr/core/src/test/org/apache/solr/request/TestUnInvertedFieldException.java+++ b/solr/core/src/test/org/apache/solr/request/TestUnInvertedFieldException.java@@ -27,8 +27,8 @@ import java.util.concurrent.ThreadPoolExecutor;import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;import org.apache.lucene.index.Term;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.NamedThreadFactory;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.ExecutorUtil.MDCAwareThreadPoolExecutor;diff --git a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.javaindex 072fcbabe30..f2e65d30e78 100644--- a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java+++ b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java@@ -21,7 +21,7 @@ import java.io.ByteArrayOutputStream;import java.io.IOException;import java.io.StringWriter;import java.nio.charset.StandardCharsets;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.common.util.ContentStreamBase.ByteArrayStream;diff --git a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.javaindex f7d81b5c0af..ba88946142a 100644--- a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java+++ b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java@@ -18,7 +18,7 @@package org.apache.solr.response;import static junit.framework.Assert.fail;-import static org.apache.lucene.util.LuceneTestCase.random;+import static org.apache.lucene.tests.util.LuceneTestCase.random;import static org.apache.solr.search.SolrReturnFields.FIELD_SOURCES.ALL_FROM_DV;import static org.apache.solr.search.SolrReturnFields.FIELD_SOURCES.ALL_FROM_STORED;import static org.apache.solr.search.SolrReturnFields.FIELD_SOURCES.MIXED_SOURCES;diff --git a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.javaindex 5ce5202aa27..c4db16843fb 100644--- a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java+++ b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java@@ -20,7 +20,7 @@ import static org.hamcrest.core.StringContains.containsString;import java.util.Collection;import java.util.Iterator;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java b/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.javaindex 77636f531e1..c3e66ba33db 100644--- a/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java+++ b/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java@@ -23,7 +23,7 @@ import java.util.Arrays;import java.util.HashMap;import java.util.List;import java.util.Map;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.cloud.AbstractZkTestCase;import org.apache.solr.common.util.NamedList;import org.apache.solr.core.SolrResourceLoader;diff --git a/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java b/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.javaindex 6b02fb2dae6..a8cf134aed7 100644--- a/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java+++ b/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java@@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.analysis.CharFilterFactory;import org.apache.lucene.analysis.TokenFilterFactory;import org.apache.lucene.analysis.core.KeywordTokenizerFactory;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.analysis.TokenizerChain;import org.apache.solr.handler.admin.LukeRequestHandlerTest; // jdocdiff --git a/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java b/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.javaindex ec8ea76dbb9..d3acb4d3291 100644--- a/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java+++ b/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java@@ -125,7 +125,7 @@ public class DenseVectorFieldTest extends AbstractBadConfigTestBase {DenseVectorField type1 = (DenseVectorField) vector.getType();MatcherAssert.assertThat(type1.getSimilarityFunction(), is(VectorSimilarityFunction.COSINE));MatcherAssert.assertThat(type1.getDimension(), is(4));- MatcherAssert.assertThat(type1.getCodecFormat(), is("Lucene90HnswVectorsFormat"));+ MatcherAssert.assertThat(type1.getCodecFormat(), is("Lucene91HnswVectorsFormat"));MatcherAssert.assertThat(type1.getHnswMaxConn(), is(10));MatcherAssert.assertThat(type1.getHnswBeamWidth(), is(40));@@ -135,10 +135,20 @@ public class DenseVectorFieldTest extends AbstractBadConfigTestBase {DenseVectorField type2 = (DenseVectorField) vector2.getType();MatcherAssert.assertThat(type2.getSimilarityFunction(), is(VectorSimilarityFunction.COSINE));MatcherAssert.assertThat(type2.getDimension(), is(4));- MatcherAssert.assertThat(type2.getCodecFormat(), is("Lucene90HnswVectorsFormat"));+ MatcherAssert.assertThat(type2.getCodecFormat(), is("Lucene91HnswVectorsFormat"));MatcherAssert.assertThat(type2.getHnswMaxConn(), is(6));MatcherAssert.assertThat(type2.getHnswBeamWidth(), is(60));+ SchemaField vector3 = schema.getField("vector3");+ assertNotNull(vector3);++ DenseVectorField type3 = (DenseVectorField) vector3.getType();+ MatcherAssert.assertThat(type3.getSimilarityFunction(), is(VectorSimilarityFunction.COSINE));+ MatcherAssert.assertThat(type3.getDimension(), is(5));+ MatcherAssert.assertThat(type3.getCodecFormat(), is("Lucene90HnswVectorsFormat"));+ MatcherAssert.assertThat(type3.getHnswMaxConn(), is(8));+ MatcherAssert.assertThat(type3.getHnswBeamWidth(), is(46));+SchemaField vectorDefault = schema.getField("vector_default");assertNotNull(vectorDefault);diff --git a/solr/core/src/test/org/apache/solr/schema/StrFieldAnalyzerTest.java b/solr/core/src/test/org/apache/solr/schema/StrFieldAnalyzerTest.javaindex e17b0f9b9c2..8ffb468298c 100644--- a/solr/core/src/test/org/apache/solr/schema/StrFieldAnalyzerTest.java+++ b/solr/core/src/test/org/apache/solr/schema/StrFieldAnalyzerTest.java@@ -18,7 +18,7 @@ package org.apache.solr.schema;import java.io.IOException;import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.analysis.BaseTokenStreamTestCase;+import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;public class StrFieldAnalyzerTest extends BaseTokenStreamTestCase {public void testOffsetSanity() throws IOException {diff --git a/solr/core/src/test/org/apache/solr/schema/TestSortableTextField.java b/solr/core/src/test/org/apache/solr/schema/TestSortableTextField.javaindex 2089275003c..5764da5f0e3 100644--- a/solr/core/src/test/org/apache/solr/schema/TestSortableTextField.java+++ b/solr/core/src/test/org/apache/solr/schema/TestSortableTextField.java@@ -29,7 +29,7 @@ import org.apache.lucene.document.SortedSetDocValuesField;import org.apache.lucene.index.DocValuesType;import org.apache.lucene.index.IndexableField;import org.apache.lucene.index.LeafReader;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;diff --git a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.javaindex 73103e8e3cf..780824d92ca 100644--- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java+++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java@@ -33,8 +33,8 @@ import javax.xml.xpath.XPath;import javax.xml.xpath.XPathConstants;import javax.xml.xpath.XPathFactory;import org.apache.commons.io.FileUtils;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.IOUtils;-import org.apache.lucene.util.TestUtil;import org.apache.solr.common.util.DOMUtil;import org.apache.solr.core.AbstractBadConfigTestBase;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java b/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.javaindex 1e0cc430688..adfe99a89eb 100644--- a/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java+++ b/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java@@ -21,7 +21,7 @@ import java.nio.file.Paths;import java.util.Arrays;import java.util.Collections;import java.util.List;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java b/solr/core/src/test/org/apache/solr/search/CursorMarkTest.javaindex 951cf3cbc4a..e222689ab4c 100644--- a/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java+++ b/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java@@ -29,8 +29,8 @@ import java.util.UUID;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.analysis.TokenStream;import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;-import org.apache.lucene.util.TestUtil;import org.apache.solr.CursorPagingTest;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.javaindex a34e59c539a..0a5e42f40d8 100644--- a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java+++ b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java@@ -21,7 +21,7 @@ import java.util.HashSet;import java.util.Map;import java.util.Set;import org.apache.lucene.search.Query;-import org.apache.lucene.search.QueryUtils;+import org.apache.lucene.tests.search.QueryUtils;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.request.SolrQueryRequest;diff --git a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.javaindex 266243e6021..3135802a180 100644--- a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java+++ b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java@@ -420,7 +420,7 @@ public class RankQueryTestPlugin extends QParserPlugin {}if (comparator == null) {- comparator = sortField.getComparator(1, 0);+ comparator = sortField.getComparator(1, true);leafComparator = comparator.getLeafComparator(currentLeaf);}diff --git a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.javaindex 00284f11801..a673ef6d98b 100644--- a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java+++ b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java@@ -28,7 +28,7 @@ import java.util.Locale;import java.util.Random;import org.apache.lucene.document.Document;import org.apache.lucene.document.StringField;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrDocument;import org.apache.solr.response.transform.*;diff --git a/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java b/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.javaindex 8a30e9198cc..02f179037ce 100644--- a/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java+++ b/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java@@ -29,8 +29,8 @@ import java.util.Set;import java.util.concurrent.CountDownLatch;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicReference;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.Accountable;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.metrics.SolrMetricManager;import org.apache.solr.metrics.SolrMetricsContext;diff --git a/solr/core/src/test/org/apache/solr/search/TestCancellableCollector.java b/solr/core/src/test/org/apache/solr/search/TestCancellableCollector.javaindex 7e76bacc2ec..e5210ec3ade 100644--- a/solr/core/src/test/org/apache/solr/search/TestCancellableCollector.java+++ b/solr/core/src/test/org/apache/solr/search/TestCancellableCollector.java@@ -26,7 +26,6 @@ import org.apache.lucene.document.Field;import org.apache.lucene.document.SortedDocValuesField;import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.LeafReaderContext;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.index.Term;import org.apache.lucene.search.FilterLeafCollector;import org.apache.lucene.search.IndexSearcher;@@ -38,6 +37,7 @@ import org.apache.lucene.search.TermQuery;import org.apache.lucene.search.TopDocs;import org.apache.lucene.search.TopScoreDocCollector;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.index.RandomIndexWriter;import org.apache.lucene.util.BytesRef;import org.apache.solr.SolrTestCase;import org.apache.solr.common.util.ExecutorUtil;diff --git a/solr/core/src/test/org/apache/solr/search/TestDocSet.java b/solr/core/src/test/org/apache/solr/search/TestDocSet.javaindex d18e6a5da8f..339074837ff 100644--- a/solr/core/src/test/org/apache/solr/search/TestDocSet.java+++ b/solr/core/src/test/org/apache/solr/search/TestDocSet.java@@ -367,7 +367,8 @@ public class TestDocSet extends SolrTestCase {}@Override- public TopDocs searchNearestVectors(String field, float[] target, int k, Bits acceptDocs)+ public TopDocs searchNearestVectors(+ String field, float[] target, int k, Bits acceptDocs, int visitedLimit)throws IOException {return null;}diff --git a/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java b/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.javaindex 87afd9fce33..ca918a0da9e 100644--- a/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java+++ b/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java@@ -25,7 +25,6 @@ import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.LeafReaderContext;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.search.BooleanClause.Occur;import org.apache.lucene.search.BooleanQuery;import org.apache.lucene.search.DocIdSet;@@ -39,6 +38,7 @@ import org.apache.lucene.search.ScoreMode;import org.apache.lucene.search.Scorer;import org.apache.lucene.search.Weight;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.index.RandomIndexWriter;import org.apache.solr.SolrTestCase;public class TestFilteredDocIdSet extends SolrTestCase {diff --git a/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.javaindex b070be36e87..b257c3efb7d 100644--- a/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java+++ b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java@@ -17,7 +17,7 @@package org.apache.solr.search;-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.ModifiableSolrParams;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.javaindex cc7939f526e..5b811f14c49 100644--- a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java+++ b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java@@ -20,7 +20,7 @@ import java.util.HashSet;import java.util.Iterator;import java.util.Random;import java.util.Set;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/core/src/test/org/apache/solr/search/TestMissingGroups.java b/solr/core/src/test/org/apache/solr/search/TestMissingGroups.javaindex 4afa4d2d066..f00bbe6d042 100644--- a/solr/core/src/test/org/apache/solr/search/TestMissingGroups.java+++ b/solr/core/src/test/org/apache/solr/search/TestMissingGroups.java@@ -20,7 +20,7 @@ import java.util.ArrayList;import java.util.HashSet;import java.util.List;import java.util.Set;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrInputDocument;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java b/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.javaindex 026854e14ca..16ea2c1723f 100644--- a/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java+++ b/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java@@ -128,8 +128,8 @@ public class TestOverriddenPrefixQueryForCustomFieldType extends SolrTestCaseJ4}/**- * @see org.apache.lucene.search.QueryUtils#check- * @see org.apache.lucene.search.QueryUtils#checkEqual+ * @see org.apache.lucene.tests.search.QueryUtils#check+ * @see org.apache.lucene.tests.search.QueryUtils#checkEqual*/protected void assertQueryEquals(final SolrQueryRequest req, final String... inputs)throws Exception {@@ -147,9 +147,9 @@ public class TestOverriddenPrefixQueryForCustomFieldType extends SolrTestCaseJ4}for (int i = 0; i < queries.length; i++) {- org.apache.lucene.search.QueryUtils.check(queries[i]);+ org.apache.lucene.tests.search.QueryUtils.check(queries[i]);for (int j = i; j < queries.length; j++) {- org.apache.lucene.search.QueryUtils.checkEqual(queries[i], queries[j]);+ org.apache.lucene.tests.search.QueryUtils.checkEqual(queries[i], queries[j]);}}}diff --git a/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.javaindex d3e28e47af1..1bfca2d92ee 100644--- a/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java+++ b/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java@@ -22,7 +22,7 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.Collections;import java.util.List;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.CursorPagingTest;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;diff --git a/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java b/solr/core/src/test/org/apache/solr/search/TestRangeQuery.javaindex 9ec1d0e27fa..ab11c0b9e57 100644--- a/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java+++ b/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java@@ -29,7 +29,7 @@ import java.util.Map;import java.util.concurrent.CountDownLatch;import java.util.concurrent.ExecutorService;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/core/src/test/org/apache/solr/search/TestRecovery.java b/solr/core/src/test/org/apache/solr/search/TestRecovery.javaindex 593d6deacc4..f2e5fe69aca 100644--- a/solr/core/src/test/org/apache/solr/search/TestRecovery.java+++ b/solr/core/src/test/org/apache/solr/search/TestRecovery.java@@ -40,7 +40,7 @@ import java.util.Map;import java.util.concurrent.Future;import java.util.concurrent.Semaphore;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.util.TimeSource;import org.apache.solr.common.util.Utils;diff --git a/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java b/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.javaindex b8af0d6aeae..5cc3f0357da 100644--- a/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java+++ b/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java@@ -27,8 +27,8 @@ import java.util.Map;import java.util.Random;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicLong;-import org.apache.lucene.util.LuceneTestCase.Nightly;-import org.apache.lucene.util.TimeUnits;+import org.apache.lucene.tests.util.LuceneTestCase.Nightly;+import org.apache.lucene.tests.util.TimeUnits;import org.junit.BeforeClass;import org.junit.Test;import org.slf4j.Logger;diff --git a/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java b/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.javaindex a85a129621f..7bb754ae81e 100644--- a/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java+++ b/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java@@ -24,7 +24,7 @@ import java.util.Arrays;import java.util.Collections;import java.util.List;import java.util.stream.Collectors;-import org.apache.lucene.geo.GeoTestUtil;+import org.apache.lucene.tests.geo.GeoTestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java b/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.javaindex c15a48c23fb..1bca6a2ff8c 100644--- a/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java+++ b/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java@@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.CountDownLatch;import java.util.concurrent.atomic.AtomicBoolean;import org.apache.commons.math3.stat.descriptive.SummaryStatistics;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.metrics.SolrMetricManager;import org.apache.solr.metrics.SolrMetricsContext;diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrCoreParser.java b/solr/core/src/test/org/apache/solr/search/TestSolrCoreParser.javaindex 016181794d3..c54bc49444b 100644--- a/solr/core/src/test/org/apache/solr/search/TestSolrCoreParser.java+++ b/solr/core/src/test/org/apache/solr/search/TestSolrCoreParser.java@@ -21,9 +21,6 @@ import java.io.IOException;import java.io.InputStream;import java.nio.charset.StandardCharsets;import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.analysis.MockAnalyzer;-import org.apache.lucene.analysis.MockTokenFilter;-import org.apache.lucene.analysis.MockTokenizer;import org.apache.lucene.index.Term;import org.apache.lucene.queries.spans.SpanNearQuery;import org.apache.lucene.queries.spans.SpanOrQuery;@@ -35,6 +32,9 @@ import org.apache.lucene.search.MatchAllDocsQuery;import org.apache.lucene.search.MatchNoDocsQuery;import org.apache.lucene.search.Query;import org.apache.lucene.search.TermQuery;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.analysis.MockTokenFilter;+import org.apache.lucene.tests.analysis.MockTokenizer;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.util.NamedList;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheBean.java b/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheBean.javaindex 7dc8d4895b3..23246a95afc 100644--- a/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheBean.java+++ b/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheBean.java@@ -19,7 +19,7 @@ package org.apache.solr.search;import java.lang.invoke.MethodHandles;import java.util.Map;import java.util.Random;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.metrics.MetricsMap;import org.apache.solr.metrics.SolrMetricManager;diff --git a/solr/core/src/test/org/apache/solr/search/TestSort.java b/solr/core/src/test/org/apache/solr/search/TestSort.javaindex 96db219f150..a0d92a2a45f 100644--- a/solr/core/src/test/org/apache/solr/search/TestSort.java+++ b/solr/core/src/test/org/apache/solr/search/TestSort.java@@ -52,9 +52,9 @@ import org.apache.lucene.search.TopFieldCollector;import org.apache.lucene.search.Weight;import org.apache.lucene.store.ByteBuffersDirectory;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BitDocIdSet;import org.apache.lucene.util.FixedBitSet;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.schema.SchemaField;diff --git a/solr/core/src/test/org/apache/solr/search/TestStressLucene.java b/solr/core/src/test/org/apache/solr/search/TestStressLucene.javaindex a0f2055c8a7..a5178b9c5cf 100644--- a/solr/core/src/test/org/apache/solr/search/TestStressLucene.java+++ b/solr/core/src/test/org/apache/solr/search/TestStressLucene.java@@ -27,17 +27,17 @@ import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicLong;import java.util.concurrent.locks.Lock;import java.util.concurrent.locks.ReentrantLock;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;import org.apache.lucene.document.FieldType;import org.apache.lucene.index.DirectoryReader;import org.apache.lucene.index.IndexOptions;import org.apache.lucene.index.IndexReader;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.index.Term;import org.apache.lucene.search.TermQuery;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;import org.junit.Test;public class TestStressLucene extends TestRTGBase {diff --git a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.javaindex c0e3f8f0ede..fe55018d5f8 100644--- a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java+++ b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java@@ -31,8 +31,8 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicLong;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.lucene.util.Constants;-import org.apache.lucene.util.LuceneTestCase;import org.apache.solr.common.util.Utils;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.update.UpdateHandler;diff --git a/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java b/solr/core/src/test/org/apache/solr/search/TestTrieFacet.javaindex 7d49e9d68be..8dd604daeb6 100644--- a/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java+++ b/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java@@ -16,7 +16,7 @@*/package org.apache.solr.search;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.schema.SchemaField;diff --git a/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java b/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.javaindex b45fafab7f6..3737e81de0a 100644--- a/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java+++ b/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java@@ -17,7 +17,7 @@package org.apache.solr.search;import org.apache.lucene.search.Query;-import org.apache.lucene.search.QueryUtils;+import org.apache.lucene.tests.search.QueryUtils;import org.apache.solr.SolrTestCaseJ4;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java b/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.javaindex d9636abc9ff..e2103b1ca5c 100644--- a/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java+++ b/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java@@ -28,7 +28,7 @@ import java.util.List;import java.util.Map;import java.util.Map.Entry;import java.util.stream.Collectors;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.javaindex d0e24425147..289d4997133 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java@@ -27,7 +27,7 @@ import java.util.List;import java.util.Map;import java.util.Random;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.javaindex 92c9eede362..1d7114ed8e0 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java@@ -31,8 +31,8 @@ import java.util.List;import java.util.Map;import java.util.Random;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.javaindex f4d98e5abc5..767d4fe93cb 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java@@ -32,7 +32,7 @@ import java.util.Locale;import java.util.Map;import java.util.Random;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.javaindex 794fd4ab225..7414522f0a3 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java@@ -21,7 +21,7 @@ import java.io.IOException;import java.util.Arrays;import java.util.List;import java.util.Locale;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.JSONTestUtil;import org.apache.solr.SolrTestCaseHS;import org.apache.solr.client.solrj.SolrClient;diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.javaindex 4eb4f667eee..bba388161c9 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java@@ -28,7 +28,7 @@ import java.util.Locale;import java.util.Map;import java.util.Random;import java.util.concurrent.atomic.AtomicLong;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.JSONTestUtil;import org.apache.solr.SolrTestCaseHS;import org.apache.solr.client.solrj.SolrClient;diff --git a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.javaindex 411ca40b1f3..f9593f195d3 100644--- a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java+++ b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java@@ -20,8 +20,8 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.Collections;import java.util.List;-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java b/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.javaindex 72c4f507624..d522ad64234 100644--- a/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java+++ b/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java@@ -17,7 +17,6 @@package org.apache.solr.search.function;import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;import org.apache.lucene.document.Field.Store;@@ -28,19 +27,20 @@ import org.apache.lucene.document.TextField;import org.apache.lucene.index.DirectoryReader;import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.IndexWriterConfig;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.queries.function.FunctionQuery;import org.apache.lucene.queries.function.ValueSource;import org.apache.lucene.queries.function.valuesource.FloatFieldSource;import org.apache.lucene.queries.function.valuesource.IntFieldSource;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;-import org.apache.lucene.search.QueryUtils;import org.apache.lucene.search.ScoreDoc;import org.apache.lucene.search.TopDocs;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.search.QueryUtils;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.legacy.LegacyFloatField;import org.apache.solr.legacy.LegacyIntField;diff --git a/solr/core/src/test/org/apache/solr/search/function/TestSortByMinMaxFunction.java b/solr/core/src/test/org/apache/solr/search/function/TestSortByMinMaxFunction.javaindex d1034cc907c..4d737a55bca 100644--- a/solr/core/src/test/org/apache/solr/search/function/TestSortByMinMaxFunction.java+++ b/solr/core/src/test/org/apache/solr/search/function/TestSortByMinMaxFunction.java@@ -16,7 +16,7 @@*/package org.apache.solr.search.function;-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs;/*** Split out from SortByFunctionTest due to codec support limitations for SortedSetSelectordiff --git a/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java b/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.javaindex 4d541dbffc6..f13bbcbb5da 100644--- a/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java+++ b/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java@@ -21,7 +21,7 @@ import static org.hamcrest.core.StringContains.containsString;import org.apache.lucene.index.Term;import org.apache.lucene.search.Query;import org.apache.lucene.search.TermQuery;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.JSONTestUtil;import org.apache.solr.SolrTestCaseHS;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java b/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.javaindex e5483d37073..cc4d35889f5 100644--- a/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java+++ b/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java@@ -18,7 +18,7 @@ package org.apache.solr.search.stats;import java.io.IOException;import java.lang.invoke.MethodHandles;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;diff --git a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.javaindex 6a6f5e1c676..ed5eed8eec6 100644--- a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java@@ -52,7 +52,7 @@ import java.util.concurrent.TimeUnit;import org.apache.commons.io.FileUtils;import org.apache.commons.io.IOUtils;import org.apache.commons.lang3.StringUtils;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java b/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.javaindex fe2767e0ee5..67b1bc79047 100644--- a/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java+++ b/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java@@ -26,7 +26,7 @@ import java.util.function.Predicate;import org.apache.http.client.HttpClient;import org.apache.http.client.methods.HttpGet;import org.apache.http.util.EntityUtils;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.HttpClientUtil;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;diff --git a/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java b/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.javaindex e4fcf6a48fd..92979cefdb6 100644--- a/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java+++ b/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java@@ -35,7 +35,7 @@ import org.junit.Test;* Confirm that the expected security headers are returned when making requests to solr, regardless* of wether the request is interanlly forwared to another node.*/bugUrl = "https://issues.apache.org/jira/browse/SOLR-14903")public class SecurityHeadersTest extends SolrCloudTestCase {diff --git a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.javaindex 5aff7b50b8f..d272cf61b36 100644--- a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java+++ b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java@@ -19,7 +19,7 @@ package org.apache.solr.spelling;import java.util.Collection;import java.util.Collections;import java.util.Map;-import org.apache.lucene.util.LuceneTestCase.SuppressTempFileChecks;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.SpellingParams;import org.apache.solr.common.util.NamedList;diff --git a/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.javaindex ee3aa8a57f1..4a68253b6d9 100644--- a/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java+++ b/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java@@ -20,8 +20,8 @@ import java.io.File;import java.util.Collection;import java.util.Collections;import java.util.Map;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.SuppressTempFileChecks;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.util.NamedList;import org.apache.solr.core.SolrCore;diff --git a/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.javaindex dfb640cba79..85020ed8bb3 100644--- a/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java+++ b/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java@@ -36,7 +36,7 @@ import org.apache.lucene.search.spell.SuggestMode;import org.apache.lucene.search.spell.SuggestWord;import org.apache.lucene.search.spell.SuggestWordFrequencyComparator;import org.apache.lucene.store.Directory;-import org.apache.lucene.util.LuceneTestCase.SuppressTempFileChecks;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.util.NamedList;import org.apache.solr.core.SolrCore;diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.javaindex 92a60c36c2d..cac6b5d0df3 100644--- a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java+++ b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java@@ -19,9 +19,9 @@ package org.apache.solr.spelling;import java.util.HashSet;import java.util.List;import java.util.Set;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.LuceneTestCase.SuppressTempFileChecks;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.CursorMarkParams;diff --git a/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.java b/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.javaindex 649f7a7a43b..81a65f2f0fa 100644--- a/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.java+++ b/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.java@@ -20,15 +20,15 @@ import java.io.IOException;import java.util.Collection;import java.util.regex.Pattern;import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.analysis.BaseTokenStreamTestCase;import org.apache.lucene.analysis.LowerCaseFilter;-import org.apache.lucene.analysis.MockAnalyzer;-import org.apache.lucene.analysis.MockTokenizer;import org.apache.lucene.analysis.TokenStream;import org.apache.lucene.analysis.Tokenizer;import org.apache.lucene.analysis.core.KeywordTokenizer;import org.apache.lucene.analysis.miscellaneous.TrimFilter;import org.apache.lucene.analysis.pattern.PatternReplaceFilter;+import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.analysis.MockTokenizer;public class TestSuggestSpellingConverter extends BaseTokenStreamTestCase {SuggestQueryConverter converter = new SuggestQueryConverter();diff --git a/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.javaindex 7ae48c98021..edbcfcf0cb6 100644--- a/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java+++ b/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java@@ -19,8 +19,8 @@ package org.apache.solr.spelling;import java.util.Collection;import java.util.LinkedHashMap;import java.util.Map;-import org.apache.lucene.analysis.MockAnalyzer;-import org.apache.lucene.util.LuceneTestCase.SuppressTempFileChecks;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.util.NamedList;import org.apache.solr.core.SolrCore;diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/RandomTestDictionaryFactory.java b/solr/core/src/test/org/apache/solr/spelling/suggest/RandomTestDictionaryFactory.javaindex 06195e855ea..69b6a234117 100644--- a/solr/core/src/test/org/apache/solr/spelling/suggest/RandomTestDictionaryFactory.java+++ b/solr/core/src/test/org/apache/solr/spelling/suggest/RandomTestDictionaryFactory.java@@ -21,10 +21,10 @@ import java.io.IOException;import java.lang.invoke.MethodHandles;import org.apache.lucene.search.spell.Dictionary;import org.apache.lucene.search.suggest.InputIterator;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.BytesRefIterator;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.TestUtil;import org.apache.solr.common.params.CommonParams;import org.apache.solr.core.SolrCore;import org.apache.solr.search.SolrIndexSearcher;diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java b/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.javaindex 4d7e49d8a41..f955196312a 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java@@ -23,7 +23,6 @@ import java.util.HashSet;import java.util.List;import java.util.Set;import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.codecs.Codec;import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;@@ -37,16 +36,17 @@ import org.apache.lucene.index.LeafReader;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.index.MultiTerms;import org.apache.lucene.index.NumericDocValues;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.index.SortedSetDocValues;import org.apache.lucene.index.Term;import org.apache.lucene.index.Terms;import org.apache.lucene.index.TermsEnum;import org.apache.lucene.index.TermsEnum.SeekStatus;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.StringHelper;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.index.SlowCompositeReaderWrapper;import org.apache.solr.legacy.LegacyIntField;diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrdsUninvertLimit.java b/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrdsUninvertLimit.javaindex 38b29fcef3c..8aba32b1502 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrdsUninvertLimit.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrdsUninvertLimit.java@@ -18,7 +18,6 @@package org.apache.solr.uninverting;import java.io.IOException;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;import org.apache.lucene.index.ConcurrentMergeScheduler;@@ -28,7 +27,8 @@ import org.apache.lucene.index.IndexWriter;import org.apache.lucene.index.IndexWriterConfig;import org.apache.lucene.index.LeafReader;import org.apache.lucene.store.Directory;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.index.SlowCompositeReaderWrapper;diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.javaindex c531d30019b..15aacc3406a 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.java@@ -28,7 +28,6 @@ import java.util.Set;import java.util.concurrent.CyclicBarrier;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.BinaryDocValuesField;import org.apache.lucene.document.Document;import org.apache.lucene.document.DoublePoint;@@ -48,14 +47,15 @@ import org.apache.lucene.index.IndexWriterConfig;import org.apache.lucene.index.LeafReader;import org.apache.lucene.index.LogDocMergePolicy;import org.apache.lucene.index.NumericDocValues;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.index.SortedDocValues;import org.apache.lucene.index.SortedSetDocValues;import org.apache.lucene.index.TermsEnum;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.Bits;import org.apache.lucene.util.BytesRef;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.index.SlowCompositeReaderWrapper;import org.junit.AfterClass;diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheReopen.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheReopen.javaindex 80f90582c80..dd8eb485df2 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheReopen.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheReopen.java@@ -16,7 +16,6 @@*/package org.apache.solr.uninverting;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.Document;import org.apache.lucene.document.IntPoint;import org.apache.lucene.index.DirectoryReader;@@ -24,6 +23,7 @@ import org.apache.lucene.index.IndexWriter;import org.apache.lucene.index.LeafReader;import org.apache.lucene.index.NumericDocValues;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.analysis.MockAnalyzer;import org.apache.solr.SolrTestCase;public class TestFieldCacheReopen extends SolrTestCase {diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSort.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSort.javaindex f2195cb104c..96e6a1c7292 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSort.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSort.java@@ -20,7 +20,6 @@ import java.io.IOException;import java.util.Collections;import java.util.HashMap;import java.util.Map;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.Document;import org.apache.lucene.document.DoublePoint;import org.apache.lucene.document.Field;@@ -35,7 +34,6 @@ import org.apache.lucene.index.IndexWriter;import org.apache.lucene.index.IndexWriterConfig;import org.apache.lucene.index.MultiReader;import org.apache.lucene.index.NoMergePolicy;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.index.Term;import org.apache.lucene.search.BooleanClause.Occur;import org.apache.lucene.search.BooleanQuery;@@ -48,7 +46,9 @@ import org.apache.lucene.search.TermQuery;import org.apache.lucene.search.TopDocs;import org.apache.lucene.search.similarities.BM25Similarity;import org.apache.lucene.store.Directory;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.legacy.LegacyDoubleField;import org.apache.solr.legacy.LegacyFloatField;diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.javaindex 6a7f7181984..219d3675b04 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java@@ -37,7 +37,6 @@ import org.apache.lucene.index.DocValues;import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.index.NumericDocValues;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.search.ConstantScoreQuery;import org.apache.lucene.search.ConstantScoreScorer;import org.apache.lucene.search.ConstantScoreWeight;@@ -52,10 +51,11 @@ import org.apache.lucene.search.SortField;import org.apache.lucene.search.TopFieldDocs;import org.apache.lucene.search.Weight;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BitSetIterator;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.FixedBitSet;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.uninverting.UninvertingReader.Type;diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.javaindex 8018ff55b7f..746537c349c 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java@@ -23,7 +23,6 @@ import java.util.ArrayList;import java.util.Collections;import java.util.List;import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.BinaryDocValuesField;import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;@@ -37,17 +36,18 @@ import org.apache.lucene.index.IndexWriter;import org.apache.lucene.index.IndexWriterConfig;import org.apache.lucene.index.LeafReader;import org.apache.lucene.index.LeafReaderContext;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.index.SortedDocValues;import org.apache.lucene.index.SortedSetDocValues;import org.apache.lucene.index.Term;import org.apache.lucene.index.TermsEnum;import org.apache.lucene.index.TermsEnum.SeekStatus;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.Bits;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.Constants;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.index.SlowCompositeReaderWrapper;diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheWithThreads.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheWithThreads.javaindex ed25bbe6c1c..8a2ae95dac9 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheWithThreads.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheWithThreads.java@@ -24,7 +24,6 @@ import java.util.Random;import java.util.Set;import java.util.concurrent.CountDownLatch;import java.util.concurrent.TimeUnit;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.BinaryDocValuesField;import org.apache.lucene.document.Document;import org.apache.lucene.document.NumericDocValuesField;@@ -35,11 +34,12 @@ import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.IndexWriter;import org.apache.lucene.index.LeafReader;import org.apache.lucene.index.NumericDocValues;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.index.SortedDocValues;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;// TODO: what happened to this test... its not actually uninverting?diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestLegacyFieldCache.java b/solr/core/src/test/org/apache/solr/uninverting/TestLegacyFieldCache.javaindex 3517a54349d..7edc4beb3fa 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestLegacyFieldCache.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestLegacyFieldCache.java@@ -24,7 +24,6 @@ import java.util.Set;import java.util.concurrent.CyclicBarrier;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.BinaryDocValuesField;import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;@@ -39,11 +38,12 @@ import org.apache.lucene.index.IndexWriter;import org.apache.lucene.index.IndexWriterConfig;import org.apache.lucene.index.LeafReader;import org.apache.lucene.index.NumericDocValues;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.Bits;import org.apache.lucene.util.BytesRef;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.index.SlowCompositeReaderWrapper;import org.apache.solr.legacy.LegacyDoubleField;diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms32.java b/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms32.javaindex 452b0d2e558..3a12cb9ec8d 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms32.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms32.java@@ -18,10 +18,8 @@ package org.apache.solr.uninverting;import java.util.HashMap;import java.util.Map;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.Document;import org.apache.lucene.index.IndexReader;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;import org.apache.lucene.search.ScoreDoc;@@ -29,7 +27,9 @@ import org.apache.lucene.search.Sort;import org.apache.lucene.search.SortField;import org.apache.lucene.search.TopDocs;import org.apache.lucene.store.Directory;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.legacy.LegacyFieldType;import org.apache.solr.legacy.LegacyIntField;diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms64.java b/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms64.javaindex bb00e2fa30f..f49f46a3224 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms64.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms64.java@@ -18,10 +18,8 @@ package org.apache.solr.uninverting;import java.util.HashMap;import java.util.Map;-import org.apache.lucene.analysis.MockAnalyzer;import org.apache.lucene.document.Document;import org.apache.lucene.index.IndexReader;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;import org.apache.lucene.search.ScoreDoc;@@ -29,7 +27,9 @@ import org.apache.lucene.search.Sort;import org.apache.lucene.search.SortField;import org.apache.lucene.search.TopDocs;import org.apache.lucene.store.Directory;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.index.RandomIndexWriter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.legacy.LegacyFieldType;import org.apache.solr.legacy.LegacyLongField;diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestUninvertingReader.java b/solr/core/src/test/org/apache/solr/uninverting/TestUninvertingReader.javaindex dcdf36cf86f..9315c53293a 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestUninvertingReader.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestUninvertingReader.java@@ -41,8 +41,8 @@ import org.apache.lucene.index.LeafReader;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.index.SortedSetDocValues;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;-import org.apache.lucene.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.index.SlowCompositeReaderWrapper;import org.apache.solr.legacy.LegacyFieldType;diff --git a/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.java b/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.javaindex 5f5a827f37b..d0663bc90f8 100644--- a/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.java+++ b/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.java@@ -23,8 +23,8 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.stream.Collectors;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.IOUtils;-import org.apache.lucene.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.LBSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java b/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.javaindex 0c747c7b6ef..cd5b7256a22 100644--- a/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java+++ b/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java@@ -28,7 +28,7 @@ import org.apache.lucene.document.Document;import org.apache.lucene.document.KnnVectorField;import org.apache.lucene.index.IndexableField;import org.apache.lucene.index.VectorSimilarityFunction;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java b/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.javaindex a95e68cbdfe..34444be108e 100644--- a/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java+++ b/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java@@ -19,7 +19,7 @@ package org.apache.solr.update;import java.io.IOException;import java.net.ConnectException;import java.net.SocketException;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.javaindex 8a65ef86c9e..f543ed14451 100644--- a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java+++ b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java@@ -22,7 +22,7 @@ import java.net.ConnectException;import java.net.SocketException;import java.util.HashSet;import java.util.Set;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.Http2SolrClient;diff --git a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.javaindex 0815b8398b6..6bbcf29d3a7 100644--- a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java+++ b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java@@ -24,8 +24,8 @@ import java.lang.invoke.MethodHandles;import java.util.concurrent.BlockingQueue;import java.util.concurrent.LinkedBlockingQueue;import java.util.concurrent.TimeUnit;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.lucene.util.Constants;-import org.apache.lucene.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.core.SolrCore;import org.apache.solr.core.SolrEventListener;diff --git a/solr/core/src/test/org/apache/solr/update/TestExceedMaxTermLength.java b/solr/core/src/test/org/apache/solr/update/TestExceedMaxTermLength.javaindex e6e210ee0b9..d6ae5aefeac 100644--- a/solr/core/src/test/org/apache/solr/update/TestExceedMaxTermLength.java+++ b/solr/core/src/test/org/apache/solr/update/TestExceedMaxTermLength.java@@ -18,7 +18,7 @@ package org.apache.solr.update;import java.util.Locale;import org.apache.lucene.index.IndexWriter;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.junit.After;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.javaindex 0c7f8ea5956..275d289b83f 100644--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.java+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.java@@ -29,7 +29,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.javaindex e7b3408cad6..e4595bcefe2 100644--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java@@ -34,8 +34,8 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import org.apache.lucene.index.IndexWriter;import org.apache.lucene.index.NoMergePolicy;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.javaindex d061e902e52..413595b610b 100644--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java@@ -33,7 +33,7 @@ import java.util.Set;import org.apache.lucene.index.FieldInfo;import org.apache.lucene.index.IndexWriter;import org.apache.lucene.index.NoMergePolicy;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;diff --git a/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java b/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.javaindex 30e2e81a715..44809c8e637 100644--- a/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java+++ b/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java@@ -24,7 +24,7 @@ import java.util.Collections;import java.util.HashMap;import java.util.List;import java.util.Map;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.javaindex d07fd966af9..afbb5717285 100644--- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java@@ -22,17 +22,17 @@ import static org.mockito.Mockito.mock;import java.io.IOException;import java.util.ArrayList;import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.analysis.MockAnalyzer;-import org.apache.lucene.analysis.MockTokenizer;import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;import org.apache.lucene.index.IndexReader;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.index.Term;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;import org.apache.lucene.search.TermQuery;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.analysis.MockTokenizer;+import org.apache.lucene.tests.index.RandomIndexWriter;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.update.AddUpdateCommand;diff --git a/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.javaindex 4821682ab05..6bbf0eb9a07 100644--- a/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java@@ -60,7 +60,7 @@ import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.update.UpdateCommand;import org.junit.Ignore;bugUrl = "https://issues.apache.org/jira/browse/SOLR-13696")@Ignore // don't try too run abstract base classpublic abstract class RoutedAliasUpdateProcessorTest extends SolrCloudTestCase {diff --git a/solr/core/src/test/org/apache/solr/update/processor/TestDocBasedVersionConstraints.java b/solr/core/src/test/org/apache/solr/update/processor/TestDocBasedVersionConstraints.javaindex 20bad34abd0..d894e4db968 100644--- a/solr/core/src/test/org/apache/solr/update/processor/TestDocBasedVersionConstraints.java+++ b/solr/core/src/test/org/apache/solr/update/processor/TestDocBasedVersionConstraints.java@@ -27,7 +27,7 @@ import java.util.List;import java.util.concurrent.Callable;import java.util.concurrent.ExecutorService;import java.util.concurrent.Executors;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.javaindex 572667a762f..2b5b371305d 100644--- a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java@@ -40,7 +40,7 @@ import java.util.Locale;import java.util.Map;import java.util.concurrent.CountDownLatch;import java.util.concurrent.ExecutorService;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.BaseHttpClusterStateProvider;import org.apache.solr.client.solrj.impl.CloudSolrClient;diff --git a/solr/core/src/test/org/apache/solr/util/TestExportTool.java b/solr/core/src/test/org/apache/solr/util/TestExportTool.javaindex 3d66b85bcf8..c5824463518 100644--- a/solr/core/src/test/org/apache/solr/util/TestExportTool.java+++ b/solr/core/src/test/org/apache/solr/util/TestExportTool.java@@ -27,7 +27,7 @@ import java.util.Arrays;import java.util.HashMap;import java.util.Map;import java.util.function.Predicate;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.HttpSolrClient;diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.javaindex cb81d752de4..8dbc5b75225 100644--- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java+++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java@@ -36,7 +36,7 @@ import java.util.List;import java.util.Map;import org.apache.commons.exec.DefaultExecutor;import org.apache.commons.exec.ExecuteResultHandler;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.embedded.JettyConfig;diff --git a/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java b/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.javaindex 4a97a6bad07..ed7ab79ec2a 100644--- a/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java+++ b/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java@@ -21,7 +21,7 @@ import java.util.Locale;import java.util.Random;import java.util.Set;import java.util.TimeZone;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;public class TimeZoneUtilsTest extends SolrTestCase {diff --git a/solr/core/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java b/solr/core/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.javaindex 27222f71d00..255505d196e 100644--- a/solr/core/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java+++ b/solr/core/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java@@ -24,7 +24,7 @@ import java.io.IOException;import java.util.Arrays;import java.util.HashMap;import java.util.Map;-import org.apache.lucene.util.TestRuleRestoreSystemProperties;+import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;import org.apache.solr.util.configuration.providers.EnvSSLCredentialProvider;import org.apache.solr.util.configuration.providers.SysPropSSLCredentialProvider;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/util/configuration/SSLCredentialProviderFactoryTest.java b/solr/core/src/test/org/apache/solr/util/configuration/SSLCredentialProviderFactoryTest.javaindex e00715570e7..cf4d6334b2c 100644--- a/solr/core/src/test/org/apache/solr/util/configuration/SSLCredentialProviderFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/util/configuration/SSLCredentialProviderFactoryTest.java@@ -22,7 +22,7 @@ import static org.hamcrest.core.IsInstanceOf.instanceOf;import static org.junit.Assert.assertThat;import java.util.List;-import org.apache.lucene.util.TestRuleRestoreSystemProperties;+import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;import org.apache.solr.util.configuration.providers.EnvSSLCredentialProvider;import org.apache.solr.util.configuration.providers.SysPropSSLCredentialProvider;import org.hamcrest.Matcher;diff --git a/solr/core/src/test/org/apache/solr/util/configuration/providers/SysPropSSLCredentialProviderTest.java b/solr/core/src/test/org/apache/solr/util/configuration/providers/SysPropSSLCredentialProviderTest.javaindex 7e60acf1c8a..b3681a7affc 100644--- a/solr/core/src/test/org/apache/solr/util/configuration/providers/SysPropSSLCredentialProviderTest.java+++ b/solr/core/src/test/org/apache/solr/util/configuration/providers/SysPropSSLCredentialProviderTest.java@@ -22,7 +22,7 @@ import static org.hamcrest.core.Is.is;import static org.junit.Assert.assertThat;import java.util.Map;-import org.apache.lucene.util.TestRuleRestoreSystemProperties;+import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;import org.apache.solr.util.configuration.SSLConfigurations;import org.apache.solr.util.configuration.SSLCredentialProvider;import org.junit.Rule;diff --git a/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java b/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.javaindex 2ea68f64ef8..3cbb44ceaa8 100644--- a/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java+++ b/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java@@ -25,7 +25,7 @@ import java.util.Collection;import java.util.EnumSet;import java.util.List;import java.util.Random;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;import org.junit.Test;diff --git a/solr/licenses/asm-analysis-7.2.jar.sha1 b/solr/licenses/asm-analysis-7.2.jar.sha1new file mode 100644index 00000000000..b0a8b7b83ed--- /dev/null+++ b/solr/licenses/asm-analysis-7.2.jar.sha1@@ -0,0 +1 @@+b6e6abe057f23630113f4167c34bda7086691258diff --git a/solr/licenses/asm-tree-7.2.jar.sha1 b/solr/licenses/asm-tree-7.2.jar.sha1new file mode 100644index 00000000000..077d6f9c411--- /dev/null+++ b/solr/licenses/asm-tree-7.2.jar.sha1@@ -0,0 +1 @@+3a23cc36edaf8fc5a89cb100182758ccb5991487diff --git a/solr/licenses/icu4j-68.2.jar.sha1 b/solr/licenses/icu4j-68.2.jar.sha1deleted file mode 100644index 3b682a5877d..00000000000--- a/solr/licenses/icu4j-68.2.jar.sha1+++ /dev/null@@ -1 +0,0 @@-76893e6000401ace133a65262254be0ebe556d46diff --git a/solr/licenses/icu4j-70.1.jar.sha1 b/solr/licenses/icu4j-70.1.jar.sha1new file mode 100644index 00000000000..40b577c7e72--- /dev/null+++ b/solr/licenses/icu4j-70.1.jar.sha1@@ -0,0 +1 @@+dfa3a1fbc55bf5db8c6e79fc0935ac7ab1202950diff --git a/solr/licenses/lucene-analysis-common-9.0.0.jar.sha1 b/solr/licenses/lucene-analysis-common-9.0.0.jar.sha1deleted file mode 100644index 21f51499811..00000000000--- a/solr/licenses/lucene-analysis-common-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f78890829c3d6f15de48fdbc2c77ef4c0e3f005cdiff --git a/solr/licenses/lucene-analysis-common-9.1.0.jar.sha1 b/solr/licenses/lucene-analysis-common-9.1.0.jar.sha1new file mode 100644index 00000000000..cef5ddaba1c--- /dev/null+++ b/solr/licenses/lucene-analysis-common-9.1.0.jar.sha1@@ -0,0 +1 @@+240e3997fb139ff001e022124c89b686b5a8498ddiff --git a/solr/licenses/lucene-analysis-icu-9.0.0.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.0.0.jar.sha1deleted file mode 100644index efa989b689b..00000000000--- a/solr/licenses/lucene-analysis-icu-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a23a2c1c9baad61b6fb5380f072e41534c275875diff --git a/solr/licenses/lucene-analysis-icu-9.1.0.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.1.0.jar.sha1new file mode 100644index 00000000000..38c1b93e915--- /dev/null+++ b/solr/licenses/lucene-analysis-icu-9.1.0.jar.sha1@@ -0,0 +1 @@+e9b429da553560fa0c363ffc04c774f957c56e14diff --git a/solr/licenses/lucene-analysis-kuromoji-9.0.0.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.0.0.jar.sha1deleted file mode 100644index 6e318ab20a5..00000000000--- a/solr/licenses/lucene-analysis-kuromoji-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-55f00abe01e51181d687c6bbceca8544f319b97ddiff --git a/solr/licenses/lucene-analysis-kuromoji-9.1.0.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.1.0.jar.sha1new file mode 100644index 00000000000..795f465405c--- /dev/null+++ b/solr/licenses/lucene-analysis-kuromoji-9.1.0.jar.sha1@@ -0,0 +1 @@+b247f8a877237b4663e4ab7d86fae21c68a58ea5diff --git a/solr/licenses/lucene-analysis-morfologik-9.0.0.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.0.0.jar.sha1deleted file mode 100644index 9345cef9683..00000000000--- a/solr/licenses/lucene-analysis-morfologik-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-048fddf601c6de7dd296f6da3f394544618f7ceadiff --git a/solr/licenses/lucene-analysis-morfologik-9.1.0.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.1.0.jar.sha1new file mode 100644index 00000000000..f6587784881--- /dev/null+++ b/solr/licenses/lucene-analysis-morfologik-9.1.0.jar.sha1@@ -0,0 +1 @@+575c458431396baa7f01a546173807f27b12a087diff --git a/solr/licenses/lucene-analysis-nori-9.0.0.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.0.0.jar.sha1deleted file mode 100644index 4793acecf4f..00000000000--- a/solr/licenses/lucene-analysis-nori-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-c5258e674ad9c189338b026710869c2955d8e11ddiff --git a/solr/licenses/lucene-analysis-nori-9.1.0.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.1.0.jar.sha1new file mode 100644index 00000000000..6faef66e013--- /dev/null+++ b/solr/licenses/lucene-analysis-nori-9.1.0.jar.sha1@@ -0,0 +1 @@+30e24b42fb0440911e702a531f4373bf397eb8c6diff --git a/solr/licenses/lucene-analysis-opennlp-9.0.0.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.0.0.jar.sha1deleted file mode 100644index 3778bc04fe8..00000000000--- a/solr/licenses/lucene-analysis-opennlp-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-bc79914eee85c7ca2a3ebd70c74f24dc55504971diff --git a/solr/licenses/lucene-analysis-opennlp-9.1.0.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.1.0.jar.sha1new file mode 100644index 00000000000..4afdda06f8e--- /dev/null+++ b/solr/licenses/lucene-analysis-opennlp-9.1.0.jar.sha1@@ -0,0 +1 @@+85bfb07f5b082cb372bd76fc9ab513b87bc2ea9adiff --git a/solr/licenses/lucene-analysis-phonetic-9.0.0.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.0.0.jar.sha1deleted file mode 100644index d8b6143ca4b..00000000000--- a/solr/licenses/lucene-analysis-phonetic-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-437960fac10a9f8327fbd87be4e408eb140988b3diff --git a/solr/licenses/lucene-analysis-phonetic-9.1.0.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.1.0.jar.sha1new file mode 100644index 00000000000..8a4cadb7de2--- /dev/null+++ b/solr/licenses/lucene-analysis-phonetic-9.1.0.jar.sha1@@ -0,0 +1 @@+18a321d93836ea2856a5302d192e9dc99c647c6ediff --git a/solr/licenses/lucene-analysis-smartcn-9.0.0.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.0.0.jar.sha1deleted file mode 100644index f3f0b44209d..00000000000--- a/solr/licenses/lucene-analysis-smartcn-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-fe96c0b4609be5f7450773c2d7f099c51f4b1f7adiff --git a/solr/licenses/lucene-analysis-smartcn-9.1.0.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.1.0.jar.sha1new file mode 100644index 00000000000..86f56e99297--- /dev/null+++ b/solr/licenses/lucene-analysis-smartcn-9.1.0.jar.sha1@@ -0,0 +1 @@+41c847f39a15bb8495be8c9d8a098974be15f74bdiff --git a/solr/licenses/lucene-analysis-stempel-9.0.0.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.0.0.jar.sha1deleted file mode 100644index 833a2c7992e..00000000000--- a/solr/licenses/lucene-analysis-stempel-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-b92e86dd451d225e68ee4abac5b00bf883b6ea00diff --git a/solr/licenses/lucene-analysis-stempel-9.1.0.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.1.0.jar.sha1new file mode 100644index 00000000000..6d241df264f--- /dev/null+++ b/solr/licenses/lucene-analysis-stempel-9.1.0.jar.sha1@@ -0,0 +1 @@+ee7995231b181aa0a01f5aef8775562e269f5ef7diff --git a/solr/licenses/lucene-backward-codecs-9.0.0.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.0.0.jar.sha1deleted file mode 100644index 5e8fdd14d11..00000000000--- a/solr/licenses/lucene-backward-codecs-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-9fb48d0244799e18299449ee62459caab0728490diff --git a/solr/licenses/lucene-backward-codecs-9.1.0.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.1.0.jar.sha1new file mode 100644index 00000000000..ccfd88a223c--- /dev/null+++ b/solr/licenses/lucene-backward-codecs-9.1.0.jar.sha1@@ -0,0 +1 @@+de23bdacb09e8b39cbe876ff79c7a5b2ecc1faa6diff --git a/solr/licenses/lucene-classification-9.0.0.jar.sha1 b/solr/licenses/lucene-classification-9.0.0.jar.sha1deleted file mode 100644index 66c186fb032..00000000000--- a/solr/licenses/lucene-classification-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-6d1596933b0492f4b3600a41f7324f0159de15bddiff --git a/solr/licenses/lucene-classification-9.1.0.jar.sha1 b/solr/licenses/lucene-classification-9.1.0.jar.sha1new file mode 100644index 00000000000..82b88f4a3c0--- /dev/null+++ b/solr/licenses/lucene-classification-9.1.0.jar.sha1@@ -0,0 +1 @@+5803942558e9c60d5307c2738cabfef8b530ac50diff --git a/solr/licenses/lucene-codecs-9.0.0.jar.sha1 b/solr/licenses/lucene-codecs-9.0.0.jar.sha1deleted file mode 100644index 9d72a3c277d..00000000000--- a/solr/licenses/lucene-codecs-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-0bdbf382f714babd1e7f5c11fe1e3743146652e4diff --git a/solr/licenses/lucene-codecs-9.1.0.jar.sha1 b/solr/licenses/lucene-codecs-9.1.0.jar.sha1new file mode 100644index 00000000000..32c374bc020--- /dev/null+++ b/solr/licenses/lucene-codecs-9.1.0.jar.sha1@@ -0,0 +1 @@+c9536bef0f66c70453e8b8f4c2aafb1aa70d1575diff --git a/solr/licenses/lucene-core-9.0.0.jar.sha1 b/solr/licenses/lucene-core-9.0.0.jar.sha1deleted file mode 100644index f289acc1aec..00000000000--- a/solr/licenses/lucene-core-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-be679fd274f264e4e8b02bc032d2788cd4076ab4diff --git a/solr/licenses/lucene-core-9.1.0.jar.sha1 b/solr/licenses/lucene-core-9.1.0.jar.sha1new file mode 100644index 00000000000..5b2b8051b7c--- /dev/null+++ b/solr/licenses/lucene-core-9.1.0.jar.sha1@@ -0,0 +1 @@+0375603f1dacd8266526404faf0088a2ac8ec2ffdiff --git a/solr/licenses/lucene-expressions-9.0.0.jar.sha1 b/solr/licenses/lucene-expressions-9.0.0.jar.sha1deleted file mode 100644index 454092fd195..00000000000--- a/solr/licenses/lucene-expressions-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-0a3d818d6f6fb113831ed34553b24763fbda1e84diff --git a/solr/licenses/lucene-expressions-9.1.0.jar.sha1 b/solr/licenses/lucene-expressions-9.1.0.jar.sha1new file mode 100644index 00000000000..48f2a532d8d--- /dev/null+++ b/solr/licenses/lucene-expressions-9.1.0.jar.sha1@@ -0,0 +1 @@+2711abb758d101fc738c35a6867ee7559da5308bdiff --git a/solr/licenses/lucene-grouping-9.0.0.jar.sha1 b/solr/licenses/lucene-grouping-9.0.0.jar.sha1deleted file mode 100644index 2ed58ecf89c..00000000000--- a/solr/licenses/lucene-grouping-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-27ebe235d427b4e392fabab9b6bfa09524ca7f8bdiff --git a/solr/licenses/lucene-grouping-9.1.0.jar.sha1 b/solr/licenses/lucene-grouping-9.1.0.jar.sha1new file mode 100644index 00000000000..96fe25e26ff--- /dev/null+++ b/solr/licenses/lucene-grouping-9.1.0.jar.sha1@@ -0,0 +1 @@+703308505e62fa7dcb0bf64fdb6d95d335941bdcdiff --git a/solr/licenses/lucene-highlighter-9.0.0.jar.sha1 b/solr/licenses/lucene-highlighter-9.0.0.jar.sha1deleted file mode 100644index fc0246f2579..00000000000--- a/solr/licenses/lucene-highlighter-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a3cb395c2e8c672e6eec951b2b02371a4a883f73diff --git a/solr/licenses/lucene-highlighter-9.1.0.jar.sha1 b/solr/licenses/lucene-highlighter-9.1.0.jar.sha1new file mode 100644index 00000000000..56f560e19ab--- /dev/null+++ b/solr/licenses/lucene-highlighter-9.1.0.jar.sha1@@ -0,0 +1 @@+7f1925f6ef985000399a277ca17b8f67d3056838diff --git a/solr/licenses/lucene-join-9.0.0.jar.sha1 b/solr/licenses/lucene-join-9.0.0.jar.sha1deleted file mode 100644index 900a2d94c06..00000000000--- a/solr/licenses/lucene-join-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-94a855b5d09a6601289aeaeba0f11d5539552590diff --git a/solr/licenses/lucene-join-9.1.0.jar.sha1 b/solr/licenses/lucene-join-9.1.0.jar.sha1new file mode 100644index 00000000000..d457ae7999e--- /dev/null+++ b/solr/licenses/lucene-join-9.1.0.jar.sha1@@ -0,0 +1 @@+e7d39da8e623c99ee8da8bcc0185b2d908aca4b3diff --git a/solr/licenses/lucene-memory-9.0.0.jar.sha1 b/solr/licenses/lucene-memory-9.0.0.jar.sha1deleted file mode 100644index e51b2afc15f..00000000000--- a/solr/licenses/lucene-memory-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-2371c95031422bc1f501d43ffcc7311baed4b35bdiff --git a/solr/licenses/lucene-memory-9.1.0.jar.sha1 b/solr/licenses/lucene-memory-9.1.0.jar.sha1new file mode 100644index 00000000000..6cad2e149d7--- /dev/null+++ b/solr/licenses/lucene-memory-9.1.0.jar.sha1@@ -0,0 +1 @@+209166fd48dae3261ccf26990fe600332b8fb373diff --git a/solr/licenses/lucene-misc-9.0.0.jar.sha1 b/solr/licenses/lucene-misc-9.0.0.jar.sha1deleted file mode 100644index 6bfc3046744..00000000000--- a/solr/licenses/lucene-misc-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-25c6170f4fa2f707908dfb92fbafc76727f901e0diff --git a/solr/licenses/lucene-misc-9.1.0.jar.sha1 b/solr/licenses/lucene-misc-9.1.0.jar.sha1new file mode 100644index 00000000000..4ebdd77135a--- /dev/null+++ b/solr/licenses/lucene-misc-9.1.0.jar.sha1@@ -0,0 +1 @@+905d93b6389060cf4b0cb464ffa8fa2db81b60e7diff --git a/solr/licenses/lucene-queries-9.0.0.jar.sha1 b/solr/licenses/lucene-queries-9.0.0.jar.sha1deleted file mode 100644index 5b3a8e82bae..00000000000--- a/solr/licenses/lucene-queries-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-87b4c7833d30895baf7091f9cb0db878e970b604diff --git a/solr/licenses/lucene-queries-9.1.0.jar.sha1 b/solr/licenses/lucene-queries-9.1.0.jar.sha1new file mode 100644index 00000000000..f710f04c1bc--- /dev/null+++ b/solr/licenses/lucene-queries-9.1.0.jar.sha1@@ -0,0 +1 @@+c50fc971573910ea239ee6f275e9257b6b6bdd48diff --git a/solr/licenses/lucene-queryparser-9.0.0.jar.sha1 b/solr/licenses/lucene-queryparser-9.0.0.jar.sha1deleted file mode 100644index fdcd58b7e3a..00000000000--- a/solr/licenses/lucene-queryparser-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-bf13395ad2033bca3182fcbc83204e8ae1951945diff --git a/solr/licenses/lucene-queryparser-9.1.0.jar.sha1 b/solr/licenses/lucene-queryparser-9.1.0.jar.sha1new file mode 100644index 00000000000..6b867b2ce6c--- /dev/null+++ b/solr/licenses/lucene-queryparser-9.1.0.jar.sha1@@ -0,0 +1 @@+383eb69b12f9d9c98c44237155f50c870c9a34b9diff --git a/solr/licenses/lucene-sandbox-9.0.0.jar.sha1 b/solr/licenses/lucene-sandbox-9.0.0.jar.sha1deleted file mode 100644index ea34a7e8d1f..00000000000--- a/solr/licenses/lucene-sandbox-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-3c153a1dc1da3f98083cc932c9476df4b77b0ca5diff --git a/solr/licenses/lucene-sandbox-9.1.0.jar.sha1 b/solr/licenses/lucene-sandbox-9.1.0.jar.sha1new file mode 100644index 00000000000..d2e21b518c3--- /dev/null+++ b/solr/licenses/lucene-sandbox-9.1.0.jar.sha1@@ -0,0 +1 @@+0c728684e750a63f881998fbe27afd897f739762diff --git a/solr/licenses/lucene-spatial-extras-9.0.0.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.0.0.jar.sha1deleted file mode 100644index 422db966d2a..00000000000--- a/solr/licenses/lucene-spatial-extras-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-91535ef6512c45c7e2b113b04cab7738ee774893diff --git a/solr/licenses/lucene-spatial-extras-9.1.0.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.1.0.jar.sha1new file mode 100644index 00000000000..4659e5ec9a5--- /dev/null+++ b/solr/licenses/lucene-spatial-extras-9.1.0.jar.sha1@@ -0,0 +1 @@+94d7d107c399cd11d407b94fa62f5677fe86f63bdiff --git a/solr/licenses/lucene-spatial3d-9.0.0.jar.sha1 b/solr/licenses/lucene-spatial3d-9.0.0.jar.sha1deleted file mode 100644index 1d0491c5636..00000000000--- a/solr/licenses/lucene-spatial3d-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-6b4ee47f218ed3d123c1b07671677a2e4f3c133bdiff --git a/solr/licenses/lucene-spatial3d-9.1.0.jar.sha1 b/solr/licenses/lucene-spatial3d-9.1.0.jar.sha1new file mode 100644index 00000000000..3f81587eaac--- /dev/null+++ b/solr/licenses/lucene-spatial3d-9.1.0.jar.sha1@@ -0,0 +1 @@+7717b300bc14dfa9eb4b7d5970d8e25a60010e64diff --git a/solr/licenses/lucene-suggest-9.0.0.jar.sha1 b/solr/licenses/lucene-suggest-9.0.0.jar.sha1deleted file mode 100644index 9671093d284..00000000000--- a/solr/licenses/lucene-suggest-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a7d0e7279737114c039f5214082da948732096a6diff --git a/solr/licenses/lucene-suggest-9.1.0.jar.sha1 b/solr/licenses/lucene-suggest-9.1.0.jar.sha1new file mode 100644index 00000000000..08815229f23--- /dev/null+++ b/solr/licenses/lucene-suggest-9.1.0.jar.sha1@@ -0,0 +1 @@+957fca507eba94dbc3ef0d02377839be49bbe619diff --git a/solr/licenses/lucene-test-framework-9.0.0.jar.sha1 b/solr/licenses/lucene-test-framework-9.0.0.jar.sha1deleted file mode 100644index 76692ad894a..00000000000--- a/solr/licenses/lucene-test-framework-9.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e7c92c17f48acc7f94cf1dc261b0256605fcb059diff --git a/solr/licenses/lucene-test-framework-9.1.0.jar.sha1 b/solr/licenses/lucene-test-framework-9.1.0.jar.sha1new file mode 100644index 00000000000..14ef9adddc1--- /dev/null+++ b/solr/licenses/lucene-test-framework-9.1.0.jar.sha1@@ -0,0 +1 @@+6cdac8a65e00d4b587f8f7de0d041b53fc16c33fdiff --git a/solr/licenses/morfologik-fsa-2.1.5.jar.sha1 b/solr/licenses/morfologik-fsa-2.1.5.jar.sha1deleted file mode 100644index 638ac072243..00000000000--- a/solr/licenses/morfologik-fsa-2.1.5.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8c28fea0e928b6eb1070926ad5820a3013020fa5diff --git a/solr/licenses/morfologik-fsa-2.1.8.jar.sha1 b/solr/licenses/morfologik-fsa-2.1.8.jar.sha1new file mode 100644index 00000000000..8e121e5971a--- /dev/null+++ b/solr/licenses/morfologik-fsa-2.1.8.jar.sha1@@ -0,0 +1 @@+68e23e2c57fe5699d511b3a7a2f202f90020e214diff --git a/solr/licenses/morfologik-polish-2.1.5.jar.sha1 b/solr/licenses/morfologik-polish-2.1.5.jar.sha1deleted file mode 100644index cb29f244af2..00000000000--- a/solr/licenses/morfologik-polish-2.1.5.jar.sha1+++ /dev/null@@ -1 +0,0 @@-9e3dd781cf27337d64ab1bb0fc98d8b6c0fecf59diff --git a/solr/licenses/morfologik-polish-2.1.8.jar.sha1 b/solr/licenses/morfologik-polish-2.1.8.jar.sha1new file mode 100644index 00000000000..82e03b31945--- /dev/null+++ b/solr/licenses/morfologik-polish-2.1.8.jar.sha1@@ -0,0 +1 @@+f8fc4e6674395ffcb64c23ada9da74295b265bc5diff --git a/solr/licenses/morfologik-stemming-2.1.5.jar.sha1 b/solr/licenses/morfologik-stemming-2.1.5.jar.sha1deleted file mode 100644index 56e3d97086d..00000000000--- a/solr/licenses/morfologik-stemming-2.1.5.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a195cbd8ffa3481ea0608a8ec1518f9fc771e78fdiff --git a/solr/licenses/morfologik-stemming-2.1.8.jar.sha1 b/solr/licenses/morfologik-stemming-2.1.8.jar.sha1new file mode 100644index 00000000000..4321357a5f0--- /dev/null+++ b/solr/licenses/morfologik-stemming-2.1.8.jar.sha1@@ -0,0 +1 @@+409fa92db4cfb0f90a33d303732a4882cee3d1e7diff --git a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.javaindex d72c0d4801a..ac0b15a0187 100644--- a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java+++ b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java@@ -19,7 +19,7 @@ package org.apache.solr.gcs;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import java.lang.invoke.MethodHandles;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.cloud.api.collections.AbstractIncrementalBackupTest;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/LocalStorageGCSBackupRepository.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/LocalStorageGCSBackupRepository.javaindex 84460e53e35..994cd54dab0 100644--- a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/LocalStorageGCSBackupRepository.java+++ b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/LocalStorageGCSBackupRepository.java@@ -17,7 +17,7 @@package org.apache.solr.gcs;-import static org.apache.lucene.util.LuceneTestCase.assumeFalse;+import static org.apache.lucene.tests.util.LuceneTestCase.assumeFalse;import com.google.cloud.storage.BlobId;import com.google.cloud.storage.Storage;diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/LocaleTest.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/LocaleTest.javaindex 34070091010..fd0b3e7149d 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/LocaleTest.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/LocaleTest.java@@ -31,7 +31,7 @@ import javax.security.auth.login.Configuration;import javax.security.auth.login.LoginContext;import javax.security.auth.login.LoginException;import org.apache.hadoop.minikdc.MiniKdc;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCase;import org.apache.solr.util.LogLevel;import org.junit.Test;diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/SaslZkACLProviderTest.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/SaslZkACLProviderTest.javaindex 4d200d50a91..bb656f19297 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/SaslZkACLProviderTest.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/SaslZkACLProviderTest.java@@ -23,8 +23,8 @@ import java.lang.invoke.MethodHandles;import java.nio.charset.Charset;import java.nio.charset.StandardCharsets;import java.nio.file.Path;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.lucene.util.Constants;-import org.apache.lucene.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.cloud.AbstractVMParamsZkACLAndCredentialsProvidersTestBase;diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithDelegationTokens.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithDelegationTokens.javaindex 6083500eb3c..13dfe1ae986 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithDelegationTokens.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithDelegationTokens.java@@ -25,7 +25,7 @@ import java.util.Optional;import java.util.Set;import org.apache.hadoop.util.Time;import org.apache.http.HttpStatus;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithKerberosAlt.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithKerberosAlt.javaindex f266537d17a..a8601a5e2cf 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithKerberosAlt.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithKerberosAlt.java@@ -19,8 +19,8 @@ package org.apache.solr.security.hadoop;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import java.lang.invoke.MethodHandles;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.javaindex dc174330b36..7cee69f5c65 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java@@ -27,7 +27,7 @@ import java.util.Arrays;import java.util.HashMap;import java.util.Map;import org.apache.hadoop.conf.Configuration;-import org.apache.lucene.util.TestRuleRestoreSystemProperties;+import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.util.configuration.providers.EnvSSLCredentialProvider;import org.apache.solr.util.configuration.providers.SysPropSSLCredentialProvider;diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/providers/hadoop/HadoopSSLCredentialProviderTest.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/providers/hadoop/HadoopSSLCredentialProviderTest.javaindex 951c712d00b..e6ae219d372 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/providers/hadoop/HadoopSSLCredentialProviderTest.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/providers/hadoop/HadoopSSLCredentialProviderTest.java@@ -25,7 +25,7 @@ import static org.junit.Assert.assertThat;import java.io.IOException;import java.util.Map;import org.apache.hadoop.conf.Configuration;-import org.apache.lucene.util.TestRuleRestoreSystemProperties;+import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.util.configuration.SSLCredentialProvider;import org.junit.Rule;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/HdfsDirectoryFactoryTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/HdfsDirectoryFactoryTest.javaindex 88c58b13382..b5517c70f12 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/HdfsDirectoryFactoryTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/HdfsDirectoryFactoryTest.java@@ -34,8 +34,8 @@ import org.apache.hadoop.hdfs.MiniDFSCluster;import org.apache.lucene.store.Directory;import org.apache.lucene.store.IndexOutput;import org.apache.lucene.store.NoLockFactory;-import org.apache.lucene.util.QuickPatchThreadsFilter;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.util.NamedList;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/backup/repository/HdfsBackupRepositoryIntegrationTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/backup/repository/HdfsBackupRepositoryIntegrationTest.javaindex 9b3e77ee0ae..ecd5349de3f 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/backup/repository/HdfsBackupRepositoryIntegrationTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/backup/repository/HdfsBackupRepositoryIntegrationTest.java@@ -27,7 +27,7 @@ import org.apache.hadoop.fs.FileSystem;import org.apache.hadoop.hdfs.DistributedFileSystem;import org.apache.hadoop.hdfs.MiniDFSCluster;import org.apache.hadoop.hdfs.protocol.HdfsConstants;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.cloud.api.collections.AbstractBackupRepositoryTest;import org.apache.solr.common.util.IOUtils;import org.apache.solr.common.util.NamedList;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsBasicDistributedZk2Test.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsBasicDistributedZk2Test.javaindex dfab112977f..3b4509e4f1b 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsBasicDistributedZk2Test.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsBasicDistributedZk2Test.java@@ -21,8 +21,8 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import java.io.IOException;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.AbstractBasicDistributedZk2TestBase;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsBasicDistributedZkTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsBasicDistributedZkTest.javaindex 940817dfbbf..095dc50d521 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsBasicDistributedZkTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsBasicDistributedZkTest.java@@ -21,8 +21,8 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import java.io.IOException;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.AbstractBasicDistributedZkTestBase;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsChaosMonkeyNothingIsSafeTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsChaosMonkeyNothingIsSafeTest.javaindex 60331bc87d9..4bba2c90c19 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsChaosMonkeyNothingIsSafeTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsChaosMonkeyNothingIsSafeTest.java@@ -21,8 +21,8 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import java.io.IOException;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.AbstractChaosMonkeyNothingIsSafeTestBase;import org.apache.solr.hdfs.HdfsDirectoryFactory;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsChaosMonkeySafeLeaderTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsChaosMonkeySafeLeaderTest.javaindex aa4dec937e7..5b02ea1e5e1 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsChaosMonkeySafeLeaderTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsChaosMonkeySafeLeaderTest.java@@ -21,8 +21,8 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import java.io.IOException;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.AbstractChaosMonkeySafeLeaderTestBase;import org.apache.solr.hdfs.HdfsDirectoryFactory;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsCollectionsApiTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsCollectionsApiTest.javaindex 796f2ec133f..586f009733b 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsCollectionsApiTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsCollectionsApiTest.java@@ -20,7 +20,7 @@ package org.apache.solr.hdfs.cloud;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsNameNodeFailoverTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsNameNodeFailoverTest.javaindex 731cf8847de..a8959899d49 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsNameNodeFailoverTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsNameNodeFailoverTest.java@@ -20,8 +20,8 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import java.io.IOException;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.AbstractBasicDistributedZkTestBase;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRecoverLeaseTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRecoverLeaseTest.javaindex a41bc39fe39..c2ac1acae73 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRecoverLeaseTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRecoverLeaseTest.java@@ -27,7 +27,7 @@ import org.apache.hadoop.fs.FSDataOutputStream;import org.apache.hadoop.fs.FileSystem;import org.apache.hadoop.fs.Path;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRecoveryZkTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRecoveryZkTest.javaindex 5ee2a0e30b5..e192446f5a0 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRecoveryZkTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRecoveryZkTest.java@@ -19,10 +19,10 @@ package org.apache.solr.hdfs.cloud;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Nightly;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Nightly;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.AbstractRecoveryZkTestBase;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRestartWhileUpdatingTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRestartWhileUpdatingTest.javaindex 5a2fd14bcc7..5b091e54422 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRestartWhileUpdatingTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRestartWhileUpdatingTest.java@@ -20,8 +20,8 @@ import com.carrotsearch.randomizedtesting.annotations.Nightly;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.AbstractRestartWhileUpdatingTestBase;import org.apache.solr.hdfs.HdfsDirectoryFactory;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsSyncSliceTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsSyncSliceTest.javaindex f9f7a662a3f..38cdeed6f47 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsSyncSliceTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsSyncSliceTest.java@@ -21,8 +21,8 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import java.io.IOException;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.AbstractSyncSliceTestBase;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsThreadLeakTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsThreadLeakTest.javaindex 29ef43f2f89..c8221060235 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsThreadLeakTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsThreadLeakTest.java@@ -25,7 +25,7 @@ import org.apache.hadoop.fs.FileSystem;import org.apache.hadoop.fs.Path;import org.apache.hadoop.hdfs.DistributedFileSystem;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsTlogReplayBufferedWhileIndexingTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsTlogReplayBufferedWhileIndexingTest.javaindex a047eaedf8f..2856d9eae04 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsTlogReplayBufferedWhileIndexingTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsTlogReplayBufferedWhileIndexingTest.java@@ -20,8 +20,8 @@ import com.carrotsearch.randomizedtesting.annotations.Nightly;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.AbstractTlogReplayBufferedWhileIndexingTestBase;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsUnloadDistributedZkTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsUnloadDistributedZkTest.javaindex 20f30a9c934..a980fbd65b8 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsUnloadDistributedZkTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsUnloadDistributedZkTest.java@@ -20,8 +20,8 @@ import com.carrotsearch.randomizedtesting.annotations.Nightly;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.AbstractUnloadDistributedZkTestBase;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsWriteToMultipleCollectionsTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsWriteToMultipleCollectionsTest.javaindex 3342da82f23..c4ea95045cd 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsWriteToMultipleCollectionsTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsWriteToMultipleCollectionsTest.java@@ -29,10 +29,10 @@ import org.apache.hadoop.hdfs.MiniDFSCluster;import org.apache.lucene.index.IndexWriter;import org.apache.lucene.store.Directory;import org.apache.lucene.store.NRTCachingDirectory;+import org.apache.lucene.tests.util.LuceneTestCase.Nightly;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.lucene.util.IOUtils;-import org.apache.lucene.util.LuceneTestCase.Nightly;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.javaindex 58d9dd2d575..8741e08df2e 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java@@ -21,7 +21,7 @@ import com.carrotsearch.randomizedtesting.annotations.Nightly;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import java.io.IOException;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsTest.javaindex 255ea33af5b..b125746f85c 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsTest.java@@ -20,11 +20,11 @@ import com.carrotsearch.randomizedtesting.annotations.Nightly;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.AwaitsFix;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;-import org.apache.lucene.util.TimeUnits;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.TimeUnits;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.AbstractMoveReplicaTestBase;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/SharedFileSystemAutoReplicaFailoverTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/SharedFileSystemAutoReplicaFailoverTest.javaindex 6a1596b9519..d430e2cde11 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/SharedFileSystemAutoReplicaFailoverTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/SharedFileSystemAutoReplicaFailoverTest.java@@ -34,9 +34,9 @@ import java.util.concurrent.ThreadPoolExecutor;import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrQuery;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.javaindex 13be05da082..8bf2f37c874 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.java@@ -32,8 +32,8 @@ import org.apache.hadoop.fs.FileSystem;import org.apache.hadoop.fs.Path;import org.apache.hadoop.hdfs.MiniDFSCluster;import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/HdfsCloudIncrementalBackupTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/HdfsCloudIncrementalBackupTest.javaindex 0180c2a24e5..9ae15f86e0b 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/HdfsCloudIncrementalBackupTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/HdfsCloudIncrementalBackupTest.java@@ -27,8 +27,8 @@ import org.apache.hadoop.fs.FileSystem;import org.apache.hadoop.hdfs.DistributedFileSystem;import org.apache.hadoop.hdfs.MiniDFSCluster;import org.apache.hadoop.hdfs.protocol.HdfsConstants;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.api.collections.AbstractIncrementalBackupTest;import org.apache.solr.common.util.IOUtils;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/HdfsCollectionsApiDistributedZkTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/HdfsCollectionsApiDistributedZkTest.javaindex f1996b612c0..c3129c806d7 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/HdfsCollectionsApiDistributedZkTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/HdfsCollectionsApiDistributedZkTest.java@@ -20,9 +20,9 @@ import com.carrotsearch.randomizedtesting.annotations.Nightly;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.QuickPatchThreadsFilter;-import org.apache.lucene.util.TimeUnits;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.TimeUnits;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.cloud.api.collections.AbstractCollectionsAPIDistributedZkTestBase;import org.apache.solr.hdfs.cloud.HdfsTestUtil;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/TestHdfsCloudBackupRestore.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/TestHdfsCloudBackupRestore.javaindex b07d232f83e..5afb9cbdb72 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/TestHdfsCloudBackupRestore.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/api/collections/TestHdfsCloudBackupRestore.java@@ -37,8 +37,8 @@ import org.apache.hadoop.fs.Path;import org.apache.hadoop.hdfs.DistributedFileSystem;import org.apache.hadoop.hdfs.MiniDFSCluster;import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/handler/TestHdfsBackupRestoreCore.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/handler/TestHdfsBackupRestoreCore.javaindex b0ddc3741ac..5e7a0196b75 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/handler/TestHdfsBackupRestoreCore.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/handler/TestHdfsBackupRestoreCore.java@@ -33,9 +33,9 @@ import org.apache.hadoop.fs.permission.FsPermission;import org.apache.hadoop.hdfs.DistributedFileSystem;import org.apache.hadoop.hdfs.MiniDFSCluster;import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.QuickPatchThreadsFilter;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.impl.CloudSolrClient;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/index/CheckHdfsIndexTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/index/CheckHdfsIndexTest.javaindex 327d7b8bc3d..5294fd35fab 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/index/CheckHdfsIndexTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/index/CheckHdfsIndexTest.java@@ -22,9 +22,9 @@ import org.apache.hadoop.conf.Configuration;import org.apache.hadoop.fs.FileSystem;import org.apache.hadoop.fs.Path;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.index.BaseTestCheckIndex;import org.apache.lucene.store.Directory;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.index.BaseTestCheckIndex;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.javaindex af4a775edb1..739cbe07a79 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java@@ -40,7 +40,7 @@ import org.apache.hadoop.fs.FileStatus;import org.apache.hadoop.fs.FileSystem;import org.apache.hadoop.fs.Path;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.util.IOUtils;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsDirectoryTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsDirectoryTest.javaindex 6fd18a95759..b28a510535c 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsDirectoryTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsDirectoryTest.java@@ -31,7 +31,7 @@ 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.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.hdfs.cloud.HdfsTestUtil;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsLockFactoryTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsLockFactoryTest.javaindex 5eb0e801010..66588089b6e 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsLockFactoryTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsLockFactoryTest.java@@ -24,7 +24,7 @@ import org.apache.hadoop.fs.Path;import org.apache.hadoop.hdfs.MiniDFSCluster;import org.apache.lucene.store.Lock;import org.apache.lucene.store.LockObtainFailedException;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.hdfs.cloud.HdfsTestUtil;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BufferStoreTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BufferStoreTest.javaindex 6962e64a7cf..02331904cf4 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BufferStoreTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BufferStoreTest.java@@ -18,7 +18,7 @@ package org.apache.solr.hdfs.store.blockcache;import java.math.BigDecimal;import java.util.Map;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.metrics.MetricsMap;import org.apache.solr.metrics.SolrMetricManager;diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/update/TestHdfsUpdateLog.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/update/TestHdfsUpdateLog.javaindex 2409928b6d7..154ce5ba97f 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/update/TestHdfsUpdateLog.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/update/TestHdfsUpdateLog.java@@ -23,7 +23,7 @@ import java.net.URISyntaxException;import org.apache.hadoop.conf.Configuration;import org.apache.hadoop.fs.FileSystem;import org.apache.hadoop.hdfs.MiniDFSCluster;-import org.apache.lucene.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.util.IOUtils;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.javaindex 9008218df74..0edc0379445 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java@@ -29,7 +29,6 @@ import org.apache.lucene.document.Field;import org.apache.lucene.document.FloatDocValuesField;import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.LeafReaderContext;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.index.ReaderUtil;import org.apache.lucene.index.Term;import org.apache.lucene.search.BooleanClause;@@ -41,6 +40,7 @@ import org.apache.lucene.search.TermQuery;import org.apache.lucene.search.TopDocs;import org.apache.lucene.search.Weight;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.index.RandomIndexWriter;import org.apache.solr.SolrTestCase;import org.apache.solr.core.SolrResourceLoader;import org.apache.solr.ltr.feature.Feature;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.javaindex 65af5626ac0..cf1a1dbaf21 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java@@ -26,7 +26,6 @@ import org.apache.lucene.document.Field;import org.apache.lucene.document.FloatDocValuesField;import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.LeafReaderContext;-import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.index.ReaderUtil;import org.apache.lucene.index.Term;import org.apache.lucene.search.BooleanClause;@@ -38,6 +37,7 @@ import org.apache.lucene.search.TermQuery;import org.apache.lucene.search.TopDocs;import org.apache.lucene.search.Weight;import org.apache.lucene.store.Directory;+import org.apache.lucene.tests.index.RandomIndexWriter;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.ltr.feature.Feature;import org.apache.solr.ltr.feature.ValueFeature;diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.javaindex 7d71bef11da..4372e997ad2 100644--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java@@ -20,7 +20,7 @@ package org.apache.solr.s3;import com.adobe.testing.s3mock.junit4.S3MockRule;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;import java.lang.invoke.MethodHandles;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.cloud.api.collections.AbstractIncrementalBackupTest;import org.junit.BeforeClass;import org.junit.ClassRule;diff --git a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.javaindex b08cef64391..1e04527337f 100644--- a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java+++ b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java@@ -27,8 +27,8 @@ import java.util.List;import java.util.Locale;import java.util.stream.Collectors;import org.apache.commons.lang3.StringUtils;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.stream.ExceptionStream;diff --git a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.javaindex 11c9e1687d2..364e4b9aaae 100644--- a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java+++ b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java@@ -18,7 +18,7 @@ package org.apache.solr.prometheus.exporter;import java.util.Map;import java.util.stream.Collectors;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.junit.Before;import org.junit.Test;diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xmlindex c28ed6f9a6d..c39c1ed2f9a 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.0</luceneMatchVersion>+ <luceneMatchVersion>9.1</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 3e55f13fd8b..022f7874043 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.0</luceneMatchVersion>+ <luceneMatchVersion>9.1</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/solr-ref-guide/antora.yml b/solr/solr-ref-guide/antora.ymlindex 01259583651..12ced155e56 100644--- a/solr/solr-ref-guide/antora.yml+++ b/solr/solr-ref-guide/antora.yml@@ -35,7 +35,7 @@ asciidoc:# 'patch-version' is the 'z' part of x.y.z semantic versionpage-solr-javadocs: 'https://solr.apache.org/docs/10_0_0'solr-javadocs: 'https://solr.apache.org/docs/10_0_0'- lucene-javadocs: 'https://lucene.apache.org/core/9_0_0'+ lucene-javadocs: 'https://lucene.apache.org/core/9_1_0'java-javadocs: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/# Some constructed links may be 404 TODO to checksolr-docs-version: '10.0'@@ -48,4 +48,4 @@ asciidoc:dep-version-opennlp: '1.9.4'dep-version-tika: '1.28.1'dep-version-zookeeper: '3.7.0'- dep-version-lucene: '9.0.0'+ dep-version-lucene: '9.1.0'diff --git a/solr/solr-ref-guide/modules/query-guide/pages/dense-vector-search.adoc b/solr/solr-ref-guide/modules/query-guide/pages/dense-vector-search.adocindex c50f4abf1d5..f2c1cfc2e03 100644--- a/solr/solr-ref-guide/modules/query-guide/pages/dense-vector-search.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/dense-vector-search.adoc@@ -109,20 +109,20 @@ and the hyper-parameter of the HNSW algorithm make sure you set this configuratiHere's how `DenseVectorField` can be configured with the advanced codec hyper-parameters:[source,xml]-<fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine" codecFormat="Lucene90HnswVectorsFormat" hnswMaxConnections="10" hnswBeamWidth="40"/>+<fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine" codecFormat="Lucene91HnswVectorsFormat" hnswMaxConnections="10" hnswBeamWidth="40"/><field name="vector" type="knn_vector" indexed="true" stored="true"/>`codecFormat`::+[%autowidth,frame=none]|===-|Optional |Default: `Lucene90HnswVectorsFormat`+|Optional |Default: `Lucene91HnswVectorsFormat`|===+(advanced) Specifies the knn codec implementation to use+-Accepted values: `Lucene90HnswVectorsFormat`.+Accepted values: `Lucene90HnswVectorsFormat`, `Lucene91HnswVectorsFormat` .Please note that the `codecFormat` accepted values may change in future releases.@@ -139,7 +139,7 @@ If you choose to customize the `codecFormat` in your schema, upgrading to a futu|Optional |Default: `16`|===+-(advanced) This parameter is specific for the `Lucene90HnswVectorsFormat` codec format:+(advanced) This parameter is specific for the `Lucene90HnswVectorsFormat` and `Lucene91HnswVectorsFormat` codec formats:+Controls how many of the nearest neighbor candidates are connected to the new node.+@@ -155,7 +155,7 @@ Any integer.|Optional |Default: `100`|===+-(advanced) This parameter is specific for the `Lucene90HnswVectorsFormat` codec format:+(advanced) This parameter is specific for the `Lucene90HnswVectorsFormat` and `Lucene91HnswVectorsFormat` codec formats:+It is the number of nearest neighbor candidates to track while searching the graph for each newly inserted node.+diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adocindex 976e6602703..6a08dda62e4 100644--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc@@ -64,6 +64,10 @@ It is always strongly recommended that you fully reindex your documents after aIn Solr 8, it was possible to add docValues to a schema without re-indexing via `UninvertDocValuesMergePolicy`, an advanced/expert utility.Due to changes in Lucene 9, that isn't possible any more.+== Solr 9.1+=== Querying and Indexing+* Added Lucene91HnswVectorsFormat codec for DenseVectorField. In order to use the new codec, reindex is necessary.+== Solr 9.0=== Querying and Indexing* xref:query-guide:dense-vector-search.adoc[Dense Vector "Neural" Search] through `DenseVectorField` fieldType and K-Nearest-Neighbor (KNN) Query Parser.diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.javaindex 26bce47d58c..cc9d037a232 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java@@ -37,7 +37,7 @@ import java.util.List;import java.util.Locale;import java.util.Map;import java.util.Random;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;import org.apache.solr.client.solrj.embedded.SolrExampleStreamingHttp2Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.javaindex 369dc34b851..b9ed6f27336 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java@@ -28,8 +28,8 @@ import java.util.Set;import java.util.concurrent.TimeUnit;import junit.framework.Assert;import org.apache.commons.io.FileUtils;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.lucene.util.IOUtils;-import org.apache.lucene.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.javaindex 9229c85a4cc..07abc947cdb 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java@@ -29,8 +29,8 @@ import java.util.concurrent.TimeUnit;import junit.framework.Assert;import org.apache.commons.io.FileUtils;import org.apache.http.impl.client.CloseableHttpClient;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.lucene.util.IOUtils;-import org.apache.lucene.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.javaindex 439a62250b2..aada4bb2a0a 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java@@ -19,7 +19,7 @@ package org.apache.solr.client.solrj.embedded;import java.util.ArrayList;import java.util.List;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.javaindex f91fb90962f..5da299ae4e7 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java@@ -18,7 +18,7 @@ package org.apache.solr.client.solrj.embedded;import java.util.ArrayList;import java.util.List;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.javaindex 8d86e7222c0..50a2f761e37 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java@@ -20,7 +20,7 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.EnumSet;import java.util.List;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrExampleTests;import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientMultiConstructorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientMultiConstructorTest.javaindex 2eb6b4a00a6..8962d0f9f9a 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientMultiConstructorTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientMultiConstructorTest.java@@ -22,7 +22,7 @@ import java.util.Collection;import java.util.LinkedHashSet;import java.util.List;import java.util.Optional;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.javaindex cd023603aa6..1b27860fded 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java@@ -38,8 +38,8 @@ import java.util.Optional;import java.util.Set;import java.util.concurrent.TimeoutException;import org.apache.http.impl.client.CloseableHttpClient;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.javaindex 43a6cce0a44..84c315637f3 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java@@ -22,7 +22,7 @@ import java.util.Collection;import java.util.LinkedHashSet;import java.util.List;import java.util.Optional;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.javaindex c4036a42c74..f01c5346cd4 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java@@ -38,8 +38,8 @@ import java.util.Optional;import java.util.Set;import java.util.concurrent.TimeoutException;import org.apache.http.impl.client.CloseableHttpClient;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.javaindex a0b4d01e093..7815c0e84ee 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java@@ -34,7 +34,7 @@ import org.apache.http.conn.ssl.SSLConnectionSocketFactory;import org.apache.http.entity.ByteArrayEntity;import org.apache.http.entity.InputStreamEntity;import org.apache.http.entity.StringEntity;-import org.apache.lucene.util.TestRuleRestoreSystemProperties;+import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;import org.apache.solr.SolrTestCase;import org.apache.solr.client.solrj.impl.HttpClientUtil.SocketFactoryRegistryProvider;import org.junit.After;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBSolrClientTest.javaindex 06604b89ab4..a8cb94f23eb 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBSolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBSolrClientTest.java@@ -25,7 +25,7 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.HashMap;import java.util.List;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.common.params.CommonParams;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.javaindex 30335dfb9fe..6b95f4663cf 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java@@ -21,8 +21,8 @@ import java.util.List;import java.util.Map;import java.util.Set;import java.util.function.Supplier;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCase;import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorDay;import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorDayOfQuarter;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.javaindex a9114cc3d65..6b3c5a52a67 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java@@ -26,8 +26,8 @@ import java.util.Collections;import java.util.HashSet;import java.util.List;import java.util.Set;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpSolrClient;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.javaindex 5a0bd7aaf68..5a669611359 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java@@ -22,7 +22,7 @@ import java.util.ArrayList;import java.util.HashSet;import java.util.List;import java.util.Set;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.stream.StreamContext;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.javaindex 2db94475ada..d791574d3f2 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java@@ -32,8 +32,8 @@ import java.util.Properties;import java.util.Set;import java.util.SortedSet;import java.util.TreeSet;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.javaindex 0d918f125f7..d748a642bf2 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java@@ -27,7 +27,7 @@ import java.util.ArrayList;import java.util.HashMap;import java.util.List;import java.util.Locale;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4.SuppressPointFields;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.javaindex a5e86dc9e79..623e4da003b 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java@@ -25,8 +25,8 @@ import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.Set;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.javaindex 6f07960af5c..67d73f21ce3 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java@@ -35,7 +35,7 @@ import org.apache.commons.math3.distribution.NormalDistribution;import org.apache.commons.math3.random.JDKRandomGenerator;import org.apache.commons.math3.random.RandomGenerator;import org.apache.commons.math3.util.Precision;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.io.SolrClientCache;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.javaindex 279a3b06fc0..2cfb22ed2b5 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java@@ -21,8 +21,8 @@ import java.util.ArrayList;import java.util.List;import java.util.Locale;import java.util.Map;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.eval.AddEvaluator;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.javaindex 9e569adc8f3..b67bc9addca 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java@@ -26,8 +26,8 @@ import java.util.HashMap;import java.util.List;import java.util.Locale;import java.util.Map;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.javaindex ac56e575103..a478bc46aa3 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java@@ -30,8 +30,8 @@ import java.util.Map;import java.util.stream.Collectors;import java.util.stream.IntStream;import java.util.zip.GZIPOutputStream;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.javaindex 1f2f45812cb..a4621087dd9 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java@@ -29,7 +29,7 @@ import java.util.List;import java.util.Locale;import java.util.Map;import java.util.Set;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.javaindex 55bce0984f8..17006fcad9c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java@@ -28,7 +28,7 @@ import java.nio.file.Path;import java.nio.file.Paths;import java.util.Collection;import org.apache.commons.io.FileUtils;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingEmbeddedTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingEmbeddedTest.javaindex 03bb8b0ca77..4c3f5dd5086 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingEmbeddedTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingEmbeddedTest.java@@ -23,7 +23,7 @@ import java.io.Writer;import java.util.List;import java.util.Properties;import org.apache.commons.io.FileUtils;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.EmbeddedSolrServerTestBase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.javaindex a938523c3ae..80810e1c723 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java@@ -27,7 +27,7 @@ import java.util.Date;import java.util.List;import java.util.Map;import junit.framework.Assert;-import org.apache.lucene.util.TestRuleLimitSysouts.Limit;+import org.apache.lucene.tests.util.TestRuleLimitSysouts.Limit;import org.apache.solr.SolrTestCase;import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.common.SolrDocumentList;diff --git a/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.java b/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.javaindex 5a4ed3d8dd9..da6cac631ce 100644--- a/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.java+++ b/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.java@@ -17,7 +17,7 @@package org.apache.solr.common;import java.util.EnumSet;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.common.ToleratedUpdateError.CmdType;import org.apache.solr.common.util.SimpleOrderedMap;diff --git a/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java b/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.javaindex d8a16b0978d..0202e94f15a 100644--- a/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java+++ b/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java@@ -24,7 +24,7 @@ import java.lang.invoke.MethodHandles;import java.util.Collections;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicBoolean;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.javaindex e9f1b32605c..6f4cf84e9a3 100644--- a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java+++ b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java@@ -31,7 +31,7 @@ import java.util.List;import java.util.Map;import java.util.Random;import org.apache.commons.io.IOUtils;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.EnumFieldValue;import org.apache.solr.common.SolrDocument;diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.javaindex 08bc1a2ef8d..d8982b75351 100644--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java@@ -46,8 +46,8 @@ import java.util.concurrent.atomic.AtomicInteger;import javax.servlet.Filter;import junit.framework.Assert;import org.apache.commons.io.FileUtils;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.Constants;-import org.apache.lucene.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.javaindex d96f6974c7f..7105ac68a6d 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java@@ -28,7 +28,7 @@ import java.nio.file.Path;import java.util.Properties;import java.util.SortedMap;import org.apache.commons.io.file.PathUtils;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.javaindex ea72ebe2fae..4d7a02507db 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java@@ -25,9 +25,9 @@ import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;import java.io.File;import java.lang.invoke.MethodHandles;import java.util.regex.Pattern;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.QuickPatchThreadsFilter;-import org.apache.lucene.util.VerifyTestClassNamingConvention;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.QuickPatchThreadsFilter;+import org.apache.lucene.tests.util.VerifyTestClassNamingConvention;import org.apache.solr.common.util.ObjectReleaseTracker;import org.apache.solr.servlet.SolrDispatchFilter;import org.apache.solr.util.ExternalPaths;diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.javaindex 09ced75588b..669846579f3 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java@@ -84,13 +84,13 @@ import javax.xml.xpath.XPathExpressionException;import org.apache.commons.io.IOUtils;import org.apache.http.client.HttpClient;import org.apache.logging.log4j.Level;-import org.apache.lucene.analysis.MockAnalyzer;-import org.apache.lucene.analysis.MockTokenizer;import org.apache.lucene.index.IndexWriterConfig;+import org.apache.lucene.tests.analysis.MockAnalyzer;+import org.apache.lucene.tests.analysis.MockTokenizer;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems;+import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks;+import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.Constants;-import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems;-import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;-import org.apache.lucene.util.TestUtil;import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java b/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.javaindex 95438755d0e..193674c7aed 100644--- a/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java+++ b/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java@@ -19,7 +19,7 @@ package org.apache.solr.analysis;import java.io.Reader;import java.util.Map;import org.apache.lucene.analysis.CharFilterFactory;-import org.apache.lucene.analysis.MockCharFilter;+import org.apache.lucene.tests.analysis.MockCharFilter;/** Factory for {@link MockCharFilter} for testing purposes. */public class MockCharFilterFactory extends CharFilterFactory {diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.java b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.javaindex afe91bd12ee..e06ee53935e 100644--- a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.java+++ b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.java@@ -18,9 +18,9 @@ package org.apache.solr.analysis;import java.util.Arrays;import java.util.Map;-import org.apache.lucene.analysis.MockTokenFilter;import org.apache.lucene.analysis.TokenFilterFactory;import org.apache.lucene.analysis.TokenStream;+import org.apache.lucene.tests.analysis.MockTokenFilter;import org.apache.lucene.util.automaton.CharacterRunAutomaton;import org.apache.lucene.util.automaton.RegExp;diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.javaindex 304ac825d1c..137e459be88 100644--- a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java+++ b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java@@ -18,8 +18,8 @@ package org.apache.solr.analysis;import java.util.Arrays;import java.util.Map;-import org.apache.lucene.analysis.MockTokenizer;import org.apache.lucene.analysis.TokenizerFactory;+import org.apache.lucene.tests.analysis.MockTokenizer;import org.apache.lucene.util.AttributeFactory;import org.apache.lucene.util.automaton.CharacterRunAutomaton;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.javaindex 371281d534a..d94d994a5be 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java@@ -19,8 +19,8 @@ package org.apache.solr.cloud;import java.nio.file.Files;import java.nio.file.Path;import java.util.concurrent.TimeUnit;-import org.apache.lucene.mockfile.FilterPath;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.mockfile.FilterPath;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.javaindex b607e063da9..3f04a162bca 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicInteger;import java.util.function.Consumer;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.javaindex 348d8a4de5c..d3b685ae692 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.java@@ -20,7 +20,7 @@ import java.lang.invoke.MethodHandles;import java.util.ArrayList;import java.util.List;import java.util.concurrent.TimeUnit;-import org.apache.lucene.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.javaindex 25babc2ed57..e0f2e6d1fd1 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java@@ -29,7 +29,7 @@ import java.util.concurrent.SynchronousQueue;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import java.util.regex.Pattern;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.cloud.AbstractFullDistribZkTestBase.CloudJettyRunner;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java b/solr/test-framework/src/java/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.javaindex 5226ecf5170..64b62d60ed8 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java@@ -23,7 +23,7 @@ import java.util.List;import java.util.Set;import java.util.concurrent.atomic.AtomicInteger;import org.apache.http.client.HttpClient;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.javaindex 5cb076e0dcc..731c35c0230 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java@@ -52,7 +52,7 @@ import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicReference;import java.util.function.Consumer;import javax.servlet.Filter;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.javaindex 16111771a75..9c3e1cac5f1 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java@@ -29,7 +29,7 @@ import java.util.Set;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicReference;import java.util.function.Predicate;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java b/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.javaindex ec590989c3f..ca0d40f8065 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java@@ -19,7 +19,7 @@ package org.apache.solr.cloud;import java.lang.invoke.MethodHandles;import java.util.Random;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.javaindex 235b10c06dd..9f321df99aa 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java@@ -28,7 +28,7 @@ import java.util.Map;import java.util.Properties;import java.util.Random;import java.util.TreeMap;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.javaindex d56895fa174..cc51a857e5f 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java@@ -41,8 +41,8 @@ import java.util.concurrent.TimeUnit;import javax.management.MBeanServer;import javax.management.MBeanServerFactory;import javax.management.ObjectName;-import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase.Slow;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java b/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.javaindex 643561abbd5..272b93f8e1e 100644--- a/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java+++ b/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java@@ -20,11 +20,11 @@ import java.io.File;import java.io.IOException;import org.apache.lucene.store.Directory;import org.apache.lucene.store.LockFactory;-import org.apache.lucene.store.MockDirectoryWrapper;import org.apache.lucene.store.NRTCachingDirectory;import org.apache.lucene.store.NoLockFactory;import org.apache.lucene.store.TrackingDirectoryWrapper;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.store.MockDirectoryWrapper;+import org.apache.lucene.tests.util.LuceneTestCase;/** Opens a directory with {@link LuceneTestCase#newDirectory()} */public class MockDirectoryFactory extends EphemeralDirectoryFactory {diff --git a/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java b/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.javaindex 1265b4606a9..b8e1684becf 100644--- a/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java+++ b/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java@@ -21,10 +21,10 @@ import java.io.IOException;import java.nio.file.Path;import org.apache.lucene.store.Directory;import org.apache.lucene.store.LockFactory;-import org.apache.lucene.store.MockDirectoryWrapper;import org.apache.lucene.store.NRTCachingDirectory;import org.apache.lucene.store.TrackingDirectoryWrapper;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.store.MockDirectoryWrapper;+import org.apache.lucene.tests.util.LuceneTestCase;/** Opens a directory with {@link LuceneTestCase#newFSDirectory(Path)} */public class MockFSDirectoryFactory extends StandardDirectoryFactory {diff --git a/solr/test-framework/src/java/org/apache/solr/handler/BackupRestoreUtils.java b/solr/test-framework/src/java/org/apache/solr/handler/BackupRestoreUtils.javaindex 79119b61dd8..0b79325eb9c 100644--- a/solr/test-framework/src/java/org/apache/solr/handler/BackupRestoreUtils.java+++ b/solr/test-framework/src/java/org/apache/solr/handler/BackupRestoreUtils.java@@ -26,7 +26,7 @@ import java.util.List;import java.util.Map;import java.util.Random;import org.apache.commons.io.IOUtils;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/test-framework/src/java/org/apache/solr/handler/BackupStatusChecker.java b/solr/test-framework/src/java/org/apache/solr/handler/BackupStatusChecker.javaindex 05c7a8b26fa..3a9a2b57b16 100644--- a/solr/test-framework/src/java/org/apache/solr/handler/BackupStatusChecker.java+++ b/solr/test-framework/src/java/org/apache/solr/handler/BackupStatusChecker.java@@ -16,9 +16,9 @@*/package org.apache.solr.handler;-import static org.apache.lucene.util.LuceneTestCase.assertNotNull;-import static org.apache.lucene.util.LuceneTestCase.assertNull;-import static org.apache.lucene.util.LuceneTestCase.assertTrue;+import static org.apache.lucene.tests.util.LuceneTestCase.assertNotNull;+import static org.apache.lucene.tests.util.LuceneTestCase.assertNull;+import static org.apache.lucene.tests.util.LuceneTestCase.assertTrue;import static org.apache.solr.SolrTestCaseJ4.params;import java.lang.invoke.MethodHandles;diff --git a/solr/test-framework/src/java/org/apache/solr/schema/SortableBinaryField.java b/solr/test-framework/src/java/org/apache/solr/schema/SortableBinaryField.javaindex a49e66e53d3..8a6e366932c 100644--- a/solr/test-framework/src/java/org/apache/solr/schema/SortableBinaryField.java+++ b/solr/test-framework/src/java/org/apache/solr/schema/SortableBinaryField.java@@ -73,7 +73,7 @@ public class SortableBinaryField extends BinaryField {public FieldComparator.TermOrdValComparator newComparator(final String fieldname,final int numHits,- final int sortPos,+ final boolean enableSkipping,final boolean reversed) {return new FieldComparator.TermOrdValComparator(numHits, fieldname);}diff --git a/solr/test-framework/src/java/org/apache/solr/util/RandomForceMergePolicy.java b/solr/test-framework/src/java/org/apache/solr/util/RandomForceMergePolicy.javaindex f100610880b..1e9a8c2949a 100755--- a/solr/test-framework/src/java/org/apache/solr/util/RandomForceMergePolicy.java+++ b/solr/test-framework/src/java/org/apache/solr/util/RandomForceMergePolicy.java@@ -16,9 +16,9 @@*/package org.apache.solr.util;-import org.apache.lucene.index.ForceMergePolicy;import org.apache.lucene.index.MergePolicy;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.index.ForceMergePolicy;+import org.apache.lucene.tests.util.LuceneTestCase;/*** A {@link MergePolicy} with a no-arg constructor that proxies to a {@link ForceMergePolicy}diff --git a/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java b/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.javaindex 344add2aa56..e1d2a61d3fd 100644--- a/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java+++ b/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java@@ -19,7 +19,7 @@ package org.apache.solr.util;import java.lang.invoke.MethodHandles;import org.apache.lucene.index.FilterMergePolicy;import org.apache.lucene.index.MergePolicy;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/solr/test-framework/src/java/org/apache/solr/util/RandomizeSSL.java b/solr/test-framework/src/java/org/apache/solr/util/RandomizeSSL.javaindex c4afb5b5be9..8ac08587a50 100644--- a/solr/test-framework/src/java/org/apache/solr/util/RandomizeSSL.java+++ b/solr/test-framework/src/java/org/apache/solr/util/RandomizeSSL.java@@ -22,8 +22,8 @@ import java.lang.annotation.Inherited;import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import org.apache.lucene.util.LuceneTestCase;-import org.apache.lucene.util.TestUtil;+import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;/**diff --git a/solr/test-framework/src/test/org/apache/solr/cloud/MiniSolrCloudClusterTest.java b/solr/test-framework/src/test/org/apache/solr/cloud/MiniSolrCloudClusterTest.javaindex 0c0bb5317d5..c4fc1ec5150 100644--- a/solr/test-framework/src/test/org/apache/solr/cloud/MiniSolrCloudClusterTest.java+++ b/solr/test-framework/src/test/org/apache/solr/cloud/MiniSolrCloudClusterTest.java@@ -24,7 +24,7 @@ import java.nio.file.Path;import java.nio.file.Paths;import java.util.Properties;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.lucene.util.LuceneTestCase;+import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;diff --git a/versions.lock b/versions.lockindex 11d72336dd8..a3897445be5 100644--- a/versions.lock+++ b/versions.lock@@ -52,7 +52,7 @@ com.googlecode.juniversalchardet:juniversalchardet:1.0.3 (1 constraints: 5b0ce40com.googlecode.plist:dd-plist:1.23 (1 constraints: 2f0c83f5)com.healthmarketscience.jackcess:jackcess:4.0.1 (1 constraints: 5c0cf101)com.healthmarketscience.jackcess:jackcess-encrypt:4.0.1 (1 constraints: 5c0cf101)-com.ibm.icu:icu4j:68.2 (1 constraints: b10f2c84)+com.ibm.icu:icu4j:70.1 (1 constraints: a90f1784)com.jayway.jsonpath:json-path:2.4.0 (2 constraints: 6512e02b)com.lmax:disruptor:3.4.2 (1 constraints: 0b050836)com.mchange:c3p0:0.9.5.5 (1 constraints: c80c571b)@@ -153,32 +153,32 @@ org.apache.logging.log4j:log4j-core:2.17.1 (4 constraints: 8739df28)org.apache.logging.log4j:log4j-layout-template-json:2.17.1 (1 constraints: 3d05453b)org.apache.logging.log4j:log4j-slf4j-impl:2.17.1 (1 constraints: 3d05453b)org.apache.logging.log4j:log4j-web:2.17.1 (1 constraints: 3d05453b)-org.apache.lucene:lucene-analysis-common:9.0.0 (10 constraints: ac9e842f)-org.apache.lucene:lucene-analysis-icu:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-analysis-kuromoji:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-analysis-morfologik:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-analysis-nori:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-analysis-opennlp:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-analysis-phonetic:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-analysis-smartcn:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-analysis-stempel:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-backward-codecs:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-classification:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-codecs:9.0.0 (3 constraints: 93251a41)-org.apache.lucene:lucene-core:9.0.0 (26 constraints: 938f314b)-org.apache.lucene:lucene-expressions:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-grouping:9.0.0 (2 constraints: dc1516e3)-org.apache.lucene:lucene-highlighter:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-join:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-memory:9.0.0 (1 constraints: 950f9f83)-org.apache.lucene:lucene-misc:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-queries:9.0.0 (6 constraints: 9c51346c)-org.apache.lucene:lucene-queryparser:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-sandbox:9.0.0 (2 constraints: d31401a0)-org.apache.lucene:lucene-spatial-extras:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-spatial3d:9.0.0 (1 constraints: b810a7b9)-org.apache.lucene:lucene-suggest:9.0.0 (1 constraints: 0b051836)-org.apache.lucene:lucene-test-framework:9.0.0 (1 constraints: 0b051836)+org.apache.lucene:lucene-analysis-common:9.1.0 (10 constraints: b69e1c38)+org.apache.lucene:lucene-analysis-icu:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-analysis-kuromoji:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-analysis-morfologik:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-analysis-nori:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-analysis-opennlp:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-analysis-phonetic:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-analysis-smartcn:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-analysis-stempel:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-backward-codecs:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-classification:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-codecs:9.1.0 (3 constraints: 9625b041)+org.apache.lucene:lucene-core:9.1.0 (26 constraints: ad8f7e83)+org.apache.lucene:lucene-expressions:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-grouping:9.1.0 (2 constraints: de154ce3)+org.apache.lucene:lucene-highlighter:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-join:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-memory:9.1.0 (1 constraints: 960fa283)+org.apache.lucene:lucene-misc:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-queries:9.1.0 (6 constraints: a251d26e)+org.apache.lucene:lucene-queryparser:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-sandbox:9.1.0 (2 constraints: d51434a0)+org.apache.lucene:lucene-spatial-extras:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-spatial3d:9.1.0 (1 constraints: b910aab9)+org.apache.lucene:lucene-suggest:9.1.0 (1 constraints: 0c051b36)+org.apache.lucene:lucene-test-framework:9.1.0 (1 constraints: 0c051b36)org.apache.opennlp:opennlp-tools:1.9.4 (3 constraints: 0823a25b)org.apache.pdfbox:fontbox:2.0.25 (1 constraints: 170b71d8)org.apache.pdfbox:jbig2-imageio:3.0.3 (1 constraints: 5d0cee01)@@ -211,9 +211,9 @@ org.bouncycastle:bcprov-jdk15on:1.70 (4 constraints: 1f34ee12)org.bouncycastle:bcutil-jdk15on:1.70 (2 constraints: 961ad454)org.brotli:dec:0.1.2 (1 constraints: 5a0ce101)org.carrot2:carrot2-core:4.0.4 (1 constraints: 0a050336)-org.carrot2:morfologik-fsa:2.1.5 (1 constraints: d70d9836)-org.carrot2:morfologik-polish:2.1.5 (1 constraints: cf12501e)-org.carrot2:morfologik-stemming:2.1.5 (2 constraints: d01f1300)+org.carrot2:morfologik-fsa:2.1.8 (1 constraints: da0d9b36)+org.carrot2:morfologik-polish:2.1.8 (1 constraints: d212531e)+org.carrot2:morfologik-stemming:2.1.8 (2 constraints: d61f8b00)org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)org.checkerframework:checker-qual:3.20.0 (5 constraints: 514652ea)org.codehaus.janino:commons-compiler:3.0.11 (2 constraints: 81192719)@@ -257,8 +257,10 @@ org.junit:junit-bom:5.8.2 (1 constraints: c8116cde)org.locationtech.spatial4j:spatial4j:0.8 (1 constraints: 59105498)org.opengis:geoapi:3.0.1 (7 constraints: 1361d046)org.openjdk.jmh:jmh-core:1.32 (1 constraints: da04f730)-org.ow2.asm:asm:9.2 (4 constraints: 4931393a)+org.ow2.asm:asm:9.2 (5 constraints: e03984f1)+org.ow2.asm:asm-analysis:7.2 (1 constraints: e409d9a5)org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267)+org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530)org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)org.slf4j:jcl-over-slf4j:1.7.36 (3 constraints: 05188eb8)diff --git a/versions.props b/versions.propsindex 945fc302d1c..64a689472ec 100644--- a/versions.props+++ b/versions.props@@ -48,7 +48,7 @@ org.apache.httpcomponents:httpcore=4.4.15org.apache.httpcomponents:httpmime=4.5.13org.apache.kerby:*=1.0.1org.apache.logging.log4j:*=2.17.1-org.apache.lucene:*=9.0.0+org.apache.lucene:*=9.1.0org.apache.opennlp:opennlp-tools=1.9.4org.apache.tika:*=1.28.1org.apache.zookeeper:*=3.7.0