Apache Solr open-source search software
SOLR-16158: Remove server jars from solr-core (#1179)
Houston Putmana18f5b3c7cf2
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 347efa33a06..4d1cb9b1fa9 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -74,6 +74,12 @@ Improvements* SOLR-16420: Introducing `{!mlt_content}foo bar` to cover existing `/mlt` handler functionality for SolrCloud. (Mikhail Khludnev)+* SOLR-16158: Certain Jetty "server" jars (jetty-util, jetty-io, etc.) are no longer duplicated between server/lib and WEB-INF/lib. All shared jars now live in server/lib/ext.+ By default, Jetty does not allow these jars to be shared by the Jetty server and the web-app (Solr).+ In order to accomplish this, explicit exclusions have been added to server/contexts/solr-jetty-context.xml that allow these "server" jars to be shared.+ Solr Core also no longer contains the JettySolrRunner (now living in the testing framework), removing the need for Jetty Server dependencies in solr-core.+ (Houston Putman)+Optimizations---------------------diff --git a/solr/benchmark/build.gradle b/solr/benchmark/build.gradleindex 6a651a4309e..be99ea3ee03 100644--- a/solr/benchmark/build.gradle+++ b/solr/benchmark/build.gradle@@ -45,7 +45,6 @@ task echoCp {dependencies {implementation project(':solr:test-framework')- implementation project(':solr:core')implementation project(':solr:solrj')implementation 'org.apache.lucene:lucene-core'diff --git a/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java b/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.javaindex 80590c84e40..c8a8eee4058 100755--- a/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java+++ b/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java@@ -38,7 +38,6 @@ import java.util.concurrent.TimeUnit;import org.apache.commons.io.output.NullPrintStream;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.Http2SolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -50,6 +49,7 @@ import org.apache.solr.common.util.IOUtils;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SolrNamedThreadFactory;import org.apache.solr.common.util.SuppressForbidden;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.SolrTestNonSecureRandomProvider;import org.openjdk.jmh.annotations.Level;import org.openjdk.jmh.annotations.Scope;diff --git a/solr/core/build.gradle b/solr/core/build.gradleindex 361dcde3383..1031ecf1740 100644--- a/solr/core/build.gradle+++ b/solr/core/build.gradle@@ -23,18 +23,6 @@ apply plugin: 'java-library'description = 'Apache Solr Core'-configurations {- // jettyClientImplementation should be used for all jetty client libraries used by the Solr Server.- // These libraries must be available in the WEB-INF/lib, as well as server/lib.- // Jetty does not allow for these specific libraries to be accessed from the webapp, if they only live in server/lib.- // Note: because of SolrEmbedded, this is not all jetty libraries.- // (Solr Core requires the jetty server libraries because of embedded Solr, however the webapp does not use these)- jettyClientImplementation- implementation {- extendsFrom jettyClientImplementation- }-}-resolve {classpath = sourceSets.main.runtimeClasspathoutputDir = file("build/generated/openapi")@@ -78,21 +66,6 @@ dependencies {implementation 'io.dropwizard.metrics:metrics-jmx'implementation 'io.dropwizard.metrics:metrics-jvm'- // Jetty (both for client and server, which is only used by EmbeddedSolrServer)- implementation 'org.eclipse.jetty:jetty-alpn-server'- runtimeOnly('org.eclipse.jetty:jetty-alpn-java-server', {- exclude group: "org.eclipse.jetty.alpn", module: "alpn-api"- })- jettyClientImplementation('org.eclipse.jetty:jetty-http')- jettyClientImplementation('org.eclipse.jetty:jetty-io')- implementation 'org.eclipse.jetty:jetty-rewrite'- implementation 'org.eclipse.jetty:jetty-server'- implementation 'org.eclipse.jetty:jetty-servlet'- jettyClientImplementation('org.eclipse.jetty:jetty-util')-- jettyClientImplementation('org.eclipse.jetty.http2:http2-common')- implementation 'org.eclipse.jetty.http2:http2-server'-implementation('org.glassfish.jersey.containers:jersey-container-jetty-http', {exclude group: "org.eclipse.jetty", module: "jetty-continuation"})@@ -152,9 +125,10 @@ dependencies {implementation 'org.apache.httpcomponents:httpclient'implementation 'org.apache.httpcomponents:httpcore'- compileOnlyApi 'org.eclipse.jetty.toolchain:jetty-servlet-api'-implementation 'org.eclipse.jetty:jetty-client'+ implementation 'org.eclipse.jetty:jetty-http'+ implementation 'org.eclipse.jetty:jetty-io'+ implementation 'org.eclipse.jetty.toolchain:jetty-servlet-api'// ZooKeeperimplementation('org.apache.zookeeper:zookeeper', {@@ -208,6 +182,9 @@ dependencies {testImplementation 'org.apache.lucene:lucene-test-framework'+ testImplementation 'org.eclipse.jetty:jetty-server'+ testImplementation 'org.eclipse.jetty:jetty-servlet'+testImplementation 'com.carrotsearch.randomizedtesting:randomizedtesting-runner'testImplementation 'junit:junit'testImplementation 'org.hamcrest:hamcrest'diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.javaindex 6a3f0f9176c..7cf5b741dd3 100644--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java@@ -62,7 +62,6 @@ import org.apache.solr.core.SolrCore;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.request.SolrQueryRequestBase;import org.apache.solr.util.RTimerTree;-import org.eclipse.jetty.server.Request;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -619,9 +618,10 @@ public class SolrRequestParsers {throw new SolrException(ErrorCode.BAD_REQUEST, "Not multipart content! " + req.getContentType());}- // Magic way to tell Jetty dynamically we want multi-part processing. "Request" here is a- // Jetty class- req.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, multipartConfigElement);+ // Magic way to tell Jetty dynamically we want multi-part processing.+ // This is taken from:+ // https://github.com/eclipse/jetty.project/blob/jetty-10.0.12/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java#L144+ req.setAttribute("org.eclipse.jetty.multipartConfig", multipartConfigElement);MultiMapSolrParams params = parseQueryString(req.getQueryString());diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.javaindex a00c321f92a..9a407ab2337 100644--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java@@ -36,7 +36,6 @@ import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.response.FacetField;import org.apache.solr.client.solrj.response.FieldStatsInfo;@@ -52,6 +51,7 @@ import org.apache.solr.common.params.ShardParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.params.StatsParams;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.component.ShardResponse;import org.apache.solr.handler.component.StatsComponentTest.StatSetCombinations;import org.apache.solr.handler.component.StatsField.Stat;diff --git a/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java b/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.javaindex c84297d8396..a5bdd915ce1 100644--- a/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java+++ b/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java@@ -25,10 +25,10 @@ import java.nio.file.Files;import java.util.Properties;import org.apache.commons.io.FileUtils;import org.apache.lucene.util.IOUtils;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.BeforeClass;/**diff --git a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.javaindex 50cdd81b7b2..4f9dc745c2f 100644--- a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java@@ -38,7 +38,6 @@ import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SolrCloudManager;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ClusterStateProvider;@@ -57,6 +56,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.TimeSource;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TimeOut;import org.apache.zookeeper.KeeperException;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java b/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.javaindex 69c7c0f4eea..7fd80c33670 100644--- a/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java@@ -22,11 +22,11 @@ import java.util.Date;import java.util.Locale;import java.util.concurrent.TimeUnit;import org.apache.commons.io.FileUtils;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.SnapShooter;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.javaindex 561ecfb1d96..a83a6e7fec6 100644--- a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java@@ -31,7 +31,6 @@ import java.util.Map;import java.util.concurrent.TimeUnit;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;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;@@ -39,6 +38,7 @@ import org.apache.solr.cloud.MiniSolrCloudCluster.JettySolrRunnerWithMetrics;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.component.FacetComponent;import org.apache.solr.handler.component.QueryComponent;import org.apache.solr.response.SolrQueryResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java b/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.javaindex a238413039d..b2164dc04fa 100644--- a/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java@@ -18,13 +18,13 @@ package org.apache.solr.cloud;import java.util.Map;import java.util.Set;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.ClusterState;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.javaindex fbfe0778f69..7effdefa65b 100644--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java@@ -41,7 +41,6 @@ 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;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;@@ -66,6 +65,7 @@ import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.RetryUtil;import org.apache.solr.common.util.TimeSource;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TimeOut;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.javaindex f869418473d..ea7c7dbcba1 100644--- a/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java@@ -20,7 +20,6 @@ import java.lang.invoke.MethodHandles;import java.nio.file.Files;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.common.cloud.DocCollection;@@ -29,6 +28,7 @@ import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.CoreDescriptor;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.FileUtils;import org.apache.solr.util.TimeOut;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.javaindex e12f9b836a1..25de5f98279 100644--- a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java@@ -29,7 +29,6 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest.Create;import org.apache.solr.client.solrj.request.CoreStatus;@@ -45,6 +44,7 @@ import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.cloud.ZkStateReaderAccessor;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.ZkContainer;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TimeOut;import org.junit.After;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.javaindex ea4319a67a9..bec70654c65 100644--- a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java@@ -24,7 +24,6 @@ import java.util.List;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.SolrException;@@ -35,6 +34,7 @@ import org.apache.solr.common.cloud.Replica.State;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.TimeSource;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TimeOut;import org.junit.BeforeClass;import org.junit.Ignore;diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.javaindex ffd2df472fd..ec00cabd6c7 100644--- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java@@ -31,7 +31,6 @@ 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;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -49,6 +48,7 @@ import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.ExecutorUtil;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.javaindex 84048086eb1..c3eb5f9f338 100644--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java@@ -22,10 +22,10 @@ import java.util.List;import org.apache.http.NoHttpResponseException;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.RTimer;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.javaindex 1af5f6ca1be..517e63c4c4f 100644--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java@@ -38,7 +38,6 @@ import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;@@ -56,6 +55,7 @@ import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.update.UpdateLog;import org.apache.solr.util.RTimer;import org.apache.solr.util.TestInjection;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.javaindex 67868bd4b1b..4491476f030 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java@@ -21,10 +21,10 @@ import java.util.ArrayList;import java.util.List;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.ZkNodeProps;import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.javaindex 7701793129b..b67d90f4763 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java@@ -25,10 +25,10 @@ import java.util.concurrent.TimeUnit;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Test;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.javaindex 86bccffd73f..70b98586ddb 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java@@ -26,7 +26,6 @@ import org.apache.lucene.store.AlreadyClosedException;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient.RemoteSolrException;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -38,6 +37,7 @@ import org.apache.solr.common.cloud.ClusterStateUtil;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.Slice;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TestInjection;import org.hamcrest.MatcherAssert;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.javaindex e86bdf93e1d..146a05388e8 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java@@ -33,7 +33,6 @@ import org.apache.solr.JSONTestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -42,6 +41,7 @@ import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.ZkCoreNodeProps;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.AfterClass;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java b/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.javaindex b90554e625f..0849543b959 100644--- a/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java@@ -24,13 +24,13 @@ import java.util.ArrayList;import java.util.List;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.AfterClass;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.java b/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.javaindex 2cc9456c6fa..44877f9513c 100644--- a/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.java@@ -20,11 +20,11 @@ package org.apache.solr.cloud;import java.util.Collection;import java.util.Collections;import java.util.Map;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.response.V2Response;import org.apache.solr.core.NodeRoles;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.javaindex 21211623e18..8ebe618e660 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java@@ -26,9 +26,9 @@ import java.util.List;import java.util.Objects;import java.util.concurrent.TimeUnit;import java.util.function.Predicate;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.util.TimeSource;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TimeOut;import org.apache.zookeeper.KeeperException;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.javaindex 342fcb502d0..6cee0ed226e 100644--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java@@ -20,11 +20,11 @@ import java.io.File;import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TestInjection;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java b/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.javaindex 47f848bde5a..b764f6d6629 100644--- a/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java@@ -19,10 +19,10 @@ package org.apache.solr.cloud;import static org.hamcrest.core.StringContains.containsString;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;+import org.apache.solr.embedded.JettySolrRunner;import org.hamcrest.MatcherAssert;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.javaindex 6690e762ec9..727f433b1f9 100644--- a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java@@ -31,7 +31,6 @@ import java.util.Set;import java.util.stream.Collectors;import org.apache.commons.lang3.StringUtils;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;@@ -45,6 +44,7 @@ import org.apache.solr.common.params.CollectionParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.StrUtils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.metrics.MetricsMap;import org.apache.solr.metrics.SolrMetricManager;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.javaindex c02e81ef575..6f95e394fd9 100644--- a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java@@ -30,7 +30,6 @@ import org.apache.commons.lang3.StringUtils;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;@@ -41,6 +40,7 @@ import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.ZkCoreNodeProps;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Test;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.javaindex e79ce92c345..56262d44d6e 100644--- a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java@@ -25,8 +25,6 @@ import org.apache.commons.lang3.StringUtils;import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpClientUtil;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.common.cloud.DocCollection;@@ -36,6 +34,8 @@ import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.CollectionParams.CollectionAction;import org.apache.solr.common.params.MapSolrParams;import org.apache.solr.common.params.SolrParams;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.SSLTestConfig;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.java b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.javaindex e1e9c94cb64..a1985ea9483 100644--- a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.java@@ -18,9 +18,9 @@ package org.apache.solr.cloud;import java.io.File;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.Replica;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.javaindex 6722e1bfd32..cbb8df7d37f 100644--- a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java@@ -20,10 +20,10 @@ import java.lang.invoke.MethodHandles;import java.util.List;import java.util.Map;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.params.ShardParams;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.BeforeClass;import org.junit.Test;import org.slf4j.Logger;diff --git a/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java b/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.javaindex e9c2bf7e012..35fb6c39df2 100644--- a/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java@@ -28,7 +28,6 @@ import java.util.Optional;import java.util.Set;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.cloud.SolrCloudManager;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;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;@@ -44,6 +43,7 @@ import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.RetryUtil;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.logging.LogWatcher;import org.apache.solr.logging.LogWatcherConfig;import org.apache.solr.util.IdUtils;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.javaindex 0fa0a28e285..8f475e64541 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java@@ -22,7 +22,6 @@ import java.util.function.Function;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;@@ -31,6 +30,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.search.similarities.CustomSimilarityFactory;import org.apache.solr.search.stats.StatsCache;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.javaindex 464225e193d..aa3feb2a5f6 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java@@ -31,7 +31,6 @@ import org.apache.solr.JSONTestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -39,6 +38,7 @@ import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.ZkCoreNodeProps;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.Before;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.javaindex 515dfc3671a..2e531a7530d 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java@@ -22,7 +22,6 @@ import java.util.Arrays;import java.util.HashMap;import java.util.Map;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -37,6 +36,7 @@ import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.Before;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.javaindex 6de4be97b52..5551f46f208 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java@@ -26,7 +26,6 @@ import java.util.Map;import java.util.Random;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;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -34,6 +33,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.javaindex 519727f136d..885fa843764 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java@@ -28,7 +28,6 @@ import java.util.Random;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;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;@@ -39,6 +38,7 @@ import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.search.TestPseudoReturnFields;import org.junit.AfterClass;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.javaindex 3bbbf5d088b..0038351f706 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java@@ -30,7 +30,6 @@ import java.util.Map;import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;import org.apache.commons.io.IOUtils;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.QueryResponse;@@ -38,6 +37,7 @@ import org.apache.solr.common.cloud.ClusterStateUtil;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.metrics.SolrMetricManager;import org.apache.solr.update.UpdateLog;import org.apache.solr.update.UpdateShardHandler;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.javaindex 4eb595de125..1e86167f299 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java@@ -19,10 +19,10 @@ package org.apache.solr.cloud;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.cloud.Replica;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.javaindex 16ecdd73f01..62ab06dd98e 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java@@ -22,7 +22,6 @@ import java.util.Set;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicReference;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.QueryResponse;@@ -34,6 +33,7 @@ import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.core.SolrCore;import org.apache.solr.core.SolrEventListener;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.search.SolrIndexSearcher;import org.apache.solr.servlet.SolrDispatchFilter;import org.apache.solr.util.LogLevel;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDeleteCollectionOnDownNodes.java b/solr/core/src/test/org/apache/solr/cloud/TestDeleteCollectionOnDownNodes.javaindex 8e932d8f343..316c4ee03f2 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestDeleteCollectionOnDownNodes.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestDeleteCollectionOnDownNodes.java@@ -18,8 +18,8 @@package org.apache.solr.cloud;import java.util.concurrent.TimeUnit;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.Before;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.javaindex 66b893e545d..713e11c807c 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java@@ -20,11 +20,11 @@ import static org.hamcrest.CoreMatchers.is;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.params.ShardParams;+import org.apache.solr.embedded.JettySolrRunner;import org.hamcrest.MatcherAssert;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.javaindex 54e51841968..c6f64265de8 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java@@ -23,7 +23,6 @@ import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;@@ -33,6 +32,7 @@ import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.Slice;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.javaindex a93ee2fd171..384bd54f0d9 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java@@ -35,8 +35,6 @@ import org.apache.lucene.util.Constants;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.Http2SolrClient;import org.apache.solr.client.solrj.impl.HttpClientUtil;@@ -45,6 +43,8 @@ import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.CoreAdminParams.CoreAdminAction;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.SSLTestConfig;import org.junit.After;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java b/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.javaindex 12959741d59..0f89d8e0468 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java@@ -23,12 +23,12 @@ import java.lang.invoke.MethodHandles;import java.util.Set;import java.util.concurrent.TimeUnit;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.OnReconnect;import org.apache.solr.common.cloud.Replica;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.schema.ZkIndexSchemaReader;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.javaindex d8800115bff..cfb6358f00b 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.java@@ -18,10 +18,10 @@package org.apache.solr.cloud;import java.util.concurrent.TimeUnit;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.Replica;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TestInjection;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.javaindex 9fff0ca7dee..4bc91c74b0d 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java@@ -36,7 +36,6 @@ import org.apache.http.entity.StringEntity;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -53,6 +52,7 @@ import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.LogLevel;import org.apache.solr.util.TestInjection;import org.apache.solr.util.TimeOut;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.javaindex cfd0365bea6..caca86ff72f 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java@@ -32,7 +32,6 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;@@ -43,6 +42,7 @@ import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TestInjection;import org.apache.solr.util.TimeOut;import org.apache.zookeeper.KeeperException;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.javaindex 677ca916a5d..3950de3a43a 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java@@ -39,7 +39,6 @@ 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;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.NoOpResponseParser;@@ -55,6 +54,7 @@ import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.response.transform.DocTransformer;import org.apache.solr.response.transform.RawValueTransformerFactory;import org.apache.solr.response.transform.TransformerFactory;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.javaindex 2d093cd7e16..0681207747c 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java@@ -31,7 +31,6 @@ import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.overseer.OverseerAction;import org.apache.solr.common.cloud.ClusterState;@@ -41,6 +40,7 @@ import org.apache.solr.common.cloud.ZkNodeProps;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.metrics.SolrMetricManager;import org.junit.Test;import org.slf4j.Logger;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.javaindex 611718964a3..bf870ad0eb2 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java@@ -30,7 +30,6 @@ import java.util.TreeSet;import java.util.concurrent.ExecutorService;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;@@ -42,6 +41,7 @@ import org.apache.solr.common.params.CollectionParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.TimeSource;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TimeOut;import org.apache.zookeeper.KeeperException;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java b/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.javaindex 2c811f2ecb7..7a719262fe1 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java@@ -19,9 +19,9 @@ package org.apache.solr.cloud;import java.net.URL;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Test;@SuppressSSLdiff --git a/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.java b/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.javaindex 6c0541a678c..57a88d0ea58 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.java@@ -25,11 +25,11 @@ import java.util.SortedSet;import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.common.cloud.LiveNodesPredicate;import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.Before;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.javaindex d91261aa40f..4efeed687d7 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java@@ -33,7 +33,6 @@ import java.util.concurrent.atomic.AtomicLong;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;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -51,6 +50,7 @@ import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.IOUtils;import org.apache.solr.common.util.SolrNamedThreadFactory;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TestInjection;import org.junit.AfterClass;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.javaindex 5c29a30e800..3a62bbc72f0 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java@@ -31,13 +31,13 @@ import org.apache.solr.JSONTestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.RequestStatusState;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TestInjection;import org.junit.After;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.javaindex 84ee46e85ae..887f093c001 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java@@ -42,7 +42,6 @@ import org.apache.lucene.index.IndexWriter;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -64,6 +63,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.update.SolrIndexWriter;import org.apache.solr.util.RefCounted;import org.apache.solr.util.TestInjection;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.javaindex 023f304f7cf..aa49e49663c 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java@@ -26,7 +26,6 @@ import java.util.LinkedHashSet;import java.util.List;import java.util.Set;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -46,6 +45,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SimpleOrderedMap;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.Before;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.javaindex a2fac59809e..30a81241c2f 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java@@ -38,7 +38,6 @@ import java.util.Random;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;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -49,6 +48,7 @@ import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.SolrInputField;import org.apache.solr.common.params.SolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.Before;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java b/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.javaindex dbbb15ee056..66296cb2440 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java@@ -27,12 +27,12 @@ import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;import java.util.concurrent.TimeUnit;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.CollectionStatePredicate;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.SolrNamedThreadFactory;+import org.apache.solr.embedded.JettySolrRunner;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.javaindex ecdd4f30193..f4251ad9b6f 100644--- a/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java@@ -19,12 +19,12 @@ package org.apache.solr.cloud;import java.lang.invoke.MethodHandles;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.zookeeper.KeeperException;import org.junit.AfterClass;import org.junit.BeforeClass;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 eb44e2588df..5dfd69e3b02 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,12 +19,12 @@ package org.apache.solr.cloud.api.collections;import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.Slice;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Before;import org.junit.BeforeClass;import org.junit.Ignore;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 bd3b1d56cd1..690642804ee 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@@ -28,7 +28,6 @@ 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;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -40,6 +39,7 @@ import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.SolrNamedThreadFactory;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.Before;import org.junit.Test;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 b69bdb3c5cc..e3317c44120 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@@ -38,7 +38,6 @@ 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;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;@@ -67,6 +66,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.TimeSource;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.update.SolrIndexSplitter;import org.apache.solr.util.LogLevel;import org.apache.solr.util.TestInjection;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.javaindex b06ab9bbd66..7e33e65c6f7 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.java@@ -19,7 +19,6 @@ package org.apache.solr.cloud.api.collections;import java.util.Collection;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.cloud.OverseerCollectionConfigSetProcessor;@@ -29,6 +28,7 @@ import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.CoreDescriptor;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TimeOut;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.javaindex a29d7b75ef7..c95724bc9fd 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java@@ -29,7 +29,6 @@ import java.util.concurrent.atomic.LongAdder;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -52,6 +51,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.ShardParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.schema.IndexSchemaFactory;import org.apache.zookeeper.KeeperException;import org.junit.Test;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 ca10867f986..a9773b2037f 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,6 @@ import java.util.List;import java.util.Map;import java.util.Set;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -39,6 +38,7 @@ import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Test;/** Test of the Collections API with the MiniSolrCloudCluster. */diff --git a/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java b/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.javaindex 6f44d4da2f0..e46266f2f80 100644--- a/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java+++ b/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java@@ -30,7 +30,6 @@ import java.util.Map;import java.util.concurrent.CountDownLatch;import java.util.concurrent.Phaser;import java.util.concurrent.TimeUnit;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.request.beans.PluginMeta;@@ -41,6 +40,7 @@ import org.apache.solr.cluster.events.impl.DefaultClusterEventProducer;import org.apache.solr.cluster.events.impl.DelegatingClusterEventProducer;import org.apache.solr.common.cloud.ClusterProperties;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.LogLevel;import org.junit.After;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cluster/events/impl/CollectionsRepairEventListenerTest.java b/solr/core/src/test/org/apache/solr/cluster/events/impl/CollectionsRepairEventListenerTest.javaindex dc8f9e293af..64ed1005751 100644--- a/solr/core/src/test/org/apache/solr/cluster/events/impl/CollectionsRepairEventListenerTest.java+++ b/solr/core/src/test/org/apache/solr/cluster/events/impl/CollectionsRepairEventListenerTest.java@@ -23,7 +23,6 @@ import java.io.IOException;import java.util.Collections;import java.util.concurrent.CountDownLatch;import java.util.concurrent.TimeUnit;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.request.beans.PluginMeta;@@ -35,6 +34,7 @@ import org.apache.solr.cluster.events.ClusterEvent;import org.apache.solr.cluster.events.ClusterEventListener;import org.apache.solr.cluster.events.ClusterEventProducer;import org.apache.solr.core.CoreContainer;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.LogLevel;import org.junit.Before;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.javaindex b2a6aa8f2bf..d646b9e1785 100644--- a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java+++ b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java@@ -38,7 +38,6 @@ import org.apache.http.client.methods.HttpDelete;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient.RemoteExecutionException;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.V2Request;@@ -51,6 +50,7 @@ import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.StrUtils;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.packagemanager.PackageUtils;import org.apache.solr.util.LogLevel;import org.apache.zookeeper.server.ByteBufferInputStream;diff --git a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.javaindex a904a438ba4..111c7de0d70 100644--- a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java@@ -21,7 +21,6 @@ import java.io.IOException;import java.util.List;import org.apache.commons.io.FileUtils;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.SolrPing;@@ -30,6 +29,7 @@ import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.javaindex ab4743f189a..3b78b652a7c 100644--- a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java+++ b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java@@ -34,14 +34,14 @@ 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;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.FileUtils;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.javaindex 99590e1253a..f02c52f6703 100644--- a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java+++ b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java@@ -40,7 +40,6 @@ import org.apache.solr.api.ConfigurablePlugin;import org.apache.solr.api.ContainerPluginsRegistry;import org.apache.solr.api.EndPoint;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient.RemoteExecutionException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.V2Request;@@ -53,6 +52,7 @@ import org.apache.solr.common.annotation.JsonProperty;import org.apache.solr.common.util.ReflectMapWriter;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.SolrResourceLoader;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.filestore.PackageStoreAPI;import org.apache.solr.filestore.TestDistribPackageStore;import org.apache.solr.filestore.TestDistribPackageStore.Fetcher;diff --git a/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java b/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.javaindex 8d62803a9f5..1d3ecfeed62 100644--- a/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java+++ b/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java@@ -28,11 +28,11 @@ import java.io.IOException;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.HealthCheckRequest;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TestInjection;import org.junit.After;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.javaindex 780781bd02c..f01fad15f6e 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java@@ -51,7 +51,6 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -71,6 +70,7 @@ import org.apache.solr.core.CoreContainer;import org.apache.solr.core.SolrCore;import org.apache.solr.core.StandardDirectoryFactory;import org.apache.solr.core.snapshots.SolrSnapshotMetaDataManager;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.security.AllowListUrlChecker;import org.apache.solr.util.TestInjection;import org.apache.solr.util.TimeOut;diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.javaindex 4c9cc6b35d5..5555e3334f6 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java@@ -42,8 +42,8 @@ import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.FileUtils;import org.junit.After;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.javaindex 698dd398721..9b35aa29cf5 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java@@ -37,10 +37,10 @@ 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;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.LogLevel;import org.junit.After;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.javaindex e41df898ef5..ac3d82b1956 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java@@ -24,7 +24,6 @@ import java.util.Arrays;import java.util.List;import java.util.Map;import java.util.function.Predicate;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;@@ -35,6 +34,7 @@ import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.core.RequestParams;import org.apache.solr.core.TestSolrConfigHandler;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.RestTestHarness;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.javaindex 12d4dc72be9..96c4de7da50 100644--- a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java+++ b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java@@ -30,9 +30,9 @@ import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.common.SolrInputDocument;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.FileUtils;import org.junit.After;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.javaindex c0f12ebd5fd..0d1251d3265 100644--- a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java+++ b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java@@ -21,9 +21,9 @@ import java.io.File;import org.apache.commons.io.FileUtils;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Test;public class V2StandaloneTest extends SolrTestCaseJ4 {diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.javaindex e39bd902eea..aa44bc0f9dc 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java@@ -30,7 +30,6 @@ import org.apache.lucene.util.Constants;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.CoreStatus;@@ -42,6 +41,7 @@ import org.apache.solr.common.util.NamedList;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.CoreDescriptor;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.response.SolrQueryResponse;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.javaindex e71b54de943..4a01db8ff0f 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java@@ -27,7 +27,6 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;@@ -46,6 +45,7 @@ import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.core.CoreDescriptor;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.BeforeClass;import org.junit.Test;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 8b1ed0f59c4..6f5c156ce94 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@@ -32,7 +32,6 @@ 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.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -43,6 +42,7 @@ import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.search.SolrIndexSearcher;import org.apache.solr.util.RefCounted;import org.apache.solr.util.TimeOut;diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.javaindex f9faeb0ce95..0f22a624093 100644--- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java@@ -23,7 +23,6 @@ import java.util.Iterator;import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -37,6 +36,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.ShardParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java b/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.javaindex f54536d314e..2bb3bb2fcca 100644--- a/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java@@ -29,11 +29,11 @@ import java.util.List;import java.util.Map;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.MultiSolrCloudTestCase;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.security.AllowListUrlChecker;import org.hamcrest.MatcherAssert;import org.junit.AfterClass;diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.javaindex a860ac7c9ef..6af89ef4f7d 100644--- a/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java+++ b/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java@@ -22,12 +22,12 @@ import java.util.Map;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.core.CoreContainer;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Test;/**diff --git a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.javaindex 4860c0415bc..b4b7efe17d5 100644--- a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java@@ -22,7 +22,6 @@ import java.util.Deque;import java.util.List;import java.util.stream.Collectors;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -31,6 +30,7 @@ import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.util.NamedList;import org.apache.solr.core.MockDirectoryFactory;import org.apache.solr.core.StandardDirectoryFactory;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.Before;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.javaindex b6508b2052c..1010697676c 100644--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java@@ -31,7 +31,6 @@ import java.util.Set;import org.apache.http.client.HttpClient;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.util.Utils;@@ -40,6 +39,7 @@ import org.apache.solr.core.NodeConfig;import org.apache.solr.core.PluginInfo;import org.apache.solr.core.SolrInfoBean;import org.apache.solr.core.SolrXmlConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.metrics.reporters.MockMetricReporter;import org.apache.solr.util.JmxUtil;import org.apache.solr.util.TestHarness;diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterCloudTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterCloudTest.javaindex 8b935508ad4..00a201c2beb 100644--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterCloudTest.java+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterCloudTest.java@@ -25,12 +25,12 @@ import javax.management.MBeanServer;import javax.management.ObjectInstance;import javax.management.Query;import javax.management.QueryExp;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.CommonParams;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.metrics.SolrMetricManager;import org.apache.solr.metrics.SolrMetricReporter;import org.apache.solr.metrics.reporters.jmx.JmxMetricsReporter;diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.javaindex e9d0a8b67a5..f703f1ce741 100644--- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java+++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java@@ -45,7 +45,6 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -68,6 +67,7 @@ import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.ReflectMapWriter;import org.apache.solr.common.util.Utils;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.filestore.PackageStoreAPI;import org.apache.solr.filestore.TestDistribPackageStore;import org.apache.solr.handler.RequestHandlerBase;diff --git a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.javaindex f7db16a7c87..917a9ea560e 100644--- a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java+++ b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java@@ -32,11 +32,11 @@ import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;import org.apache.solr.common.SolrInputDocument;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.Before;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.javaindex 3bb73f59e8b..fc676549396 100644--- a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java+++ b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java@@ -28,7 +28,6 @@ import java.util.regex.Pattern;import org.apache.commons.io.FileUtils;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.NoOpResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -37,6 +36,7 @@ import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.ModifiableSolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java b/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.javaindex 282b06d4640..5e2dcfb70a8 100644--- a/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java+++ b/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java@@ -21,7 +21,6 @@ import java.util.HashSet;import java.util.List;import java.util.Set;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -31,6 +30,7 @@ import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.core.NodeRoles;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.servlet.CoordinatorHttpSolrCall;import org.junit.BeforeClass;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 a71d90ed4d5..d5227ba28f7 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@@ -31,7 +31,6 @@ import java.util.concurrent.atomic.AtomicInteger;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;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -45,6 +44,7 @@ import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.BeforeClass;import org.slf4j.Logger;@@ -122,9 +122,8 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {waitForRecoveriesToFinish(CLOUD_CLIENT);- for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {+ for (JettySolrRunner jetty : cluster.getJettySolrRunners())CLIENTS.add(getHttpSolrClient(jetty.getBaseUrl() + "/" + COLLECTION_NAME + "/"));- }final int numDocs = atLeast(100);for (int id = 0; id < numDocs; id++) {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 1ca9080ebd6..bbc58843195 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@@ -34,7 +34,6 @@ import java.util.concurrent.atomic.AtomicInteger;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;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -45,6 +44,7 @@ import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.BeforeClass;import org.noggit.JSONUtil;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 4bb741e772c..eee58309ef3 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@@ -36,7 +36,6 @@ 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;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -48,6 +47,7 @@ import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.BeforeClass;import org.noggit.JSONUtil;diff --git a/solr/core/src/test/org/apache/solr/search/join/CrossCollectionJoinQueryTest.java b/solr/core/src/test/org/apache/solr/search/join/CrossCollectionJoinQueryTest.javaindex 1ede697205b..5a6f87ffe6c 100644--- a/solr/core/src/test/org/apache/solr/search/join/CrossCollectionJoinQueryTest.java+++ b/solr/core/src/test/org/apache/solr/search/join/CrossCollectionJoinQueryTest.java@@ -24,7 +24,6 @@ import java.util.Collections;import java.util.List;import java.util.Locale;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -32,6 +31,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.ModifiableSolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.BeforeClass;import org.junit.Test;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 0c105e510a6..a8bb1ecb69c 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@@ -23,7 +23,6 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.QueryResponse;@@ -33,6 +32,7 @@ import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.CompositeIdRouter;import org.apache.solr.common.cloud.ImplicitDocRouter;import org.apache.solr.common.params.ShardParams;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Test;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/solr/core/src/test/org/apache/solr/security/AuthWithShardHandlerFactoryOverrideTest.java b/solr/core/src/test/org/apache/solr/security/AuthWithShardHandlerFactoryOverrideTest.javaindex 17d50adb004..eff43b40d22 100644--- a/solr/core/src/test/org/apache/solr/security/AuthWithShardHandlerFactoryOverrideTest.java+++ b/solr/core/src/test/org/apache/solr/security/AuthWithShardHandlerFactoryOverrideTest.java@@ -18,11 +18,11 @@ package org.apache.solr.security;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrResponse;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.Http2SolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.cloud.SolrCloudAuthTestCase;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.Before;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.javaindex 65e209795d9..427d598b232 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java@@ -40,7 +40,6 @@ import org.apache.http.entity.ByteArrayEntity;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.HttpClientUtil;@@ -63,6 +62,7 @@ import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.TimeSource;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.LogLevel;import org.apache.solr.util.SolrCLI;import org.apache.solr.util.TimeOut;diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.javaindex bf1092604d6..1a75de86725 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java@@ -38,10 +38,10 @@ import org.apache.http.message.AbstractHttpMessage;import org.apache.http.message.BasicHeader;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpClientUtil;import org.apache.solr.common.params.MapSolrParams;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.admin.SecurityConfHandler;import org.apache.solr.handler.admin.SecurityConfHandlerLocalForTesting;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java b/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.javaindex 4660006d56e..6f7269be9a0 100644--- a/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java+++ b/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java@@ -41,11 +41,11 @@ import org.apache.http.client.methods.HttpGet;import org.apache.http.message.BasicHeader;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpClientUtil;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.CommandOperation;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.admin.SecurityConfHandler;import org.apache.solr.handler.admin.SecurityConfHandlerLocalForTesting;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.javaindex f5d124342b6..ec07f7365b0 100644--- a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java@@ -24,13 +24,13 @@ import java.util.Map;import java.util.concurrent.atomic.AtomicInteger;import javax.servlet.http.HttpServletRequest;import org.apache.http.client.HttpClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.cloud.SolrCloudAuthTestCase;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.java b/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.javaindex e8c96890ce9..5af1ead66ef 100644--- a/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.java+++ b/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.java@@ -27,10 +27,10 @@ import javax.servlet.ServletOutputStream;import javax.servlet.UnavailableException;import javax.servlet.WriteListener;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.AbstractDistribZkTestBase;import org.apache.solr.cloud.SolrCloudTestCase;+import org.apache.solr.embedded.JettySolrRunner;import org.eclipse.jetty.server.Request;import org.eclipse.jetty.server.Response;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java b/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.javaindex 41bb14fad58..cecca9bbcc1 100644--- a/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java+++ b/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java@@ -23,11 +23,11 @@ import org.apache.http.HttpResponse;import org.apache.http.client.HttpClient;import org.apache.http.client.methods.HttpGet;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.params.SolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.javaindex 04046d0e5f9..9f6cafa9d2c 100644--- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java+++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java@@ -31,7 +31,6 @@ import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.LukeRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -46,6 +45,7 @@ import org.apache.solr.common.util.NamedList;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.SolrCore;import org.apache.solr.core.SolrEventListener;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.index.LogDocMergePolicyFactory;import org.apache.solr.search.SolrIndexSearcher;import org.apache.solr.update.MockStreamingSolrClients.Exp;diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.javaindex ec1f468e336..329f379fd35 100644--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java@@ -37,7 +37,6 @@ import org.apache.lucene.index.NoMergePolicy;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;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.schema.SchemaRequest.Field;@@ -59,6 +58,7 @@ import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SolrNamedThreadFactory;import org.apache.solr.common.util.TimeSource;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.index.NoMergePolicyFactory;import org.apache.solr.update.processor.DistributedUpdateProcessor;import org.apache.solr.util.RefCounted;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 3e6e328e9fe..cbbd18b8da6 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@@ -34,7 +34,6 @@ import java.util.concurrent.Future;import java.util.stream.Collectors;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ClusterStateProvider;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -56,6 +55,7 @@ import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SolrNamedThreadFactory;import org.apache.solr.core.CoreDescriptor;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.update.UpdateCommand;diff --git a/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.java b/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.javaindex 85f7952c4f6..b6f235865c2 100644--- a/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.java+++ b/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.java@@ -21,7 +21,6 @@ import java.util.ArrayList;import java.util.List;import org.apache.lucene.util.IOUtils;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.json.JsonQueryRequest;@@ -30,6 +29,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.json.BucketBasedJsonFacet;import org.apache.solr.client.solrj.response.json.BucketJsonFacet;import org.apache.solr.cloud.SolrCloudTestCase;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.javaindex 0b247dd78c0..320c0000d10 100644--- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java+++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java@@ -40,12 +40,12 @@ 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;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.SolrInputDocument;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.javaindex 7a4a939bcc7..6325719f68f 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java@@ -25,7 +25,6 @@ import org.apache.hadoop.util.Time;import org.apache.http.HttpStatus;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;@@ -40,6 +39,7 @@ import org.apache.solr.common.cloud.SolrZkClient;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.IOUtils;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestImpersonationWithHadoopAuth.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestImpersonationWithHadoopAuth.javaindex f295d2a5c6e..6a1d484c917 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestImpersonationWithHadoopAuth.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestImpersonationWithHadoopAuth.java@@ -28,13 +28,13 @@ import java.nio.file.Path;import java.util.HashMap;import java.util.Map;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.servlet.SolrRequestParsers;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestRuleBasedAuthorizationWithKerberos.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestRuleBasedAuthorizationWithKerberos.javaindex 2d3407ebdd8..1b6b545d8e0 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestRuleBasedAuthorizationWithKerberos.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestRuleBasedAuthorizationWithKerberos.java@@ -18,7 +18,6 @@ package org.apache.solr.security.hadoop;import org.apache.lucene.util.Constants;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.Http2SolrClient;@@ -29,6 +28,7 @@ import org.apache.solr.cloud.AbstractDistribZkTestBase;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.LogLevel;import org.junit.AfterClass;import org.junit.Before;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 61b47fca84e..407a3026288 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@@ -28,7 +28,6 @@ import org.apache.http.HttpStatus;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;@@ -46,6 +45,7 @@ import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.SolrZkClient;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithSecureImpersonation.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithSecureImpersonation.javaindex 0801b2d506b..2975410a442 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithSecureImpersonation.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithSecureImpersonation.java@@ -30,7 +30,6 @@ import org.apache.hadoop.conf.Configuration;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -40,6 +39,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.IOUtils;import org.apache.solr.core.CoreContainer;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.admin.CollectionsHandler;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;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 586f009733b..1de75075b94 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@@ -23,12 +23,12 @@ import org.apache.hadoop.hdfs.MiniDFSCluster;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;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;import org.junit.AfterClass;import org.junit.BeforeClass;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 ae8a103ad67..d68f9df6f9a 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@@ -34,13 +34,13 @@ import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.lucene.util.IOUtils;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.cloud.AbstractBasicDistributedZkTestBase;import org.apache.solr.cloud.StoppableIndexingThread;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.DirectoryFactory;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.hdfs.HdfsDirectoryFactory;import org.apache.solr.hdfs.store.blockcache.BlockCache;import org.apache.solr.hdfs.store.blockcache.BlockDirectory;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 817083afd10..ddce8a280d2 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@@ -39,7 +39,6 @@ import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest.Create;import org.apache.solr.client.solrj.response.CollectionAdminResponse;@@ -59,6 +58,7 @@ import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.SolrNamedThreadFactory;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.CoreDescriptor;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;import org.apache.solr.util.LogLevel;import org.apache.solr.util.TestInjection;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.javaindex 11b0b43d46d..205a6db3686 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java@@ -24,13 +24,13 @@ import java.util.List;import java.util.stream.IntStream;import org.apache.commons.io.file.PathUtils;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.SolrInputDocument;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.ltr.feature.FieldValueFeature;import org.apache.solr.ltr.feature.OriginalScoreFeature;import org.apache.solr.ltr.feature.SolrFeature;diff --git a/solr/prometheus-exporter/build.gradle b/solr/prometheus-exporter/build.gradleindex ef0b6e69568..843932dbc73 100644--- a/solr/prometheus-exporter/build.gradle+++ b/solr/prometheus-exporter/build.gradle@@ -45,7 +45,6 @@ dependencies {runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl'runtimeOnly 'com.lmax:disruptor'- testImplementation project(':solr:core')testImplementation project(':solr:test-framework')testImplementation 'com.carrotsearch.randomizedtesting:randomizedtesting-runner'testImplementation 'junit:junit'diff --git a/solr/server/build.gradle b/solr/server/build.gradleindex bb57cd71b5f..d44c96ec8fd 100644--- a/solr/server/build.gradle+++ b/solr/server/build.gradle@@ -27,8 +27,9 @@ compileJava.enabled(false)configurations {libExtserverLib+ solrCoreruntimeClasspath {- extendsFrom serverLib, libExt+ extendsFrom serverLib, libExt, solrCore}startJarwebapp@@ -89,6 +90,8 @@ dependencies {startJar('org.eclipse.jetty:jetty-start::shaded', {transitive false})++ solrCore project(":solr:core")}// Add the following non-standard configurations to JAR validation.@@ -113,11 +116,12 @@ task assemblePackaging(type: Sync) {include "README.md"})- from(configurations.libExt, {+ // Add in the intersection of serverLib and solrCore+ from(configurations.libExt + (configurations.serverLib - (configurations.serverLib - configurations.solrCore)), {into "lib/ext"})- from(configurations.serverLib - configurations.libExt, {+ from(configurations.serverLib - configurations.libExt - configurations.solrCore, {into "lib/"})diff --git a/solr/server/contexts/solr-jetty-context.xml b/solr/server/contexts/solr-jetty-context.xmlindex ac5820a5c0b..c5df3ab2105 100644--- a/solr/server/contexts/solr-jetty-context.xml+++ b/solr/server/contexts/solr-jetty-context.xml@@ -5,4 +5,37 @@<Set name="war"><Property name="jetty.base"/>/solr-webapp/webapp</Set><Set name="defaultsDescriptor"><Property name="jetty.base"/>/etc/webdefault.xml</Set><Set name="extractWAR">false</Set>++ <!--+ The rest of this file is necessary for us to deduplicate jetty server jars in our server build.+ Jetty disallows "server" classes that are loaded via the server classloader (live in server/lib/ or server/lib/ext/)+ from being used by the Webapp. Solr has a need for many of these classes, especially http and http2 for HTTP Client+ libraries.++ By default, Solr would need to duplicate these jars between server/lib/ and WEB-INF/lib/.+ Therefore, if we want to deduplicate these Jetty jars, we need to remove the class packages that Solr uses from the+ Jetty "server" class matcher, using the "-" prefix in from of the sub-package name.++ The default server class matcher can be found here:+ https://github.com/eclipse/jetty.project/blob/jetty-10.0.12/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java#L178++ Setting parentLoaderPriority=true is also necessary in order to be able to use these classes from the server classloader.++ Documentation for this can be found here: https://www.eclipse.org/jetty/documentation/jetty-10/old_docs/index.html#jetty-classloading+ -->+ <Set name="parentLoaderPriority">true</Set>+ <Call name="addServerClassMatcher">+ <Arg>+ <New id="removeServerClasses" class="org.eclipse.jetty.webapp.ClassMatcher">+ <Arg>+ <Array type="java.lang.String">+ <Item>-org.eclipse.jetty.io.</Item>+ <Item>-org.eclipse.jetty.http.</Item>+ <Item>-org.eclipse.jetty.http2.</Item>+ <Item>-org.eclipse.jetty.util.</Item>+ </Array>+ </Arg>+ </New>+ </Arg>+ </Call></Configure>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 72179875794..b34892014e4 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,12 @@ 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.2+=== Jetty Configuration+* Solr no longer duplicates certain Jetty "server" library dependencies between `server/lib` and `WEB-INF/lib` (jetty-util, jetty-io, etc.).+This is an improvement to the binary release artifact, but Jetty does not allow web-apps (Solr) to share these libraries by default.+The `server/contexts/solr-jetty-context.xml` now explicitly removes these restrictions, allowing Solr to share these "server" jars which now live in `server/lib/ext`.+== Solr 9.1=== Querying and Indexing* Added Lucene91HnswVectorsFormat codec for DenseVectorField. In order to use the new codec, reindex is necessary.diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.javaindex 5ef40f57812..6aef7412c9f 100644--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java@@ -30,7 +30,6 @@ import java.util.Set;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.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;@@ -57,6 +56,7 @@ import org.apache.solr.cloud.AbstractDistribZkTestBase;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.BaseTestHarness;import org.junit.Before;import org.junit.BeforeClass;diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.javaindex 12e774f593a..4cfd0269248 100644--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java@@ -27,7 +27,6 @@ import java.util.Map;import java.util.Objects;import java.util.Set;import org.apache.lucene.tests.util.LuceneTestCase;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -37,6 +36,7 @@ import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.cloud.ClusterState;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.params.ModifiableSolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Before;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.javaindex 135baacce2b..6d80d8e9cde 100644--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java@@ -29,7 +29,6 @@ import java.util.Objects;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.embedded.JettySolrRunner;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.comp.ComparatorOrder;@@ -66,6 +65,7 @@ import org.apache.solr.common.cloud.ClusterState;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Assume;import org.junit.Before;import org.junit.BeforeClass;diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.javaindex d6f15e490ef..34d3201a001 100644--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java@@ -38,7 +38,6 @@ import java.util.zip.GZIPOutputStream;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;import org.apache.solr.client.solrj.io.ClassificationEvaluation;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;@@ -61,6 +60,7 @@ import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.core.CoreDescriptor;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Assume;import org.junit.Before;import org.junit.BeforeClass;diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.javaindex e64194dc532..337ae7e9af3 100644--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java@@ -31,7 +31,6 @@ import java.util.Set;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;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.comp.ComparatorOrder;@@ -59,6 +58,7 @@ import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.ShardParams;import org.apache.solr.common.params.SolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Assume;import org.junit.Before;import org.junit.BeforeClass;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 5413f8d8193..aed75ba65a4 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@@ -29,14 +29,14 @@ import java.util.concurrent.TimeUnit;import org.apache.commons.io.FileUtils;import org.apache.lucene.util.IOUtils;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.Http2SolrClient;import org.apache.solr.client.solrj.impl.LBHttp2SolrClient;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.SolrResponseBase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.util.TimeSource;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TimeOut;import org.junit.AfterClass;import org.junit.BeforeClass;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 7fc86ea1e9e..5ad3f289116 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@@ -30,14 +30,14 @@ import org.apache.commons.io.FileUtils;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.lucene.util.IOUtils;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpClientUtil;import org.apache.solr.client.solrj.impl.LBHttpSolrClient;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.SolrResponseBase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.util.TimeSource;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TimeOut;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.javaindex a25b6a07e7a..a2bf198184b 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java@@ -58,7 +58,6 @@ import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -70,6 +69,7 @@ import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SuppressForbidden;+import org.apache.solr.embedded.JettyConfig;import org.eclipse.jetty.servlet.ServletHolder;import org.junit.BeforeClass;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 9982bc3a4ca..f245c3bef04 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@@ -42,7 +42,6 @@ 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;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -68,6 +67,7 @@ import org.apache.solr.common.params.ShardParams;import org.apache.solr.common.params.UpdateParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SimpleOrderedMap;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.admin.CollectionsHandler;import org.apache.solr.handler.admin.ConfigSetsHandler;import org.apache.solr.handler.admin.CoreAdminHandler;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 dd062582966..6bd122f3402 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@@ -42,7 +42,6 @@ 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;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -72,6 +71,7 @@ import org.apache.solr.common.params.ShardParams;import org.apache.solr.common.params.UpdateParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SimpleOrderedMap;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.admin.CollectionsHandler;import org.apache.solr.handler.admin.ConfigSetsHandler;import org.apache.solr.handler.admin.CoreAdminHandler;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.javaindex 106264f74e6..c6edb82d0c5 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java@@ -22,7 +22,7 @@ import java.util.ArrayList;import java.util.List;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettyConfig;+import org.apache.solr.embedded.JettyConfig;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.javaindex 90e63dc57d8..900f897d90d 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java@@ -25,10 +25,10 @@ import java.util.concurrent.atomic.AtomicInteger;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.SolrNamedThreadFactory;+import org.apache.solr.embedded.JettyConfig;import org.eclipse.jetty.client.api.Response;import org.eclipse.jetty.servlet.ServletHolder;import org.junit.BeforeClass;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.javaindex 7390f934511..0cecb2f62d1 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java@@ -22,7 +22,7 @@ import java.util.ArrayList;import java.util.List;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettyConfig;+import org.apache.solr.embedded.JettyConfig;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.javaindex 67d265568c2..845eff9d049 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java@@ -35,12 +35,12 @@ import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.request.JavaBinUpdateRequestCodec;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.SolrNamedThreadFactory;+import org.apache.solr.embedded.JettyConfig;import org.eclipse.jetty.servlet.ServletHolder;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.javaindex 6852f58a189..78ce61a3099 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java@@ -22,7 +22,7 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettyConfig;+import org.apache.solr.embedded.JettyConfig;import org.apache.solr.util.LogLevel;import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.javaindex e5435911550..1dce0dc06cc 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java@@ -39,7 +39,6 @@ import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -48,6 +47,7 @@ import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.MapSolrParams;import org.apache.solr.common.util.SuppressForbidden;+import org.apache.solr.embedded.JettyConfig;import org.eclipse.jetty.client.WWWAuthenticationProtocolHandler;import org.eclipse.jetty.http.HttpStatus;import org.eclipse.jetty.servlet.ServletHolder;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.javaindex 36fc21177ec..cf7721d9b13 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java@@ -22,7 +22,7 @@ import java.util.ArrayList;import java.util.List;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettyConfig;+import org.apache.solr.embedded.JettyConfig;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.javaindex 960a1604f35..fc7b037ca98 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java@@ -29,12 +29,12 @@ import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.SolrNamedThreadFactory;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.javaindex 127a1c6320d..2b496a71cf1 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java@@ -22,7 +22,7 @@ import java.util.ArrayList;import java.util.List;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettyConfig;+import org.apache.solr.embedded.JettyConfig;import org.junit.BeforeClass;import org.junit.Test;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 f5081ae0820..b6e1b102961 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@@ -25,13 +25,13 @@ import java.util.Collections;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicBoolean;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.SolrPingResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.SolrCloudTestCase;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.LogLevel;import org.apache.zookeeper.data.Stat;import org.slf4j.Logger;diff --git a/solr/solrj/src/test/org/apache/solr/common/cloud/TestCollectionStateWatchers.java b/solr/solrj/src/test/org/apache/solr/common/cloud/TestCollectionStateWatchers.javaindex 3508a95412f..36c7ebb0354 100644--- a/solr/solrj/src/test/org/apache/solr/common/cloud/TestCollectionStateWatchers.java+++ b/solr/solrj/src/test/org/apache/solr/common/cloud/TestCollectionStateWatchers.java@@ -25,11 +25,11 @@ import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.util.ExecutorUtil;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.Before;import org.junit.Ignore;diff --git a/solr/solrj/src/test/org/apache/solr/common/cloud/TestNodesSysPropsCacher.java b/solr/solrj/src/test/org/apache/solr/common/cloud/TestNodesSysPropsCacher.javaindex 44fd02a9dde..a78f2b3bde3 100644--- a/solr/solrj/src/test/org/apache/solr/common/cloud/TestNodesSysPropsCacher.java+++ b/solr/solrj/src/test/org/apache/solr/common/cloud/TestNodesSysPropsCacher.java@@ -20,9 +20,9 @@ package org.apache.solr.common.cloud;import java.util.Arrays;import java.util.List;import java.util.Map;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.SolrCloudTestCase;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Test;public class TestNodesSysPropsCacher extends SolrCloudTestCase {diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradleindex 4610cf1e185..9728cbd425a 100644--- a/solr/test-framework/build.gradle+++ b/solr/test-framework/build.gradle@@ -66,6 +66,13 @@ dependencies {implementation 'org.eclipse.jetty:jetty-server'api 'org.eclipse.jetty:jetty-servlet'implementation 'org.eclipse.jetty:jetty-util'+ implementation 'org.eclipse.jetty:jetty-alpn-server'+ runtimeOnly('org.eclipse.jetty:jetty-alpn-java-server', {+ exclude group: "org.eclipse.jetty.alpn", module: "alpn-api"+ })+ implementation 'org.eclipse.jetty:jetty-rewrite'+ implementation 'org.eclipse.jetty.http2:http2-server'+ implementation 'org.eclipse.jetty.http2:http2-common'implementation 'com.carrotsearch.randomizedtesting:randomizedtesting-runner'implementation 'junit:junit'diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.javaindex 94681feae78..abd6f018a42 100644--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java@@ -51,8 +51,6 @@ import org.apache.lucene.util.Constants;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.UpdateResponse;@@ -65,6 +63,8 @@ import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.IOUtils;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SolrNamedThreadFactory;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.eclipse.jetty.servlet.ServletHolder;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.javaindex b3fb4237ada..b79d286e759 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java@@ -31,9 +31,9 @@ import org.apache.commons.io.file.PathUtils;import org.apache.http.client.HttpClient;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;import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.DirectoryUtil;import org.apache.solr.util.ExternalPaths;import org.eclipse.jetty.servlet.ServletHolder;diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.javaindex 26ea3982721..d721d37dab1 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java@@ -38,8 +38,6 @@ import javax.xml.xpath.XPathExpressionException;import org.apache.lucene.util.IOUtils;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.NoOpResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -52,6 +50,8 @@ import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.Utils;import org.apache.solr.core.CoreDescriptor;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.schema.IndexSchema;import org.apache.solr.schema.SchemaField;diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.javaindex b3e6b609c80..43666fd3683 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java@@ -92,8 +92,6 @@ import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks;import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.Constants;import org.apache.solr.client.solrj.ResponseParser;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;@@ -133,6 +131,8 @@ import org.apache.solr.core.NodeConfig;import org.apache.solr.core.SolrConfig;import org.apache.solr.core.SolrCore;import org.apache.solr.core.SolrXmlConfig;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.UpdateRequestHandler;import org.apache.solr.request.LocalSolrQueryRequest;import org.apache.solr.request.SolrQueryRequest;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 2afb6ef2442..362efbc63f5 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@@ -24,7 +24,6 @@ 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;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -35,6 +34,7 @@ import org.apache.solr.common.cloud.ZkNodeProps;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.BackupStatusChecker;import org.apache.solr.handler.ReplicationHandler;import org.junit.Test;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.javaindex e384672c834..9d4cd98d0c5 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java@@ -43,7 +43,6 @@ import org.apache.solr.JSONTestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -78,6 +77,7 @@ import org.apache.solr.common.params.UpdateParams;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SolrNamedThreadFactory;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TestInjection;import org.apache.solr.util.TestInjection.Hook;import org.junit.BeforeClass;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.javaindex 8a2679a0191..c74396c9bdd 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java@@ -28,7 +28,6 @@ import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicInteger;import org.apache.commons.io.FileUtils;import org.apache.solr.BaseDistributedSearchTestCase;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.ClusterState;@@ -39,6 +38,7 @@ import org.apache.solr.common.cloud.SolrZkClient;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.core.Diagnostics;import org.apache.solr.core.MockDirectoryFactory;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.SolrCLI;import org.apache.solr.util.TimeOut;import org.apache.zookeeper.KeeperException;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 62ec5f66748..40c94214935 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@@ -49,8 +49,6 @@ import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -89,6 +87,8 @@ import org.apache.solr.common.util.Utils;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.Diagnostics;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.ReplicationHandler;import org.apache.solr.search.SolrIndexSearcher;import org.apache.solr.update.DirectUpdateHandler2;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.javaindex 676e4bc2e96..73baf2b8c84 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java@@ -28,7 +28,6 @@ import java.util.Set;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;@@ -40,6 +39,7 @@ import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.IdUtils;import org.junit.After;import org.junit.Before;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 2982a81f2c1..466cc7e5e43 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@@ -21,7 +21,6 @@ import java.util.ArrayList;import java.util.List;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -29,6 +28,7 @@ import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.Slice;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractTlogReplayBufferedWhileIndexingTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractTlogReplayBufferedWhileIndexingTestBase.javaindex d08e3aeeabe..ee73ea8e817 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractTlogReplayBufferedWhileIndexingTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractTlogReplayBufferedWhileIndexingTestBase.java@@ -21,9 +21,9 @@ import java.util.ArrayList;import java.util.List;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TestInjection;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.javaindex 169a41776cc..1a23f3373be 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.java@@ -29,7 +29,6 @@ import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;import org.apache.solr.common.SolrInputDocument;@@ -44,6 +43,7 @@ import org.apache.solr.common.util.SolrNamedThreadFactory;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.SolrCore;import org.apache.solr.core.SolrPaths;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TestInjection;import org.apache.solr.util.TimeOut;import org.junit.Test;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 2a5e91115eb..36bb09e12a4 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@@ -30,7 +30,6 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import java.util.regex.Pattern;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;import org.apache.solr.common.cloud.Replica;@@ -44,6 +43,7 @@ import org.apache.solr.common.util.SolrNamedThreadFactory;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.RTimer;import org.apache.solr.util.TestInjection;import org.apache.solr.util.TimeOut;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 6f9c20aac35..36a34cef0f5 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@@ -54,8 +54,6 @@ import java.util.function.Consumer;import javax.servlet.Filter;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;import org.apache.solr.client.solrj.embedded.SSLConfig;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;@@ -78,6 +76,8 @@ import org.apache.solr.common.util.IOUtils;import org.apache.solr.common.util.SolrNamedThreadFactory;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.CoreContainer;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TimeOut;import org.apache.zookeeper.KeeperException;import org.eclipse.jetty.server.handler.HandlerWrapper;@@ -530,8 +530,7 @@ public class MiniSolrCloudCluster {** @param name the instance name* @param hostContext the context to run on- * @param config a JettyConfig for the instance's {@link- * org.apache.solr.client.solrj.embedded.JettySolrRunner}+ * @param config a JettyConfig for the instance's {@link org.apache.solr.embedded.JettySolrRunner}* @return a JettySolrRunner*/public JettySolrRunner startJettySolrRunner(String name, String hostContext, JettyConfig config)diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.javaindex fd9ad2d9f99..88ff21ec2be 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.java@@ -41,9 +41,9 @@ import org.apache.http.client.methods.HttpGet;import org.apache.http.message.AbstractHttpMessage;import org.apache.http.message.BasicHeader;import org.apache.http.util.EntityUtils;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.common.util.StrUtils;import org.apache.solr.common.util.Utils;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TimeOut;import org.junit.AfterClass;import org.junit.BeforeClass;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 9cc1d623457..9926854bd34 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@@ -34,7 +34,6 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.CoreStatus;@@ -46,6 +45,7 @@ import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.cloud.SolrZkClient;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.Before;import org.slf4j.Logger;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 0a1a80c271a..1ba39b0651c 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@@ -44,7 +44,6 @@ 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;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;@@ -68,6 +67,7 @@ import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.SolrCore;import org.apache.solr.core.SolrInfoBean.Category;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.TestInjection;import org.apache.solr.util.TimeOut;import org.junit.After;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.javaindex 7258915bcd7..08070802011 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java@@ -45,7 +45,6 @@ import org.apache.lucene.store.IOContext;import org.apache.lucene.store.IndexInput;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -69,6 +68,7 @@ import org.apache.solr.core.backup.Checksum;import org.apache.solr.core.backup.ShardBackupId;import org.apache.solr.core.backup.ShardBackupMetadata;import org.apache.solr.core.backup.repository.BackupRepository;+import org.apache.solr.embedded.JettySolrRunner;import org.junit.Before;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.javasimilarity index 98%rename from solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.javarename to solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.javaindex 5b442d0135c..b03b1c234db 100644--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java@@ -14,12 +14,13 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.embedded;+package org.apache.solr.embedded;import java.util.LinkedHashMap;import java.util.Map;import java.util.TreeMap;import javax.servlet.Filter;+import org.apache.solr.client.solrj.embedded.SSLConfig;import org.eclipse.jetty.servlet.ServletHolder;public class JettyConfig {diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.javasimilarity index 99%rename from solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.javarename to solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.javaindex 6d88a5ad7b6..61ea40a8f41 100644--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.embedded;+package org.apache.solr.embedded;import com.codahale.metrics.ConsoleReporter;import com.codahale.metrics.MetricFilter;@@ -57,6 +57,7 @@ import org.apache.commons.io.output.NullPrintStream;import org.apache.lucene.util.Constants;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.cloud.SocketProxy;+import org.apache.solr.client.solrj.embedded.SSLConfig;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.NamedList;diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/package-info.java b/solr/test-framework/src/java/org/apache/solr/embedded/package-info.javanew file mode 100644index 00000000000..d5e11e956bd--- /dev/null+++ b/solr/test-framework/src/java/org/apache/solr/embedded/package-info.java@@ -0,0 +1,19 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++/** Classes for running embedded Solr Jetty Servers in tests. */+package org.apache.solr.embedded;diff --git a/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java b/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.javaindex 4ae1ba9afdf..d7bfc961b77 100644--- a/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java+++ b/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java@@ -23,7 +23,6 @@ import java.util.List;import java.util.Map;import java.util.Queue;import java.util.concurrent.ConcurrentHashMap;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;@@ -33,6 +32,7 @@ import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.StrUtils;import org.apache.solr.core.CoreContainer;+import org.apache.solr.embedded.JettySolrRunner;/*** A ShardHandlerFactory that extends HttpShardHandlerFactory and tracks requests made to@@ -145,7 +145,7 @@ public class TrackingShardHandlerFactory extends HttpShardHandlerFactory {* Sets the tracking queue for all nodes participating in this cluster. Once this method returns,* all search and core admin requests distributed to shards will be submitted to the given queue.*- * @param runners a list of {@link org.apache.solr.client.solrj.embedded.JettySolrRunner} nodes+ * @param runners a list of {@link org.apache.solr.embedded.JettySolrRunner} nodes* @param queue an implementation of {@link java.util.Queue} which accepts {@link* org.apache.solr.handler.component.TrackingShardHandlerFactory.ShardRequestAndParams}* instancesdiff --git a/solr/test-framework/src/test-files/solr/collection1/conf/schema.xml b/solr/test-framework/src/test-files/solr/collection1/conf/schema.xmlnew file mode 100644index 00000000000..ec039ac0bf0--- /dev/null+++ b/solr/test-framework/src/test-files/solr/collection1/conf/schema.xml@@ -0,0 +1,932 @@+<?xml version="1.0" ?>+<!--+ Licensed to the Apache Software Foundation (ASF) under one or more+ contributor license agreements. See the NOTICE file distributed with+ this work for additional information regarding copyright ownership.+ The ASF licenses this file to You under the Apache License, Version 2.0+ (the "License"); you may not use this file except in compliance with+ the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing, software+ distributed under the License is distributed on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ See the License for the specific language governing permissions and+ limitations under the License.+-->++<!-- The Solr schema file. This file should be named "schema.xml" and+ should be located where the classloader for the Solr webapp can find it.++ This schema is used for testing, and as such has everything and the+ kitchen sink thrown in. See example/solr/conf/schema.xml for a+ more concise example.++ -->++<schema name="test" version="1.0">++ <!-- field type definitions... note that the "name" attribute is+ just a label to be used by field definitions. The "class"+ attribute and any other attributes determine the real type and+ behavior of the fieldType.+ -->++ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+++ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>++ <!-- Point Fields -->+ <fieldType name="pint" class="solr.IntPointField" docValues="true"/>+ <fieldType name="plong" class="solr.LongPointField" docValues="true"/>+ <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>+ <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>+ <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>++ <!-- Dense Vector Fields -->+ <fieldType name="knn_vector_cosine" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine"/>+ <fieldType name="knn_vector_dot_product" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="dot_product"/>+ <fieldType name="knn_vector5" class="solr.DenseVectorField" vectorDimension="5" similarityFunction="dot_product"/>++++ <!-- Field type demonstrating an Analyzer failure -->+ <fieldType name="failtype1" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0"+ catenateNumbers="0" catenateAll="0"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.FlattenGraphFilterFactory"/>+ </analyzer>+ </fieldType>++ <!-- Demonstrating ignoreCaseChange -->+ <fieldType name="wdf_nocase" class="solr.TextField">+ <analyzer type="">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0"+ catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="0"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.FlattenGraphFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0"+ catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="0"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ </analyzer>+ </fieldType>++ <fieldType name="wdf_preserve" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0"+ catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.FlattenGraphFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0"+ catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ </analyzer>+ </fieldType>+++ <!-- HighlitText optimizes storage for (long) columns which will be highlit -->+ <fieldType name="highlittext" class="solr.TextField" compressThreshold="345"/>++ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>++ <!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional+ seconds part (.999) is optional.+ -->+ <fieldType name="date" class="${solr.tests.DateFieldType}" precisionStep="0" docValues="${solr.tests.numeric.dv}"/>+ <fieldType name="tdate" class="${solr.tests.DateFieldType}" precisionStep="6" docValues="${solr.tests.numeric.dv}"/>+ <fieldType name="tdatedv" class="${solr.tests.DateFieldType}" precisionStep="6" docValues="true"/>++ <fieldType name="dateRange" class="solr.DateRangeField"/>+ <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"+ geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers"/>++ <!-- solr.TextField allows the specification of custom+ text analyzers specified as a tokenizer and a list+ of token filters.+ -->+ <fieldType name="text" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.StandardTokenizerFactory"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.StopFilterFactory"/>+ <filter class="solr.PorterStemFilterFactory"/>+ </analyzer>+ </fieldType>++ <fieldtype name="text_payload_tv" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.StandardTokenizerFactory"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.StopFilterFactory"/>+ <filter class="solr.PorterStemFilterFactory"/>+ <filter class="org.apache.lucene.analysis.payloads.TokenOffsetPayloadTokenFilterFactory"/>+ </analyzer>+ </fieldtype>++ <fieldType name="nametext" class="solr.TextField">+ <analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>+ </fieldType>++ <fieldType name="teststop" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.LetterTokenizerFactory"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.StopFilterFactory" words="stopwords.txt"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.LetterTokenizerFactory"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ </analyzer>+ </fieldType>++ <!-- fieldTypes in this section isolate tokenizers and tokenfilters for testing -->+ <fieldType name="keywordtok" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>+ </analyzer>+ </fieldType>+ <fieldType name="standardtok" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.StandardTokenizerFactory"/>+ </analyzer>+ </fieldType>+ <fieldType name="lettertok" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.LetterTokenizerFactory"/>+ </analyzer>+ </fieldType>+ <fieldType name="whitetok" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ </analyzer>+ </fieldType>+ <fieldType name="HTMLstandardtok" class="solr.TextField">+ <analyzer>+ <charFilter class="solr.HTMLStripCharFilterFactory"/>+ <tokenizer class="solr.StandardTokenizerFactory"/>+ </analyzer>+ </fieldType>+ <fieldType name="HTMLwhitetok" class="solr.TextField">+ <analyzer>+ <charFilter class="solr.HTMLStripCharFilterFactory"/>+ <tokenizer class="solr.MockTokenizerFactory"/>+ </analyzer>+ </fieldType>+ <fieldType name="standardtokfilt" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.StandardTokenizerFactory"/>+ </analyzer>+ </fieldType>+ <fieldType name="standardfilt" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ </analyzer>+ </fieldType>+ <fieldType name="lowerfilt" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ </analyzer>+ </fieldType>+ <fieldType name="lowerpunctfilt" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" expand="true"/>+ <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1"+ catenateNumbers="1" catenateAll="1" splitOnCaseChange="1"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.FlattenGraphFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" expand="true"/>+ <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1"+ catenateNumbers="1" catenateAll="1" splitOnCaseChange="1"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ </analyzer>+ </fieldType>+ <fieldType name="patternreplacefilt" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>+ <filter class="solr.PatternReplaceFilterFactory"+ pattern="([^a-zA-Z])" replacement="_" replace="all"+ />+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>+ </analyzer>+ </fieldType>+ <fieldType name="patterntok" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.PatternTokenizerFactory" pattern=","/>+ </analyzer>+ </fieldType>+ <fieldType name="porterfilt" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.PorterStemFilterFactory"/>+ </analyzer>+ </fieldType>+ <!-- fieldType name="snowballfilt" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.SnowballPorterFilterFactory"/>+ </analyzer>+ </fieldType -->+ <fieldType name="engporterfilt" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.PorterStemFilterFactory"/>+ </analyzer>+ </fieldType>+ <fieldType name="custengporterfilt" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>+ <filter class="solr.PorterStemFilterFactory"/>+ </analyzer>+ </fieldType>+ <fieldType name="stopfilt" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.StopFilterFactory" ignoreCase="true"/>+ </analyzer>+ </fieldType>+ <fieldType name="custstopfilt" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.StopFilterFactory" words="stopwords.txt"/>+ </analyzer>+ </fieldType>+ <fieldType name="lengthfilt" class="solr.TextField">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.LengthFilterFactory" min="2" max="5"/>+ </analyzer>+ </fieldType>+ <fieldType name="charfilthtmlmap" class="solr.TextField">+ <analyzer>+ <charFilter class="solr.HTMLStripCharFilterFactory"/>+ <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>+ <tokenizer class="solr.MockTokenizerFactory"/>+ </analyzer>+ </fieldType>++ <fieldType name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">+ <analyzer type="index">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1"+ catenateNumbers="1" catenateAll="0"/>+ <filter class="solr.FlattenGraphFilterFactory"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.StopFilterFactory"/>+ <filter class="solr.PorterStemFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0"+ catenateNumbers="0" catenateAll="0"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.StopFilterFactory"/>+ <filter class="solr.PorterStemFilterFactory"/>+ </analyzer>+ </fieldType>++ <fieldType name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">+ <analyzer type="index">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" protected="protwords.txt" splitOnNumerics="0"+ splitOnCaseChange="0" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0"+ catenateAll="0"/>+ <filter class="solr.StopFilterFactory"/>+ <filter class="solr.PorterStemFilterFactory"/>+ <filter class="solr.FlattenGraphFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" protected="protwords.txt" splitOnNumerics="0"+ splitOnCaseChange="0" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1"+ catenateAll="0"/>+ <filter class="solr.StopFilterFactory"/>+ <filter class="solr.PorterStemFilterFactory"/>+ </analyzer>+ </fieldType>++ <fieldType name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">+ <analyzer type="index">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" protected="protwords.txt" splitOnNumerics="0"+ splitOnCaseChange="0" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0"+ catenateAll="0"/>+ <filter class="solr.FlattenGraphFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ </analyzer>+ </fieldType>+++ <!-- more flexible in matching skus, but more chance of a false match -->+ <fieldType name="skutype1" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1"+ catenateNumbers="1" catenateAll="0"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.FlattenGraphFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1"+ catenateNumbers="1" catenateAll="0"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ </analyzer>+ </fieldType>++ <!-- less flexible in matching skus, but less chance of a false match -->+ <fieldType name="skutype2" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1"+ catenateNumbers="1" catenateAll="0"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ <filter class="solr.FlattenGraphFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1"+ catenateNumbers="1" catenateAll="0"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ </analyzer>+ </fieldType>++ <!-- less flexible in matching skus, but less chance of a false match -->+ <fieldType name="syn" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.SynonymGraphFilterFactory" synonyms="old_synonyms.txt"/>+ <filter class="solr.FlattenGraphFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.SynonymGraphFilterFactory" synonyms="old_synonyms.txt"/>+ </analyzer>+ </fieldType>++ <!-- Demonstrates How RemoveDuplicatesTokenFilter makes stemmed+ synonyms "better"+ -->+ <fieldType name="dedup" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.SynonymGraphFilterFactory"+ synonyms="old_synonyms.txt" expand="true"/>+ <filter class="solr.PorterStemFilterFactory"/>+ <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>+ <filter class="solr.FlattenGraphFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.SynonymGraphFilterFactory"+ synonyms="old_synonyms.txt" expand="true"/>+ <filter class="solr.PorterStemFilterFactory"/>+ <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>+ </analyzer>+ </fieldType>++ <fieldType name="unstored" class="solr.StrField" indexed="true" stored="false"/>+++ <fieldType name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ <filter class="solr.LowerCaseFilterFactory"/>+ </analyzer>+ </fieldType>++ <fieldType name="uuid" class="solr.UUIDField"/>++ <!-- Try out some point types -->+ <fieldType name="xy" class="solr.PointType" dimension="2" subFieldType="double" docValues="true"/>+ <fieldType name="x" class="solr.PointType" dimension="1" subFieldType="double"/>+ <fieldType name="tenD" class="solr.PointType" dimension="10" subFieldType="double"/>+ <fieldType name="xyd" class="solr.PointType" dimension="2" subFieldSuffix="_d1"/>++ <!-- Currency type -->+ <fieldType name="currency" class="solr.CurrencyField" currencyConfig="currency.xml" multiValued="false"/>+ <fieldType name="mock_currency" class="solr.CurrencyField" providerClass="solr.MockExchangeRateProvider" foo="bar"+ multiValued="false"/>+ <fieldType name="oer_currency"+ class="solr.CurrencyField"+ multiValued="false"+ providerClass="solr.OpenExchangeRatesOrgProvider"+ ratesFileLocation="open-exchange-rates.json"/>+ <fieldType name="currency_CFT" class="solr.CurrencyFieldType" amountLongSuffix="_l1_ns" codeStrSuffix="_s1"+ currencyConfig="currency.xml" multiValued="false"/>+ <fieldType name="mock_currency_CFT" class="solr.CurrencyFieldType" amountLongSuffix="_l1_ns" codeStrSuffix="_s1"+ providerClass="solr.MockExchangeRateProvider" foo="bar" multiValued="false"/>+ <fieldType name="oer_currency_CFT"+ class="solr.CurrencyFieldType"+ amountLongSuffix="_l1_ns"+ codeStrSuffix="_s1_ns"+ multiValued="false"+ providerClass="solr.OpenExchangeRatesOrgProvider"+ ratesFileLocation="open-exchange-rates.json"/>++ <!-- omitPositions example -->+ <fieldType name="nopositions" class="solr.TextField" omitPositions="true">+ <analyzer>+ <tokenizer class="solr.MockTokenizerFactory"/>+ </analyzer>+ </fieldType>++ <fieldType name="location" class="solr.LatLonPointSpatialField" />++ <!--+ Example of using PathHierarchyTokenizerFactory at index time, so+ queries for paths match documents at that path, or in descendent paths+ -->+ <fieldType name="path" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.KeywordTokenizerFactory"/>+ </analyzer>+ </fieldType>+ <!--+ Example of using PathHierarchyTokenizerFactory at query time, so+ queries for paths match documents at that path, or in ancestor paths+ -->+ <fieldType name="ancestor_path" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.KeywordTokenizerFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/"/>+ </analyzer>+ </fieldType>++ <fieldType name="payloadDelimited" class="solr.TextField">+ <analyzer type="index">+ <tokenizer class="solr.WhitespaceTokenizerFactory"/>+ <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="integer"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.WhitespaceTokenizerFactory"/>+ </analyzer>+ </fieldType>++ <!-- CommonGrams for phrase queries -->+ <dynamicField name="*_commongrams" type="commongrams" />+ <fieldType name="commongrams" class="solr.TextField" indexed="true" stored="true">+ <analyzer type="index">+ <tokenizer class="solr.WhitespaceTokenizerFactory"/>+ <filter class="solr.CommonGramsFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.WhitespaceTokenizerFactory"/>+ <filter class="solr.CommonGramsQueryFilterFactory"/>+ </analyzer>+ </fieldType>+ <dynamicField name="*_commongrams_stop" type="commongrams_stop" />+ <fieldType name="commongrams_stop" class="solr.TextField" indexed="true" stored="true">+ <analyzer type="index">+ <tokenizer class="solr.WhitespaceTokenizerFactory"/>+ <filter class="solr.CommonGramsFilterFactory"/>+ <filter class="solr.StopFilterFactory"/>+ </analyzer>+ <analyzer type="query">+ <tokenizer class="solr.WhitespaceTokenizerFactory"/>+ <filter class="solr.CommonGramsQueryFilterFactory"/>+ <filter class="solr.StopFilterFactory"/>+ </analyzer>+ </fieldType>+ <copyField source="*_commongrams" dest="*_commongrams_stop" />++ <fieldType name="severityType" class="${solr.tests.EnumFieldType}" enumsConfig="enumsConfig.xml" enumName="severity"/>++ <fieldType name="binary" class="solr.BinaryField" />+ <fieldType name="collation" class="solr.CollationField" language="en" />+ <fieldType name="externalFile" class="solr.ExternalFileField" />+ <fieldType name="icuCollation" class="solr.ICUCollationField" locale="en" />+ <fieldType name="latLonPointSpatial" class="solr.LatLonPointSpatialField" />+ <fieldType name="randomSort" class="solr.RandomSortField" />+ <fieldType name="point" class="solr.PointType" subFieldSuffix="_coordinate" />++ <fieldType name="sortable_text" class="solr.SortableTextField">+ <analyzer>+ <tokenizer class="solr.WhitespaceTokenizerFactory"/>+ </analyzer>+ </fieldType>+++ <field name="id" type="string" indexed="true" stored="${solr.tests.id.stored:true}" multiValued="false" required="false" docValues="${solr.tests.id.docValues:false}"/>+ <field name="_root_" type="string" indexed="true" stored="false"/>+ <field name="_nest_path_" type="_nest_path_" /><fieldType name="_nest_path_" class="solr.NestPathField"/>++ <field name="signatureField" type="string" indexed="true" stored="false"/>+ <field name="uuid" type="uuid" stored="true"/>+ <field name="name" type="nametext" indexed="true" stored="true"/>+ <field name="text" type="text" indexed="true" stored="false"/>+ <field name="subject" type="text" indexed="true" stored="true"/>+ <field name="title" type="nametext" indexed="true" stored="true"/>+ <field name="weight" type="float" indexed="true" stored="true" multiValued="false"/>+ <field name="bday" type="date" indexed="true" stored="true" multiValued="false"/>++ <field name="title_stemmed" type="text" indexed="true" stored="false"/>+ <field name="title_lettertok" type="lettertok" indexed="true" stored="false"/>++ <field name="syn" type="syn" indexed="true" stored="true"/>++ <!-- to test property inheritance and overriding -->+ <field name="shouldbeunstored" type="unstored"/>+ <field name="shouldbestored" type="unstored" stored="true"/>+ <field name="shouldbeunindexed" type="unstored" indexed="false" stored="true"/>++ <!-- Test spatial PointType -->+ <field name="home" type="xy" indexed="true" stored="true" multiValued="false"/>+ <field name="x" type="x" indexed="true" stored="true" multiValued="false"/>+ <field name="homed" type="xyd" indexed="true" stored="true" multiValued="false"/>+ <field name="home_ns" type="xy" indexed="true" stored="false" multiValued="false"/>+ <field name="work" type="xy" indexed="true" stored="true" multiValued="false"/>++ <!-- Test currency -->+ <field name="amount" type="currency" indexed="true" stored="true" multiValued="false"/>+ <field name="mock_amount" type="mock_currency" indexed="true" stored="true"/>+ <field name="oer_amount" type="oer_currency" indexed="true" stored="true"/>+ <field name="amount_CFT" type="currency_CFT" indexed="true" stored="true" multiValued="false"/>+ <field name="mock_amount_CFT" type="mock_currency_CFT" indexed="true" stored="true"/>+ <field name="oer_amount_CFT" type="oer_currency_CFT" indexed="true" stored="true"/>++ <!-- test different combinations of indexed and stored -->+ <field name="bind" type="boolean" indexed="true" stored="false"/>+ <field name="bsto" type="boolean" indexed="false" stored="true"/>+ <field name="bindsto" type="boolean" indexed="true" stored="true"/>+ <field name="isto" type="int" indexed="false" stored="true"/>+ <field name="iind" type="int" indexed="true" stored="false"/>+ <field name="ssto" type="string" indexed="false" stored="true"/>+ <field name="sind" type="string" indexed="true" stored="false"/>+ <field name="sindsto" type="string" indexed="true" stored="true"/>++ <!-- test combinations of term vector settings -->+ <field name="test_basictv" type="text" termVectors="true"/>+ <field name="test_notv" type="text" termVectors="false"/>+ <field name="test_postv" type="text" termVectors="true" termPositions="true"/>+ <field name="test_offtv" type="text" termVectors="true" termOffsets="true"/>+ <field name="test_posofftv" type="text" termVectors="true"+ termPositions="true" termOffsets="true"/>+ <field name="test_posoffpaytv" type="text_payload_tv" termVectors="true"+ termPositions="true" termOffsets="true" termPayloads="true"/>++ <!-- test highlit field settings -->+ <field name="test_hlt" type="highlittext" indexed="true"/>+ <field name="test_hlt_off" type="highlittext" indexed="true"/>++ <!-- fields to test individual tokenizers and tokenfilters -->+ <field name="teststop" type="teststop" indexed="true" stored="true"/>+ <field name="lowertok" type="lowerfilt" indexed="true" stored="true"/>+ <field name="keywordtok" type="keywordtok" indexed="true" stored="true"/>+ <field name="standardtok" type="standardtok" indexed="true" stored="true"/>+ <field name="HTMLstandardtok" type="HTMLstandardtok" indexed="true" stored="true"/>+ <field name="lettertok" type="lettertok" indexed="true" stored="true"/>+ <field name="whitetok" type="whitetok" indexed="true" stored="true"/>+ <field name="HTMLwhitetok" type="HTMLwhitetok" indexed="true" stored="true"/>+ <field name="standardtokfilt" type="standardtokfilt" indexed="true" stored="true"/>+ <field name="standardfilt" type="standardfilt" indexed="true" stored="true"/>+ <field name="lowerfilt" type="lowerfilt" indexed="true" stored="true"/>+ <field name="lowerfilt1" type="lowerfilt" indexed="true" stored="true"/>+ <field name="lowerfilt1and2" type="lowerfilt" indexed="true" stored="true"/>+ <field name="patterntok" type="patterntok" indexed="true" stored="true"/>+ <field name="patternreplacefilt" type="patternreplacefilt" indexed="true" stored="true"/>+ <field name="porterfilt" type="porterfilt" indexed="true" stored="true"/>+ <field name="engporterfilt" type="engporterfilt" indexed="true" stored="true"/>+ <field name="custengporterfilt" type="custengporterfilt" indexed="true" stored="true"/>+ <field name="stopfilt" type="stopfilt" indexed="true" stored="true"/>+ <field name="custstopfilt" type="custstopfilt" indexed="true" stored="true"/>+ <field name="lengthfilt" type="lengthfilt" indexed="true" stored="true"/>+ <field name="dedup" type="dedup" indexed="true" stored="true"/>+ <field name="wdf_nocase" type="wdf_nocase" indexed="true" stored="true"/>+ <field name="wdf_preserve" type="wdf_preserve" indexed="true" stored="true"/>++ <field name="numberpartfail" type="failtype1" indexed="true" stored="true"/>++ <field name="nullfirst" type="string" indexed="true" stored="true" sortMissingFirst="true" multiValued="false"/>++ <field name="dateRange" type="dateRange" multiValued="true"/>++ <field name="cat" type="string" indexed="true" stored="true" multiValued="true"/>+ <field name="price" type="float" indexed="true" stored="true" multiValued="false"/>+ <field name="inStock" type="boolean" indexed="true" stored="true"/>++ <field name="subword" type="subword" indexed="true" stored="true"/>+ <field name="subword_offsets" type="subword" indexed="true" stored="true" termVectors="true" termOffsets="true"/>+ <field name="numericsubword" type="numericsubword" indexed="true" stored="true"/>+ <field name="protectedsubword" type="protectedsubword" indexed="true" stored="true"/>++ <field name="sku1" type="skutype1" indexed="true" stored="true"/>+ <field name="sku2" type="skutype2" indexed="true" stored="true"/>++ <field name="textgap" type="textgap" indexed="true" stored="true"/>++ <field name="timestamp" type="date" indexed="true" stored="true" docValues="true" default="NOW" multiValued="false"/>+ <field name="multiDefault" type="string" indexed="true" stored="true" default="muLti-Default" multiValued="true"/>+ <field name="intDefault" type="int" indexed="true" stored="true" default="42" multiValued="false"/>+ <field name="intDvoDefault" type="int" indexed="false" stored="false" multiValued="false"+ useDocValuesAsStored="true" docValues="true" default="42" />+ <field name="intRemove" type="int" indexed="true" stored="true" multiValued="true"/>+ <field name="dateRemove" type="date" indexed="true" stored="true" multiValued="true"/>+ <field name="floatRemove" type="float" indexed="true" stored="true" multiValued="true"/>++ <field name="binaryRemove" type="binary" indexed="true" stored="true" multiValued="true"/>+ <field name="booleanRemove" type="boolean" indexed="true" stored="true" multiValued="true"/>+ <field name="collationRemove" type="collation" indexed="true" stored="true" multiValued="true"/>+ <field name="datePointRemove" type="pdate" indexed="true" stored="true" multiValued="true"/>+ <field name="dateRangeRemove" type="dateRange" indexed="true" stored="true" multiValued="true"/>+ <field name="doublePointRemove" type="pdouble" indexed="true" stored="true" multiValued="true"/>+ <field name="externalFileRemove" type="externalFile" indexed="true" stored="true" multiValued="true"/>+ <field name="floatPointRemove" type="pfloat" indexed="true" stored="true" multiValued="true"/>+ <field name="icuCollationRemove" type="icuCollation" indexed="true" stored="true" multiValued="true"/>+ <field name="intPointRemove" type="pint" indexed="true" stored="true" multiValued="true"/>+ <field name="latLonPointSpatialRemove" type="latLonPointSpatial" indexed="true" stored="true" multiValued="true"/>+ <field name="latLonRemove" type="location" indexed="true" stored="true" multiValued="true"/>+ <field name="longPointRemove" type="plong" indexed="true" stored="true" multiValued="true"/>+ <field name="point_0_coordinate" type="float" indexed="true" stored="true" multiValued="true"/>+ <field name="point_1_coordinate" type="float" indexed="true" stored="true" multiValued="true"/>+ <field name="pointRemove" type="point" indexed="true" stored="true" multiValued="true"/>+ <field name="randomSortRemove" type="randomSort" indexed="true" stored="true" multiValued="true"/>+ <field name="spatialRecursivePrefixTreeRemove" type="location_rpt" indexed="true" stored="true" multiValued="true"/>+ <field name="stringRemove" type="string" indexed="true" stored="true" multiValued="true"/>+ <field name="textRemove" type="text" indexed="true" stored="true" multiValued="true"/>+ <field name="uuidRemove" type="uuid" indexed="true" stored="true" multiValued="true"/>++ <field name="nopositionstext" type="nopositions" indexed="true" stored="true"/>++ <field name="tlong" type="tlong" indexed="true" stored="true"/>+ <field name="_version_" type="long" indexed="false" stored="false" docValues="true" multiValued="false" useDocValuesAsStored="true"/>++ <field name="title_stringNoNorms" type="string" omitNorms="true" indexed="true" stored="true"/>++ <field name="store" type="location" indexed="true" stored="true" docValues="true"/>++ <field name="lower" type="lowerfilt" indexed="false" stored="true" multiValued="true"/>+ <field name="_route_" type="string" indexed="true" stored="true" multiValued="false"/>++ <field name="payloadDelimited" type="payloadDelimited"/>++ <field name="sortabuse_not_uninvertible" type="string" indexed="true" multiValued="false" uninvertible="false" />++ <!-- EnumType -->+ <field name="severity" type="severityType" docValues="true" indexed="true" stored="true" multiValued="false"/>++ <field name="max_chars" type="string" indexed="false" stored="true"/>+ <field name="no_max_chars" type="string" indexed="false" stored="true"/>+ <field name="large_max_chars" type="string" indexed="false" stored="true"/>++ <!-- Dense Vector-->+ <field name="vector" type="knn_vector_cosine" indexed="true" stored="true"/>+ <field name="vector2" type="knn_vector_dot_product" indexed="true" stored="true"/>+ <field name="vector3" type="knn_vector_cosine" indexed="true" stored="true"/>+ <field name="vector4" type="knn_vector_cosine" indexed="true" stored="true"/>+ <field name="vector5" type="knn_vector5" indexed="true" stored="true"/>++ <!-- Dynamic field definitions. If a field name is not found, dynamicFields+ will be used if the name matches any of the patterns.+ RESTRICTION: the glob-like pattern in the name attribute must have+ a "*" only at the start or the end.+ EXAMPLE: name="*_i" will match any field ending in _i (like myid_i, z_i)+ Longer patterns will be matched first. if equal size patterns+ both match, the first appearing in the schema will be used.+ -->+ <dynamicField name="*_i" type="int" indexed="true" stored="true"/>+ <dynamicField name="*_i1" type="int" indexed="true" stored="true" multiValued="false" sortMissingLast="true"/>+ <dynamicField name="*_is" type="int" indexed="true" stored="true" multiValued="true" sortMissingLast="true"/>+ <dynamicField name="*_idv" type="int" indexed="true" stored="true" docValues="true" multiValued="false"/>+++ <dynamicField name="*_s" type="string" indexed="true" stored="true"/>+ <dynamicField name="*_s1" type="string" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_s1_ns" type="string" indexed="true" stored="false" multiValued="false"/>+ <dynamicField name="*_l" type="long" indexed="true" stored="true"/>+ <dynamicField name="*_l1" type="long" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_l1_ns" type="long" indexed="true" stored="false" multiValued="false"/>+ <dynamicField name="*_t" type="text" indexed="true" stored="true"/>+ <dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>+ <dynamicField name="*_b1" type="boolean" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_f" type="float" indexed="true" stored="true"/>+ <dynamicField name="*_f1" type="float" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_d" type="double" indexed="true" stored="true"/>+ <dynamicField name="*_d1" type="double" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_d1_dv" type="double" indexed="true" docValues="true" stored="true" multiValued="false"/>+ <dynamicField name="*_dt" type="date" indexed="true" stored="true"/>+ <dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/>+++ <!-- some trie-coded dynamic fields for faster range queries -->+ <dynamicField name="*_ti" type="tint" indexed="true" stored="true"/>+ <dynamicField name="*_ti1" type="tint" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_tl" type="tlong" indexed="true" stored="true"/>+ <dynamicField name="*_tl1" type="tlong" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_tf" type="tfloat" indexed="true" stored="true"/>+ <dynamicField name="*_tf1" type="tfloat" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>+ <dynamicField name="*_td1" type="tdouble" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_tds" type="tdouble" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>+ <dynamicField name="*_tdt1" type="tdate" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_tdtdv" type="tdatedv" indexed="true" stored="true"/>+ <dynamicField name="*_tdtdv1" type="tdatedv" indexed="true" stored="true" multiValued="false"/>+ <dynamicField name="*_drf" type="dateRange" indexed="true" stored="true"/>++ <dynamicField name="*_tdts" type="tdate" indexed="true" stored="true" multiValued="true"/>+ <dynamicField name="*_tdtdvs" type="tdatedv" indexed="true" stored="true"/>++ <dynamicField name="*_sI" type="string" indexed="true" stored="false"/>+ <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>+ <dynamicField name="t_*" type="text" indexed="true" stored="true"/>+ <dynamicField name="tv_*" type="text" indexed="true" stored="true"+ termVectors="true" termPositions="true" termOffsets="true"/>+ <dynamicField name="tv_mv_*" type="text" indexed="true" stored="true" multiValued="true"+ termVectors="true" termPositions="true" termOffsets="true"/>+ <dynamicField name="tv_no_off_*" type="text" indexed="true" stored="true"+ termVectors="true" termPositions="true"/>++ <dynamicField name="*_p" type="xyd" indexed="true" stored="true" multiValued="false"/>++ <!-- special fields for dynamic copyField test -->+ <dynamicField name="dynamic_*" type="string" indexed="true" stored="true"/>+ <dynamicField name="*_dynamic" type="string" indexed="true" stored="true"/>++ <!-- for testing to ensure that longer patterns are matched first -->+ <dynamicField name="*aa" type="string" indexed="true" stored="true"/>+ <dynamicField name="*aaa" type="int" indexed="false" stored="true"/>++ <!-- ignored becuase not stored or indexed -->+ <dynamicField name="*_ignored" type="text" indexed="false" stored="false"/>++ <dynamicField name="*_mfacet" type="string" indexed="true" stored="false" multiValued="true"/>++ <!-- Type used to index the components for the "point" FieldType -->+ <dynamicField name="*_coordinate" type="double" indexed="true" stored="false" omitNorms="true" docValues="false"/>++ <dynamicField name="*_path" type="path" indexed="true" stored="true" omitNorms="true" multiValued="true"/>+ <dynamicField name="*_ancestor" type="ancestor_path" indexed="true" stored="true" omitNorms="true"+ multiValued="true"/>++ <dynamicField name="*_sev_enum" type="severityType" indexed="true" stored="true" docValues="true" multiValued="true"/>++ <!-- With DocValues=true -->+ <dynamicField name="*_i_dv" type="int" indexed="true" stored="true" docValues="true"/>+ <dynamicField name="*_l_dv" type="long" indexed="true" stored="true" docValues="true"/>+ <dynamicField name="*_f_dv" type="float" indexed="true" stored="true" docValues="true"/>+ <dynamicField name="*_d_dv" type="double" indexed="true" stored="true" docValues="true"/>+ <dynamicField name="*_dt_dv" type="date" indexed="true" stored="true" docValues="true"/>+ <dynamicField name="*_f1_dv" type="float" indexed="true" stored="true" docValues="true" multiValued="false"/>++ <!-- Non-stored, DocValues=true -->+ <dynamicField name="*_i_dvo" multiValued="false" type="int" docValues="true" indexed="false" stored="false"+ useDocValuesAsStored="true"/>+ <dynamicField name="*_d_dvo" multiValued="false" type="double" docValues="true" indexed="false" stored="false"+ useDocValuesAsStored="true"/>+ <dynamicField name="*_s_dvo" multiValued="false" type="string" docValues="true" indexed="false" stored="false"+ useDocValuesAsStored="true"/>+ <dynamicField name="*_b_dvo" multiValued="false" type="boolean" docValues="true" indexed="false" stored="false"+ useDocValuesAsStored="true"/>+ <dynamicField name="*_l_dvo" multiValued="false" type="long" docValues="true" indexed="false" stored="false"+ useDocValuesAsStored="true"/>+ <dynamicField name="*_f_dvo" multiValued="false" type="float" docValues="true" indexed="false" stored="false"+ useDocValuesAsStored="true"/>+ <dynamicField name="*_dt_dvo" multiValued="false" type="date" docValues="true" indexed="false" stored="false"+ useDocValuesAsStored="true"/>++ <dynamicField name="*_ii_dvo" multiValued="true" type="int" docValues="true" indexed="false" stored="false"+ useDocValuesAsStored="true"/>+ <dynamicField name="*_dd_dvo" multiValued="true" type="double" docValues="true" indexed="false" stored="false"+ useDocValuesAsStored="true"/>++ <!-- Indexed, but NOT uninvertible -->+ <dynamicField name="*_s_not_uninvert" type="string" indexed="true" stored="false" docValues="false" uninvertible="false" />+ <!-- docValues, but NOT uninvertible -->+ <dynamicField name="*_s_not_uninvert_dv" type="string" indexed="true" stored="false" docValues="true" uninvertible="false" />++++ <!-- Only Stored numerics -->+ <dynamicField name="*_i_os" type="int" indexed="false" stored="true" docValues="false"/>+ <dynamicField name="*_l_os" type="long" indexed="false" stored="true" docValues="false"/>+ <dynamicField name="*_f_os" type="float" indexed="false" stored="true" docValues="false"/>+ <dynamicField name="*_d_os" type="double" indexed="false" stored="true" docValues="false"/>+ <dynamicField name="*_dt_os" type="date" indexed="false" stored="true" docValues="false"/>++ <!-- Non-stored, DocValues=true, useDocValuesAsStored=false -->+ <field name="single_i_dvn" multiValued="false" type="int" indexed="true" stored="true"/>+ <field name="single_d_dvn" multiValued="false" type="double" indexed="true" stored="true"/>+ <field name="single_s_dvn" multiValued="false" type="string" indexed="true" stored="true"/>+ <field name="copy_single_i_dvn" multiValued="false" type="int" docValues="true" indexed="true" stored="false"+ useDocValuesAsStored="false"/>+ <field name="copy_single_d_dvn" multiValued="false" type="double" docValues="true" indexed="true" stored="false"+ useDocValuesAsStored="false"/>+ <field name="copy_single_s_dvn" multiValued="false" type="string" docValues="true" indexed="true" stored="false"+ useDocValuesAsStored="false"/>++ <!-- Test point fields explicitly -->+ <dynamicField name="*_i_p" type="pint" indexed="true" stored="true" docValues="true" multiValued="false"/>+ <dynamicField name="*_is_p" type="pint" indexed="true" stored="true" docValues="true" multiValued="true"/>+ <dynamicField name="*_i_ni_p" type="pint" indexed="false" stored="true" docValues="true" multiValued="false"/>+ <dynamicField name="*_is_ni_p" type="pint" indexed="false" stored="true" docValues="true" multiValued="true"/>+ <dynamicField name="*_l_p" type="plong" indexed="true" stored="true" docValues="true" multiValued="false"/>+ <dynamicField name="*_ls_p" type="plong" indexed="true" stored="true" docValues="true" multiValued="true"/>+ <dynamicField name="*_l_ni_p" type="plong" indexed="false" stored="true" docValues="true" multiValued="false"/>+ <dynamicField name="*_ls_ni_p" type="plong" indexed="false" stored="true" docValues="true" multiValued="true"/>+ <dynamicField name="*_f_p" type="pfloat" indexed="true" stored="true" docValues="true" multiValued="false"/>+ <dynamicField name="*_fs_p" type="pfloat" indexed="true" stored="true" docValues="true" multiValued="true"/>+ <dynamicField name="*_f_ni_p" type="pfloat" indexed="false" stored="true" docValues="true" multiValued="false"/>+ <dynamicField name="*_fs_ni_p" type="pfloat" indexed="false" stored="true" docValues="true" multiValued="true"/>+ <dynamicField name="*_d_p" type="pdouble" indexed="true" stored="true" docValues="true" multiValued="false"/>+ <dynamicField name="*_ds_p" type="pdouble" indexed="true" stored="true" docValues="true" multiValued="true"/>+ <dynamicField name="*_d_ni_p" type="pdouble" indexed="false" stored="true" docValues="true" multiValued="false"/>+ <dynamicField name="*_ds_ni_p" type="pdouble" indexed="false" stored="true" docValues="true" multiValued="true"/>+ <dynamicField name="*_sortable" type="sortable_text" indexed="true" multiValued="false" stored="true" />++ <dynamicField name="*_date_p" type="pdate" indexed="true" stored="true" docValues="true" multiValued="false"/>+ <dynamicField name="*_dates_p" type="pdate" indexed="true" stored="true" docValues="true" multiValued="true"/>+ <dynamicField name="*_date_ni_p" type="pdate" indexed="false" stored="true" docValues="true" multiValued="false"/>+ <dynamicField name="*_dates_ni_p" type="pdate" indexed="false" stored="true" docValues="true" multiValued="true"/>++ <copyField source="single_i_dvn" dest="copy_single_i_dvn"/>+ <copyField source="single_d_dvn" dest="copy_single_d_dvn"/>+ <copyField source="single_s_dvn" dest="copy_single_s_dvn"/>++ <uniqueKey>id</uniqueKey>++ <!-- copyField commands copy one field to another at the time a document+ is added to the index. It's used either to index the same field different+ ways, or to add multiple fields to the same field for easier/faster searching.+ -->+ <copyField source="title" dest="title_stemmed"/>+ <copyField source="title" dest="title_lettertok"/>+ <copyField source="title" dest="title_stringNoNorms"/>++ <copyField source="title" dest="text"/>+ <copyField source="subject" dest="text"/>++ <copyField source="lowerfilt1" dest="lowerfilt1and2"/>+ <copyField source="lowerfilt" dest="lowerfilt1and2"/>++ <copyField source="*_t" dest="text"/>++ <copyField source="id" dest="range_facet_l"/>+ <copyField source="id" dest="id_i1"/>+ <copyField source="range_facet_f" dest="range_facet_d"/>+ <copyField source="range_facet_f1" dest="range_facet_f1_dv"/>++ <copyField source="id" dest="range_facet_l_dv"/>+ <copyField source="id" dest="range_facet_i_dv"/>+ <copyField source="range_facet_f" dest="range_facet_f_dv"/>+ <copyField source="range_facet_f" dest="range_facet_d_dv"/>+ <copyField source="bday" dest="range_facet_dt_dv"/>++ <copyField source="trait_s" dest="trait_s_not_uninvert"/>+ <copyField source="trait_s" dest="trait_s_not_uninvert_dv"/>+ <copyField source="trait_s" dest="trait_s_not_indexed_sS"/>++ <!-- dynamic destination -->+ <copyField source="*_dynamic" dest="dynamic_*"/>+ <copyField source="*_path" dest="*_ancestor"/>++ <copyField source="title" dest="max_chars" maxChars="10"/>+ <copyField source="title" dest="no_max_chars" />+ <copyField source="title" dest="large_max_chars" maxChars="10000"/>+ <copyField source="vector" dest="vector2"/>+ <copyField source="vector3" dest="vector_f_p"/>+ <copyField source="vector4" dest="vector5"/>++ <!-- example of a custom similarity -->+ <similarity class="solr.CustomSimilarityFactory">+ <str name="echo">I am your default sim</str>+ </similarity>+</schema>diff --git a/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xmlnew file mode 100644index 00000000000..44d64e1e119--- /dev/null+++ b/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml@@ -0,0 +1,532 @@+<?xml version="1.0" ?>++<!--+ Licensed to the Apache Software Foundation (ASF) under one or more+ contributor license agreements. See the NOTICE file distributed with+ this work for additional information regarding copyright ownership.+ The ASF licenses this file to You under the Apache License, Version 2.0+ (the "License"); you may not use this file except in compliance with+ the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing, software+ distributed under the License is distributed on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ See the License for the specific language governing permissions and+ limitations under the License.+-->++<!-- This is a "kitchen sink" config file that tests can use.+ When writting a new test, feel free to add *new* items (plugins,+ config options, etc...) as long as they don't break any existing+ tests. if you need to test something esoteric please add a new+ "solrconfig-your-esoteric-purpose.xml" config file.++ Note in particular that this test is used by MinimalSchemaTest so+ Anything added to this file needs to work correctly even if there+ is now uniqueKey or defaultSearch Field.+ -->++<config>++ <!-- Used to specify an alternate directory to hold all index data.+ It defaults to "index" if not present, and should probably+ not be changed if replication is in use. -->+ <dataDir>${solr.data.dir:}</dataDir>++ <!-- The DirectoryFactory to use for indexes.+ solr.StandardDirectoryFactory, the default, is filesystem based.+ solr.RAMDirectoryFactory is memory based and not persistent. -->+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}">+ <double name="maxWriteMBPerSecDefault">1000000</double>+ <double name="maxWriteMBPerSecFlush">2000000</double>+ <double name="maxWriteMBPerSecMerge">3000000</double>+ <double name="maxWriteMBPerSecRead">4000000</double>+ <str name="solr.hdfs.home">${solr.hdfs.home:}</str>+ <bool name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>+ <bool name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:true}</bool>+ <bool name="solr.hdfs.blockcache.write.enabled">${solr.hdfs.blockcache.write.enabled:false}</bool>+ <int name="solr.hdfs.blockcache.blocksperbank">${solr.hdfs.blockcache.blocksperbank:10}</int>+ <int name="solr.hdfs.blockcache.slab.count">${solr.hdfs.blockcache.slab.count:1}</int>+ </directoryFactory>++ <schemaFactory class="ClassicIndexSchemaFactory"/>++ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>++ <statsCache class="${solr.statsCache:}"/>++ <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>++ <updateHandler class="solr.DirectUpdateHandler2">++ <autoCommit>+ <maxTime>${solr.autoCommit.maxTime:-1}</maxTime>+ </autoCommit>++ <!-- autocommit pending docs if certain criteria are met+ <autoCommit>+ <maxDocs>10000</maxDocs>+ <maxTime>3600000</maxTime>+ </autoCommit>+ -->++ <updateLog enable="${enable.update.log:true}">+ <str name="dir">${solr.ulog.dir:}</str>+ </updateLog>++ <commitWithin>+ <softCommit>${solr.commitwithin.softcommit:true}</softCommit>+ </commitWithin>++ </updateHandler>++ <query>+ <!-- Maximum number of clauses in a boolean query... can affect+ range or wildcard queries that expand to big boolean+ queries. An exception is thrown if exceeded.+ -->+ <maxBooleanClauses>${solr.max.booleanClauses:1024}</maxBooleanClauses>++ <!-- Cache specification for Filters or DocSets - unordered set of *all* documents+ that match a particular query.+ -->+ <filterCache+ size="512"+ initialSize="512"+ autowarmCount="2"+ async="${solr.filterCache.async:false}"/>++ <queryResultCache+ size="512"+ initialSize="512"+ autowarmCount="2"/>++ <documentCache+ size="512"+ initialSize="512"+ autowarmCount="0"/>++ <cache name="perSegFilter"+ class="solr.CaffeineCache"+ size="10"+ initialSize="0"+ autowarmCount="10" />++ <!-- If true, stored fields that are not requested will be loaded lazily.+ -->+ <enableLazyFieldLoading>true</enableLazyFieldLoading>++ <!--++ <cache name="myUserCache"+ size="4096"+ initialSize="1024"+ autowarmCount="1024"+ regenerator="MyRegenerator"+ />+ -->++ <!--+ <useFilterForSortedQuery>true</useFilterForSortedQuery>+ -->++ <queryResultWindowSize>10</queryResultWindowSize>++ <!-- boolToFilterOptimizer converts boolean clauses with zero boost+ into cached filters if the number of docs selected by the clause exceeds+ the threshold (represented as a fraction of the total index)+ -->+ <boolTofilterOptimizer enabled="false" cacheSize="32" threshold=".05"/>++ <!-- a newSearcher event is fired whenever a new searcher is being prepared+ and there is a current searcher handling requests (aka registered). -->+ <!-- QuerySenderListener takes an array of NamedList and executes a+ local query request for each NamedList in sequence. -->+ <!--+ <listener event="newSearcher" class="solr.QuerySenderListener">+ <arr name="queries">+ <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>+ <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>+ </arr>+ </listener>+ -->++ <!-- a firstSearcher event is fired whenever a new searcher is being+ prepared but there is no current registered searcher to handle+ requests or to gain prewarming data from. -->+ <!--+ <listener event="firstSearcher" class="solr.QuerySenderListener">+ <arr name="queries">+ <lst> <str name="q">fast_warm</str> <str name="start">0</str> <str name="rows">10</str> </lst>+ </arr>+ </listener>+ -->++ <slowQueryThresholdMillis>2000</slowQueryThresholdMillis>++ </query>++ <queryResponseWriter name="xml" default="true"+ class="solr.XMLResponseWriter" />++ <!-- requestHandler plugins+ -->+ <requestHandler name="/select" class="solr.SearchHandler">+ <bool name="httpCaching">true</bool>+ </requestHandler>++ <requestHandler name="/dismax" class="solr.SearchHandler" >+ <lst name="defaults">+ <str name="defType">dismax</str>+ <str name="q.alt">*:*</str>+ <float name="tie">0.01</float>+ <str name="qf">+ text^0.5 features_t^1.0 subject^1.4 title_stemmed^2.0+ </str>+ <str name="pf">+ text^0.2 features_t^1.1 subject^1.4 title_stemmed^2.0 title^1.5+ </str>+ <str name="bf">+ weight^0.5 recip(rord(id),1,1000,1000)^0.3+ </str>+ <str name="mm">+ 3<-1 5<-2 6<90%+ </str>+ <int name="ps">100</int>+ </lst>+ </requestHandler>++ <requestHandler name="/mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>++ <!-- test query parameter defaults -->+ <requestHandler name="/defaults" class="solr.SearchHandler">+ <lst name="defaults">+ <int name="rows">4</int>+ <bool name="hl">true</bool>+ <str name="hl.fl">text,name,subject,title,whitetok</str>+ </lst>+ </requestHandler>++ <!-- test query parameter defaults -->+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">+ <lst name="defaults">+ <int name="rows">4</int>+ <bool name="hl">true</bool>+ <str name="hl.fl">text,name,subject,title,whitetok</str>+ </lst>+ </requestHandler>++++ <searchComponent name="spellcheck" class="org.apache.solr.handler.component.SpellCheckComponent">+ <!-- This is slightly different from the field value so we can test dealing with token offset changes -->+ <str name="queryAnalyzerFieldType">lowerpunctfilt</str>++ <lst name="spellchecker">+ <str name="name">default</str>+ <str name="field">lowerfilt</str>+ <str name="spellcheckIndexDir">spellchecker1</str>+ <str name="buildOnCommit">false</str>+ </lst>+ <lst name="spellchecker">+ <str name="name">direct</str>+ <str name="classname">DirectSolrSpellChecker</str>+ <str name="field">lowerfilt</str>+ <int name="minQueryLength">3</int>+ </lst>+ <lst name="spellchecker">+ <str name="name">directMQF2</str>+ <str name="classname">DirectSolrSpellChecker</str>+ <str name="field">lowerfilt</str>+ <int name="minQueryLength">3</int>+ <int name="maxQueryFrequency">2</int>+ </lst>+ <lst name="spellchecker">+ <str name="name">wordbreak</str>+ <str name="classname">solr.WordBreakSolrSpellChecker</str>+ <str name="field">lowerfilt</str>+ <str name="combineWords">true</str>+ <str name="breakWords">true</str>+ <int name="maxChanges">10</int>+ </lst>+ <lst name="spellchecker">+ <str name="name">multipleFields</str>+ <str name="field">lowerfilt1and2</str>+ <str name="spellcheckIndexDir">spellcheckerMultipleFields</str>+ <str name="buildOnCommit">false</str>+ </lst>+ <!-- Example of using different distance measure -->+ <lst name="spellchecker">+ <str name="name">jarowinkler</str>+ <str name="field">lowerfilt</str>+ <!-- Use a different Distance Measure -->+ <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str>+ <str name="spellcheckIndexDir">spellchecker2</str>++ </lst>+ <lst name="spellchecker">+ <str name="classname">solr.FileBasedSpellChecker</str>+ <str name="name">external</str>+ <str name="sourceLocation">spellings.txt</str>+ <str name="characterEncoding">UTF-8</str>+ <str name="spellcheckIndexDir">spellchecker3</str>+ </lst>+ <!-- Comparator -->+ <lst name="spellchecker">+ <str name="name">freq</str>+ <str name="field">lowerfilt</str>+ <str name="spellcheckIndexDir">spellcheckerFreq</str>+ <!-- comparatorClass be one of:+ 1. score (default)+ 2. freq (Frequency first, then score)+ 3. A fully qualified class name+ -->+ <str name="comparatorClass">freq</str>+ <str name="buildOnCommit">false</str>+ </lst>+ <lst name="spellchecker">+ <str name="name">fqcn</str>+ <str name="field">lowerfilt</str>+ <str name="spellcheckIndexDir">spellcheckerFQCN</str>+ <str name="comparatorClass">org.apache.solr.spelling.SampleComparator</str>+ <str name="buildOnCommit">false</str>+ </lst>+ <lst name="spellchecker">+ <str name="name">perDict</str>+ <str name="classname">org.apache.solr.handler.component.DummyCustomParamSpellChecker</str>+ <str name="field">lowerfilt</str>+ </lst>+ </searchComponent>++ <!-- This is now part of the implicit configuration together with terms=true and distrib=false defaults+ <searchComponent name="termsComp" class="org.apache.solr.handler.component.TermsComponent"/>++ <requestHandler name="/terms" class="org.apache.solr.handler.component.SearchHandler">+ <arr name="components">+ <str>termsComp</str>+ </arr>+ </requestHandler>+ -->+++ <!--+ The SpellingQueryConverter to convert raw (CommonParams.Q) queries into tokens. Uses a simple regular expression+ to strip off field markup, boosts, ranges, etc. but it is not guaranteed to match an exact parse from the query parser.+ -->+ <queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/>++ <requestHandler name="/spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler">+ <lst name="defaults">+ <!-- omp = Only More Popular -->+ <str name="spellcheck.onlyMorePopular">false</str>+ <!-- exr = Extended Results -->+ <str name="spellcheck.extendedResults">false</str>+ <!-- The number of suggestions to return -->+ <str name="spellcheck.count">1</str>+ </lst>+ <arr name="last-components">+ <str>spellcheck</str>+ </arr>+ </requestHandler>+ <requestHandler name="/spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler">+ <lst name="defaults">+ <str name="spellcheck.dictionary">direct</str>+ <str name="spellcheck.onlyMorePopular">false</str>+ <str name="spellcheck.extendedResults">false</str>+ <str name="spellcheck.count">1</str>+ </lst>+ <arr name="last-components">+ <str>spellcheck</str>+ </arr>+ </requestHandler>+ <requestHandler name="/spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler">+ <lst name="defaults">+ <str name="spellcheck.dictionary">default</str>+ <str name="spellcheck.dictionary">wordbreak</str>+ <str name="spellcheck.count">20</str>+ </lst>+ <arr name="last-components">+ <str>spellcheck</str>+ </arr>+ </requestHandler>+ <requestHandler name="/spellCheckWithWordbreak_Direct" class="org.apache.solr.handler.component.SearchHandler">+ <lst name="defaults">+ <str name="spellcheck.dictionary">direct</str>+ <str name="spellcheck.dictionary">wordbreak</str>+ <str name="spellcheck.count">20</str>+ </lst>+ <arr name="last-components">+ <str>spellcheck</str>+ </arr>+ </requestHandler>+ <requestHandler name="/spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler">+ <lst name="defaults">+ <str name="defType">dismax</str>+ <str name="qf">lowerfilt1^1</str>+ </lst>+ <arr name="last-components">+ <str>spellcheck</str>+ </arr>+ </requestHandler>++ <requestHandler name="/mltrh" class="org.apache.solr.handler.component.SearchHandler">++ </requestHandler>++ <searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/>++ <requestHandler name="/tvrh" class="org.apache.solr.handler.component.SearchHandler">+ <lst name="defaults">++ </lst>+ <arr name="last-components">+ <str>tvComponent</str>+ </arr>+ </requestHandler>++ <requestHandler name="/mlt" class="solr.MoreLikeThisHandler">+ </requestHandler>++ <searchComponent class="solr.HighlightComponent" name="highlight">+ <highlighting>+ <!-- Configure the standard fragmenter -->+ <fragmenter name="gap" class="org.apache.solr.highlight.GapFragmenter" default="true">+ <lst name="defaults">+ <int name="hl.fragsize">100</int>+ </lst>+ </fragmenter>++ <fragmenter name="regex" class="org.apache.solr.highlight.RegexFragmenter">+ <lst name="defaults">+ <int name="hl.fragsize">70</int>+ </lst>+ </fragmenter>++ <!-- Configure the standard formatter -->+ <formatter name="html" class="org.apache.solr.highlight.HtmlFormatter" default="true">+ <lst name="defaults">+ <str name="hl.simple.pre"><![CDATA[<em>]]></str>+ <str name="hl.simple.post"><![CDATA[</em>]]></str>+ </lst>+ </formatter>++ <!-- Configure the standard fragListBuilder -->+ <fragListBuilder name="simple" class="org.apache.solr.highlight.SimpleFragListBuilder" default="true"/>++ <!-- Configure the standard fragmentsBuilder -->+ <fragmentsBuilder name="simple" class="org.apache.solr.highlight.SimpleFragmentsBuilder" default="true"/>+ <fragmentsBuilder name="scoreOrder" class="org.apache.solr.highlight.ScoreOrderFragmentsBuilder"/>++ <boundaryScanner name="simple" class="solr.highlight.SimpleBoundaryScanner" default="true">+ <lst name="defaults">+ <str name="hl.bs.maxScan">10</str>+ <str name="hl.bs.chars">.,!? 	 </str>+ </lst>+ </boundaryScanner>++ <boundaryScanner name="breakIterator" class="solr.highlight.BreakIteratorBoundaryScanner">+ <lst name="defaults">+ <str name="hl.bs.type">WORD</str>+ <str name="hl.bs.language">en</str>+ <str name="hl.bs.country">US</str>+ </lst>+ </boundaryScanner>+ </highlighting>+ </searchComponent>++ <requestDispatcher>+ <requestParsers enableRemoteStreaming="true" enableStreamBody="true" multipartUploadLimitInKB="-1" />+ <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">+ <cacheControl>max-age=30, public</cacheControl>+ </httpCaching>+ </requestDispatcher>++ <requestHandler name="/search-facet-def" class="solr.SearchHandler" >+ <lst name="defaults">+ <str name="facet.field">foo_s</str>+ </lst>+ <lst name="appends">+ <str name="facet.query">foo_s:bar</str>+ </lst>+ </requestHandler>+ <requestHandler name="/search-facet-invariants" class="solr.SearchHandler" >+ <lst name="invariants">+ <str name="facet.field">foo_s</str>+ <str name="facet.query">foo_s:bar</str>+ </lst>+ </requestHandler>++ <!-- test getting system property -->+ <propTest attr1="${solr.test.sys.prop1}-$${literal}"+ attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix</propTest>++ <queryParser name="foo" class="FooQParserPlugin"/>++ <updateRequestProcessorChain name="uniq-fields">+ <processor class="org.apache.solr.update.processor.UniqFieldsUpdateProcessorFactory">+ <arr name="fieldName">+ <str>uniq</str>+ <str>uniq2</str>+ <str>uniq3</str>+ </arr>+ </processor>+ <processor class="solr.RunUpdateProcessorFactory" />+ </updateRequestProcessorChain>++ <updateRequestProcessorChain name="distrib-dup-test-chain-explicit">+ <!-- explicit test using processors before and after distrib -->+ <processor class="solr.RegexReplaceProcessorFactory">+ <str name="fieldName">regex_dup_A_s</str>+ <str name="pattern">x</str>+ <str name="replacement">x_x</str>+ </processor>+ <processor class="solr.DistributedUpdateProcessorFactory" />+ <processor class="solr.RegexReplaceProcessorFactory">+ <str name="fieldName">regex_dup_B_s</str>+ <str name="pattern">x</str>+ <str name="replacement">x_x</str>+ </processor>+ <processor class="solr.RunUpdateProcessorFactory" />+ </updateRequestProcessorChain>++ <updateRequestProcessorChain name="distrib-dup-test-chain-implicit">+ <!-- implicit test w/o distrib declared-->+ <processor class="solr.RegexReplaceProcessorFactory">+ <str name="fieldName">regex_dup_A_s</str>+ <str name="pattern">x</str>+ <str name="replacement">x_x</str>+ </processor>+ <processor class="solr.RegexReplaceProcessorFactory">+ <str name="fieldName">regex_dup_B_s</str>+ <str name="pattern">x</str>+ <str name="replacement">x_x</str>+ </processor>+ <processor class="solr.RunUpdateProcessorFactory" />+ </updateRequestProcessorChain>++ <restManager>+ <!--+ IMPORTANT: Due to the Lucene SecurityManager, tests can only write to their runtime directory or below.+ But it's easier to just keep everything in memory for testing so no remnants are left behind.+ -->+ <str name="storageIO">org.apache.solr.rest.ManagedResourceStorage$InMemoryStorageIO</str>+ </restManager>++ <!-- warning: not a best practice; requests generally ought to be explicit to thus not require this -->+ <initParams path="/select,/dismax,/defaults,/lazy,/spellCheckCompRH,/spellCheckWithWordbreak,/spellCheckCompRH_Direct,/spellCheckCompRH1,/mltrh,/tvrh,/search-facet-def,/search-facet-invariants">+ <lst name="defaults">+ <str name="df">text</str>+ </lst>+ </initParams>++ <transformer name="explain1" class="org.apache.solr.response.transform.ExplainAugmenterFactory" />+ <transformer name="explainText" class="org.apache.solr.response.transform.ExplainAugmenterFactory" >+ <str name="args">text</str>+ </transformer>+ <transformer name="explainNL" class="org.apache.solr.response.transform.ExplainAugmenterFactory" >+ <str name="args">nl</str>+ </transformer>++</config>diff --git a/solr/test-framework/src/test-files/solr/configsets/minimal/conf/schema.xml b/solr/test-framework/src/test-files/solr/configsets/minimal/conf/schema.xmlnew file mode 100644index 00000000000..287d4fe0149--- /dev/null+++ b/solr/test-framework/src/test-files/solr/configsets/minimal/conf/schema.xml@@ -0,0 +1,21 @@+<?xml version="1.0" encoding="UTF-8" ?>+<!--+ Licensed to the Apache Software Foundation (ASF) under one or more+ contributor license agreements. See the NOTICE file distributed with+ this work for additional information regarding copyright ownership.+ The ASF licenses this file to You under the Apache License, Version 2.0+ (the "License"); you may not use this file except in compliance with+ the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing, software+ distributed under the License is distributed on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ See the License for the specific language governing permissions and+ limitations under the License.+-->+<schema name="minimal" version="1.1">+ <fieldType name="string" class="solr.StrField"/>+ <dynamicField name="*" type="string" indexed="true" stored="true"/>+</schema>diff --git a/solr/test-framework/src/test-files/solr/configsets/minimal/conf/solrconfig.xml b/solr/test-framework/src/test-files/solr/configsets/minimal/conf/solrconfig.xmlnew file mode 100644index 00000000000..346b0448318--- /dev/null+++ b/solr/test-framework/src/test-files/solr/configsets/minimal/conf/solrconfig.xml@@ -0,0 +1,47 @@+<?xml version="1.0" ?>++<!--+ Licensed to the Apache Software Foundation (ASF) under one or more+ contributor license agreements. See the NOTICE file distributed with+ this work for additional information regarding copyright ownership.+ The ASF licenses this file to You under the Apache License, Version 2.0+ (the "License"); you may not use this file except in compliance with+ the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing, software+ distributed under the License is distributed on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ See the License for the specific language governing permissions and+ limitations under the License.+-->++<!-- Minimal solrconfig.xml with /select, /admin and /update only -->++<config>++ <dataDir>${solr.data.dir:}</dataDir>++ <directoryFactory name="DirectoryFactory"+ class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>+ <schemaFactory class="ClassicIndexSchemaFactory"/>++ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>++ <updateHandler class="solr.DirectUpdateHandler2">+ <commitWithin>+ <softCommit>${solr.commitwithin.softcommit:true}</softCommit>+ </commitWithin>++ </updateHandler>+ <requestHandler name="/select" class="solr.SearchHandler">+ <lst name="defaults">+ <str name="echoParams">explicit</str>+ <str name="indent">true</str>+ <str name="df">text</str>+ </lst>++ </requestHandler>+</config>+diff --git a/solr/test-framework/src/test/org/apache/solr/cloud/JettySolrRunnerTest.java b/solr/test-framework/src/test/org/apache/solr/cloud/JettySolrRunnerTest.javaindex f3f13cac420..fe125545fa1 100644--- a/solr/test-framework/src/test/org/apache/solr/cloud/JettySolrRunnerTest.java+++ b/solr/test-framework/src/test/org/apache/solr/cloud/JettySolrRunnerTest.java@@ -24,8 +24,8 @@ import java.nio.charset.Charset;import java.nio.file.Files;import java.nio.file.Path;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.embedded.JettyConfig;-import org.apache.solr.client.solrj.embedded.JettySolrRunner;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.hamcrest.MatcherAssert;import org.junit.Test;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 c4fc1ec5150..26024ff548d 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@@ -26,10 +26,10 @@ import java.util.Properties;import java.util.concurrent.atomic.AtomicInteger;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;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.core.SolrCore;+import org.apache.solr.embedded.JettyConfig;+import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.RevertDefaultThreadHandlerRule;import org.junit.ClassRule;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestJettySolrRunner.java b/solr/test-framework/src/test/org/apache/solr/embedded/TestJettySolrRunner.javasimilarity index 98%rename from solr/core/src/test/org/apache/solr/client/solrj/embedded/TestJettySolrRunner.javarename to solr/test-framework/src/test/org/apache/solr/embedded/TestJettySolrRunner.javaindex 4df108fb422..2fc1299a734 100644--- a/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestJettySolrRunner.java+++ b/solr/test-framework/src/test/org/apache/solr/embedded/TestJettySolrRunner.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.embedded;+package org.apache.solr.embedded;import java.io.IOException;import java.net.BindException;diff --git a/solr/webapp/build.gradle b/solr/webapp/build.gradleindex 5b26ac6fcfd..d0074eed77d 100644--- a/solr/webapp/build.gradle+++ b/solr/webapp/build.gradle@@ -25,19 +25,15 @@ description = 'Solr webapp'configurations {war {}serverLib- libExt- solrJettyClientLibsolrCore}dependencies {permitUnusedDeclared project(":solr:core")- libExt project(path: ":solr:server", configuration: "libExt")+ serverLib project(path: ":solr:server", configuration: "libExt")serverLib project(path: ":solr:server", configuration: "serverLib")solrCore project(":solr:core")- solrJettyClientLib project(path: ":solr:core", configuration: "jettyClientImplementation")- // Make sure we keep the duplicate solrJettyClientLibs, but we want to remove all of the logging and metrics jars already in libExt- implementation(configurations.solrCore - configurations.serverLib + configurations.solrJettyClientLib - configurations.libExt)+ implementation(configurations.solrCore - configurations.serverLib)}war {