Apache Solr open-source search software
Tests: JettyConfig.Builder.sslConfig now self inits (#2318)
David Smiley8bfab45afa47
diff --git a/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java b/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.javaindex d469c532328..2c69a823a50 100644--- a/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java+++ b/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java@@ -24,6 +24,7 @@ import java.util.Properties;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.JettyConfig;import org.junit.BeforeClass;/**@@ -73,7 +74,7 @@ public class TestSolrCoreProperties extends SolrJettyTestBase {nodeProperties.setProperty("solr.data.dir", createTempDir().toFile().getCanonicalPath());}- solrClientTestRule.startSolr(homeDir, nodeProperties, buildJettyConfig());+ solrClientTestRule.startSolr(homeDir, nodeProperties, JettyConfig.builder().build());// createJetty(homeDir.getAbsolutePath(), null, null);}diff --git a/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java b/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.javaindex 7505c32a7bc..504bfd94fac 100644--- a/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java@@ -24,6 +24,7 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.common.util.IOUtils;+import org.apache.solr.embedded.JettyConfig;import org.junit.After;import org.junit.Before;import org.junit.Test;@@ -44,7 +45,7 @@ public class ConcurrentCreateRoutedAliasTest extends SolrTestCaseJ4 {@Beforepublic void setUp() throws Exception {super.setUp();- solrCluster = new MiniSolrCloudCluster(4, createTempDir(), buildJettyConfig());+ solrCluster = new MiniSolrCloudCluster(4, createTempDir(), JettyConfig.builder().build());}@Overridediff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.javaindex 2920e4ece52..8ffa0292bee 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java@@ -26,6 +26,7 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.request.ConfigSetAdminRequest;import org.apache.solr.client.solrj.request.ConfigSetAdminRequest.Create;import org.apache.solr.client.solrj.request.ConfigSetAdminRequest.Delete;+import org.apache.solr.embedded.JettyConfig;import org.junit.After;import org.junit.Before;import org.junit.Test;@@ -49,7 +50,7 @@ public class TestConfigSetsAPIExclusivity extends SolrTestCaseJ4 {@Beforepublic void setUp() throws Exception {super.setUp();- solrCluster = new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig());+ solrCluster = new MiniSolrCloudCluster(1, createTempDir(), JettyConfig.builder().build());}@Overridediff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.javaindex 2ba85cfa437..368d33d0098 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java@@ -43,6 +43,7 @@ import org.apache.solr.common.cloud.SolrZkClient;import org.apache.solr.common.util.Utils;import org.apache.solr.core.ConfigSetProperties;import org.apache.solr.core.ConfigSetService;+import org.apache.solr.embedded.JettyConfig;import org.apache.zookeeper.KeeperException;import org.apache.zookeeper.KeeperException.NoNodeException;import org.apache.zookeeper.Watcher;@@ -86,7 +87,7 @@ public class TestConfigSetsAPIZkFailure extends SolrTestCaseJ4 {1,testDir,MiniSolrCloudCluster.DEFAULT_CLOUD_SOLR_XML,- buildJettyConfig(),+ JettyConfig.builder().build(),zkTestServer,true);}diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java b/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.javaindex 06fca2452c7..a4854134f93 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java@@ -21,6 +21,7 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;+import org.apache.solr.embedded.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.junit.Test;@@ -34,7 +35,7 @@ public class TestRequestForwarding extends SolrTestCaseJ4 {super.setUp();System.setProperty("solr.test.sys.prop1", "propone");System.setProperty("solr.test.sys.prop2", "proptwo");- solrCluster = new MiniSolrCloudCluster(3, createTempDir(), buildJettyConfig());+ solrCluster = new MiniSolrCloudCluster(3, createTempDir(), JettyConfig.builder().build());solrCluster.uploadConfigSet(TEST_PATH().resolve("collection1/conf"), "conf1");}diff --git a/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java b/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.javaindex caf3467cc89..9b8b2fa31f2 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java@@ -32,6 +32,7 @@ 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.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -42,7 +43,7 @@ public class TestWaitForStateWithJettyShutdowns extends SolrTestCaseJ4 {public void testWaitForStateAfterShutDown() throws Exception {final String col_name = "test_col";final MiniSolrCloudCluster cluster =- new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig());+ new MiniSolrCloudCluster(1, createTempDir(), JettyConfig.builder().build());try {log.info("Create our collection");CollectionAdminRequest.createCollection(col_name, "_default", 1, 1)@@ -76,7 +77,7 @@ public class TestWaitForStateWithJettyShutdowns extends SolrTestCaseJ4 {ExecutorUtil.newMDCAwareFixedThreadPool(1, new SolrNamedThreadFactory("background_executor"));final MiniSolrCloudCluster cluster =- new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig());+ new MiniSolrCloudCluster(1, createTempDir(), JettyConfig.builder().build());try {log.info("Create our collection");CollectionAdminRequest.createCollection(col_name, "_default", 1, 1)diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.javaindex 98937a4395b..b87d9af578d 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java@@ -29,6 +29,7 @@ import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.util.IOUtils;import org.apache.solr.common.util.TimeSource;+import org.apache.solr.embedded.JettyConfig;import org.apache.solr.util.TimeOut;import org.junit.After;import org.junit.Before;@@ -46,7 +47,7 @@ public class ConcurrentDeleteAndCreateCollectionTest extends SolrTestCaseJ4 {@Beforepublic void setUp() throws Exception {super.setUp();- solrCluster = new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig());+ solrCluster = new MiniSolrCloudCluster(1, createTempDir(), JettyConfig.builder().build());}@Overridediff --git a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.javaindex bb7b2c730e6..ae2fbae833e 100644--- a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java@@ -31,6 +31,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.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;@@ -169,7 +170,7 @@ public class PingRequestHandlerTest extends SolrTestCaseJ4 {public void testPingInClusterWithNoHealthCheck() throws Exception {MiniSolrCloudCluster miniCluster =- new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), buildJettyConfig());+ new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), JettyConfig.builder().build());final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();diff --git a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.javaindex 3ba2be501b3..b3fb16312c6 100644--- a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java+++ b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java@@ -24,6 +24,7 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.common.util.NamedList;+import org.apache.solr.embedded.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.junit.Test;@@ -37,7 +38,7 @@ public class V2StandaloneTest extends SolrTestCaseJ4 {Files.copy(Path.of(TEST_HOME(), "solr.xml"), solrHomeTmp.resolve("solr.xml"));JettySolrRunner jetty =- new JettySolrRunner(solrHomeTmp.toAbsolutePath().toString(), buildJettyConfig());+ new JettySolrRunner(solrHomeTmp.toAbsolutePath().toString(), JettyConfig.builder().build());jetty.start();try (SolrClient client = getHttpSolrClient(buildUrl(jetty.getLocalPort()))) {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 68a31ca6879..8a1bafde030 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@@ -42,6 +42,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.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.response.SolrQueryResponse;import org.junit.BeforeClass;@@ -301,7 +302,8 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {Files.writeString(renamePropFile, "", StandardCharsets.UTF_8);JettySolrRunner runner =- new JettySolrRunner(solrHomeDirectory.toAbsolutePath().toString(), buildJettyConfig());+ new JettySolrRunner(+ solrHomeDirectory.toAbsolutePath().toString(), JettyConfig.builder().build());runner.start();try (SolrClient client =@@ -374,7 +376,8 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {Path corex = solrHomeDirectory.resolve("corex");Files.writeString(corex.resolve("core.properties"), "", StandardCharsets.UTF_8);JettySolrRunner runner =- new JettySolrRunner(solrHomeDirectory.toAbsolutePath().toString(), buildJettyConfig());+ new JettySolrRunner(+ solrHomeDirectory.toAbsolutePath().toString(), JettyConfig.builder().build());runner.start();try (SolrClient client =@@ -438,7 +441,8 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {Path corex = solrHomeDirectory.resolve("corex");Files.writeString(corex.resolve("core.properties"), "", StandardCharsets.UTF_8);JettySolrRunner runner =- new JettySolrRunner(solrHomeDirectory.toAbsolutePath().toString(), buildJettyConfig());+ new JettySolrRunner(+ solrHomeDirectory.toAbsolutePath().toString(), JettyConfig.builder().build());runner.start();try (SolrClient client =diff --git a/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java b/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.javaindex 895653ce033..b7f82ac616b 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java@@ -33,6 +33,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.TimeSource;+import org.apache.solr.embedded.JettyConfig;import org.apache.solr.util.TimeOut;import org.junit.After;import org.junit.Before;@@ -65,7 +66,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {@Beforepublic void setUp() throws Exception {super.setUp();- cluster = new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig());+ cluster = new MiniSolrCloudCluster(1, createTempDir(), JettyConfig.builder().build());url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + CHECKPOINT_COLL;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 0177e58a94c..bfb3608cf13 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@@ -36,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.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.junit.BeforeClass;import org.junit.Test;@@ -125,7 +126,7 @@ public class SearchHandlerTest extends SolrTestCaseJ4 {@Testpublic void testZkConnected() throws Exception {MiniSolrCloudCluster miniCluster =- new MiniSolrCloudCluster(5, createTempDir(), buildJettyConfig());+ new MiniSolrCloudCluster(5, createTempDir(), JettyConfig.builder().build());final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();@@ -173,7 +174,7 @@ public class SearchHandlerTest extends SolrTestCaseJ4 {@Testpublic void testRequireZkConnected() throws Exception {MiniSolrCloudCluster miniCluster =- new MiniSolrCloudCluster(5, createTempDir(), buildJettyConfig());+ new MiniSolrCloudCluster(5, createTempDir(), JettyConfig.builder().build());final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();@@ -227,7 +228,7 @@ public class SearchHandlerTest extends SolrTestCaseJ4 {@Testpublic void testRequireZkConnectedDistrib() throws Exception {MiniSolrCloudCluster miniCluster =- new MiniSolrCloudCluster(2, createTempDir(), buildJettyConfig());+ new MiniSolrCloudCluster(2, createTempDir(), JettyConfig.builder().build());final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();diff --git a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.javaindex d8a94af9763..b352f177e42 100644--- a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java+++ b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java@@ -34,6 +34,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.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;import org.junit.AfterClass;@@ -93,7 +94,7 @@ public class TestRawTransformer extends SolrCloudTestCase {nodeProperties.setProperty("solr.data.dir", h.getCore().getDataDir());JSR =new JettySolrRunner(- homeDir.toAbsolutePath().toString(), nodeProperties, buildJettyConfig());+ homeDir.toAbsolutePath().toString(), nodeProperties, JettyConfig.builder().build());}private static void initCloud() throws Exception {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 e753d5c8289..8aced962b9d 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@@ -33,6 +33,7 @@ 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.common.util.NamedList;+import org.apache.solr.embedded.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.junit.Test;import org.slf4j.Logger;@@ -53,7 +54,7 @@ public class TestDistribIDF extends SolrTestCaseJ4 {}super.setUp();- solrCluster = new MiniSolrCloudCluster(3, createTempDir(), buildJettyConfig());+ solrCluster = new MiniSolrCloudCluster(3, createTempDir(), JettyConfig.builder().build());// set some system properties for use by testsSystem.setProperty("solr.test.sys.prop1", "propone");System.setProperty("solr.test.sys.prop2", "proptwo");diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.javaindex 9bf2787afce..3405539490e 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java@@ -41,6 +41,7 @@ import org.apache.solr.client.solrj.SolrClient;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.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.admin.SecurityConfHandler;import org.apache.solr.handler.admin.SecurityConfHandlerLocalForTesting;@@ -201,7 +202,8 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {Properties nodeProperties = new Properties();nodeProperties.setProperty("solr.data.dir", instance.getDataDir().toString());JettySolrRunner jetty =- new JettySolrRunner(instance.getHomeDir().toString(), nodeProperties, buildJettyConfig());+ new JettySolrRunner(+ instance.getHomeDir().toString(), nodeProperties, JettyConfig.builder().build());jetty.start();return jetty;}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 859857eed1b..5ecbbe57250 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@@ -46,6 +46,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.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.junit.AfterClass;import org.junit.BeforeClass;@@ -67,7 +68,8 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {System.setProperty(KerberosPlugin.DELEGATION_TOKEN_ENABLED, "true");System.setProperty("solr.kerberos.cookie.domain", "127.0.0.1");- miniCluster = new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), buildJettyConfig());+ miniCluster =+ new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), JettyConfig.builder().build());JettySolrRunner runnerPrimary = miniCluster.getJettySolrRunners().get(0);solrClientPrimary = new HttpSolrClient.Builder(runnerPrimary.getBaseUrl().toString()).build();JettySolrRunner runnerSecondary = miniCluster.getJettySolrRunners().get(1);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 a7a1652cf32..834c422ca30 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@@ -40,6 +40,7 @@ import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.EnvUtils;import org.apache.solr.common.util.IOUtils;import org.apache.solr.core.CoreContainer;+import org.apache.solr.embedded.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.admin.CollectionsHandler;import org.apache.solr.request.SolrQueryRequest;@@ -113,7 +114,8 @@ public class TestSolrCloudWithSecureImpersonation extends SolrTestCaseJ4 {SolrRequestParsers.DEFAULT.setAddRequestHeadersToContext(true);System.setProperty("collectionsHandler", ImpersonatorCollectionsHandler.class.getName());- miniCluster = new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), buildJettyConfig());+ miniCluster =+ new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), JettyConfig.builder().build());JettySolrRunner runner = miniCluster.getJettySolrRunners().get(0);solrClient = new HttpSolrClient.Builder(runner.getBaseUrl().toString()).build();}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 816fccab2d7..afc148e5125 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@@ -323,9 +323,7 @@ public class TestLTROnSolrCloud extends TestRerankBase {}private void setupSolrCluster(int numShards, int numReplicas, int numServers) throws Exception {- JettyConfig jc = buildJettyConfig();- jc = JettyConfig.builder(jc).build();- solrCluster = new MiniSolrCloudCluster(numServers, tmpSolrHome, jc);+ solrCluster = new MiniSolrCloudCluster(numServers, tmpSolrHome, JettyConfig.builder().build());Path configDir = tmpSolrHome.resolve("collection1/conf");solrCluster.uploadConfigSet(configDir, "conf1");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 4eeb7407c06..c3464b73a82 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@@ -328,7 +328,7 @@ public class TestLBHttp2SolrClient extends SolrTestCaseJ4 {props.setProperty("solrconfig", "bad_solrconfig.xml");props.setProperty("solr.data.dir", getDataDir());- JettyConfig jettyConfig = JettyConfig.builder(buildJettyConfig()).setPort(port).build();+ JettyConfig jettyConfig = JettyConfig.builder().setPort(port).build();jetty = new JettySolrRunner(getHomeDir(), props, jettyConfig);jetty.start();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 d9ad7a47176..331330e3fdb 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@@ -337,7 +337,7 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {props.setProperty("solrconfig", "bad_solrconfig.xml");props.setProperty("solr.data.dir", getDataDir());- JettyConfig jettyConfig = JettyConfig.builder(buildJettyConfig()).setPort(port).build();+ JettyConfig jettyConfig = JettyConfig.builder().setPort(port).build();jetty = new JettySolrRunner(getHomeDir(), props, jettyConfig);jetty.start();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 b2b2a4ce6be..de79f75a6a2 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@@ -200,7 +200,6 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {.withServlet(new ServletHolder(RedirectServlet.class), "/redirect/*").withServlet(new ServletHolder(SlowServlet.class), "/slow/*").withServlet(new ServletHolder(DebugServlet.class), "/debug/*")- .withSSLConfig(sslConfig.buildServerSSLConfig()).build();createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);}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 8ca9d6b938d..1b21772d88c 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@@ -35,9 +35,7 @@ public class ConcurrentUpdateHttp2SolrClientBadInputTest extends SolrJettyTestBa@BeforeClasspublic static void beforeTest() throws Exception {- JettyConfig jettyConfig =- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build();- createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);+ createAndStartJetty(legacyExampleCollection1SolrHome(), JettyConfig.builder().build());}@Testdiff --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 713ee22a926..6d745a6058f 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@@ -42,7 +42,6 @@ public class ConcurrentUpdateHttp2SolrClientTest extends SolrJettyTestBase {JettyConfig.builder().withServlet(new ServletHolder(ConcurrentUpdateSolrClientTest.TestServlet.class), "/cuss/*")- .withSSLConfig(sslConfig.buildServerSSLConfig()).build();createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);}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 45520dd49c4..c5dceedd7c4 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@@ -35,9 +35,7 @@ public class ConcurrentUpdateSolrClientBadInputTest extends SolrJettyTestBase {@BeforeClasspublic static void beforeTest() throws Exception {- JettyConfig jettyConfig =- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build();- createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);+ createAndStartJetty(legacyExampleCollection1SolrHome(), JettyConfig.builder().build());}@Testdiff --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 28052321a69..cc49c05994e 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@@ -129,10 +129,7 @@ public class ConcurrentUpdateSolrClientTest extends SolrJettyTestBase {@BeforeClasspublic static void beforeTest() throws Exception {JettyConfig jettyConfig =- JettyConfig.builder()- .withServlet(new ServletHolder(TestServlet.class), "/cuss/*")- .withSSLConfig(sslConfig.buildServerSSLConfig())- .build();+ JettyConfig.builder().withServlet(new ServletHolder(TestServlet.class), "/cuss/*").build();createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.javaindex 9b398160193..7333ecfbeec 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java@@ -39,10 +39,7 @@ public class Http2SolrClientProxyTest extends SolrTestCaseJ4 {RandomizedTest.assumeFalse(sslConfig.isSSLMode());solrClientTestRule.enableProxy();- solrClientTestRule.startSolr(- createTempDir(),- new Properties(),- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build());+ solrClientTestRule.startSolr(createTempDir(), new Properties(), JettyConfig.builder().build());// Actually only need extremely minimal configSet but just use the defaultsolrClientTestRule.newCollection()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 3c15cbd95ef..9b57e7aa2c5 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@@ -192,7 +192,6 @@ public class Http2SolrClientTest extends SolrJettyTestBase {.withServlet(new ServletHolder(BasicHttpSolrClientTest.SlowServlet.class), SLOW_SERVLET_REGEX).withServlet(new ServletHolder(DebugServlet.class), DEBUG_SERVLET_REGEX)- .withSSLConfig(sslConfig.buildServerSSLConfig()).build();createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);}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 2afa39725e4..1b064ef16ae 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@@ -34,9 +34,7 @@ public class HttpSolrClientBadInputTest extends SolrJettyTestBase {@BeforeClasspublic static void beforeTest() throws Exception {- JettyConfig jettyConfig =- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build();- createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);+ createAndStartJetty(legacyExampleCollection1SolrHome(), JettyConfig.builder().build());}@Testdiff --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 4e50201e18d..b9ce2a1bbfb 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@@ -33,9 +33,7 @@ public class LBHttpSolrClientBadInputTest extends SolrJettyTestBase {@BeforeClasspublic static void beforeTest() throws Exception {- JettyConfig jettyConfig =- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build();- createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);+ createAndStartJetty(legacyExampleCollection1SolrHome(), JettyConfig.builder().build());}@Testdiff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.javaindex d678106f873..a7c0cb76156 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java@@ -24,6 +24,7 @@ import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.AlreadyClosedException;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.embedded.JettyConfig;import org.junit.Test;public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {@@ -32,7 +33,8 @@ public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {public void testCloudClientCanConnectAfterClusterComesUp() throws Exception {// Start by creating a cluster with no jetties- MiniSolrCloudCluster cluster = new MiniSolrCloudCluster(0, createTempDir(), buildJettyConfig());+ MiniSolrCloudCluster cluster =+ new MiniSolrCloudCluster(0, createTempDir(), JettyConfig.builder().build());try {CloudSolrClient client = cluster.getSolrClient();@@ -60,7 +62,8 @@ public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {Path configPath = getFile("solrj").toPath().resolve("solr/configsets/configset-2/conf");- MiniSolrCloudCluster cluster = new MiniSolrCloudCluster(0, createTempDir(), buildJettyConfig());+ MiniSolrCloudCluster cluster =+ new MiniSolrCloudCluster(0, createTempDir(), JettyConfig.builder().build());try {CloudSolrClient client = cluster.getSolrClient();SolrException e =@@ -92,7 +95,7 @@ public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {public void testAlreadyClosedClusterStateProvider() throws Exception {final MiniSolrCloudCluster cluster =- new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig());+ new MiniSolrCloudCluster(1, createTempDir(), JettyConfig.builder().build());// from a client perspective the behavior of ZkClientClusterStateProvider should be// consistent regardless of whether it's constructed with a zkhost or an existing ZkStateReadertry {diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.javaindex 0c810dbcfdf..170cc3c2214 100644--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java@@ -431,7 +431,6 @@ public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {.stopAtShutdown(true).withFilters(getExtraRequestFilters()).withServlets(getExtraServlets())- .withSSLConfig(sslConfig.buildServerSSLConfig()).build());return jetty;diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.javaindex cb80310f635..505e276e170 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java@@ -47,11 +47,7 @@ public abstract class SolrJettyTestBase extends SolrTestCaseJ4 {assert context == null || context.equals("/solr"); // deprecatedJettyConfig jettyConfig =- JettyConfig.builder()- .stopAtShutdown(stopAtShutdown)- .withServlets(extraServlets)- .withSSLConfig(sslConfig.buildServerSSLConfig())- .build();+ JettyConfig.builder().stopAtShutdown(stopAtShutdown).withServlets(extraServlets).build();Properties nodeProps = new Properties();if (configFile != null) nodeProps.setProperty("solrconfig", configFile);@@ -76,10 +72,7 @@ public abstract class SolrJettyTestBase extends SolrTestCaseJ4 {}protected static JettySolrRunner createAndStartJetty(String solrHome) throws Exception {- return createAndStartJetty(- solrHome,- new Properties(),- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build());+ return createAndStartJetty(solrHome, new Properties(), JettyConfig.builder().build());}protected static JettySolrRunner createAndStartJetty(diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.javaindex 1d9a175c741..f7a19e5423c 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java@@ -503,12 +503,7 @@ public class SolrTestCaseHS extends SolrTestCaseJ4 {}if (jetty == null) {- JettyConfig jettyConfig =- JettyConfig.builder()- .stopAtShutdown(true)- .setPort(port)- .withSSLConfig(sslConfig.buildServerSSLConfig())- .build();+ JettyConfig jettyConfig = JettyConfig.builder().stopAtShutdown(true).setPort(port).build();Properties nodeProperties = new Properties();nodeProperties.setProperty("solrconfig", solrconfigFile);nodeProperties.setProperty(CoreDescriptor.CORE_SCHEMA, schemaFile);diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.javaindex 7f1fc596160..a9402a835e1 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java@@ -120,7 +120,6 @@ 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;@@ -492,10 +491,6 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {return result;}- protected static JettyConfig buildJettyConfig() {- return JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build();- }-protected static String buildUrl(final int port) {return (isSSLMode() ? "https" : "http") + "://127.0.0.1:" + port + "/solr";}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 fbb71d02d1a..8641c4a2fab 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@@ -734,7 +734,6 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes.stopAtShutdown(false).withServlets(getExtraServlets()).withFilters(getExtraRequestFilters())- .withSSLConfig(sslConfig.buildServerSSLConfig()).build();Properties props = new Properties();@@ -779,7 +778,6 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes.stopAtShutdown(false).withServlets(getExtraServlets()).withFilters(getExtraRequestFilters())- .withSSLConfig(sslConfig.buildServerSSLConfig()).build();Properties props = new Properties();@@ -817,7 +815,6 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes.stopAtShutdown(false).withServlets(getExtraServlets()).withFilters(getExtraRequestFilters())- .withSSLConfig(sslConfig.buildServerSSLConfig()).build();Properties props = new Properties();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 42879306f61..0d901020cb5 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@@ -1043,10 +1043,6 @@ public class MiniSolrCloudCluster {this.baseDir = baseDir;jettyConfigBuilder = JettyConfig.builder();- if (SolrTestCaseJ4.sslConfig != null) {- jettyConfigBuilder =- jettyConfigBuilder.withSSLConfig(SolrTestCaseJ4.sslConfig.buildServerSSLConfig());- }}/** Use a JettyConfig.Builder to configure the cluster's jetty servers */diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.javaindex cbaad484503..190a0d38d83 100644--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java@@ -20,6 +20,7 @@ import java.util.LinkedHashMap;import java.util.Map;import java.util.TreeMap;import javax.servlet.Filter;+import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.embedded.SSLConfig;import org.eclipse.jetty.servlet.ServletHolder;@@ -84,7 +85,8 @@ public class JettyConfig {Long waitForLoadingCoresToFinishMs = 300000L;Map<ServletHolder, String> extraServlets = new TreeMap<>();Map<Class<? extends Filter>, String> extraFilters = new LinkedHashMap<>();- SSLConfig sslConfig = null;+ SSLConfig sslConfig =+ SolrTestCaseJ4.sslConfig != null ? SolrTestCaseJ4.sslConfig.buildServerSSLConfig() : null;int portRetryTime = 60;public Builder useOnlyHttp1(boolean useOnlyHttp1) {diff --git a/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java b/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.javaindex d0311f6e4f6..9d05b0af949 100644--- a/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java+++ b/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java@@ -20,7 +20,6 @@ import java.lang.invoke.MethodHandles;import java.nio.file.Path;import java.util.Properties;import java.util.concurrent.ConcurrentHashMap;-import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.common.util.IOUtils;@@ -70,12 +69,7 @@ public class SolrJettyTestRule extends SolrClientTestRule {@Overridepublic void startSolr(Path solrHome) {- startSolr(- solrHome,- new Properties(),- JettyConfig.builder()- .withSSLConfig(SolrTestCaseJ4.sslConfig.buildServerSSLConfig())- .build());+ startSolr(solrHome, new Properties(), JettyConfig.builder().build());}/**diff --git a/solr/test-framework/src/test/org/apache/solr/embedded/TestJettySolrRunner.java b/solr/test-framework/src/test/org/apache/solr/embedded/TestJettySolrRunner.javaindex 34f48b79fe4..230a279864d 100644--- a/solr/test-framework/src/test/org/apache/solr/embedded/TestJettySolrRunner.java+++ b/solr/test-framework/src/test/org/apache/solr/embedded/TestJettySolrRunner.java@@ -48,7 +48,7 @@ public class TestJettySolrRunner extends SolrTestCaseJ4 {.replace("COREROOT", coresDir.toString());Files.write(solrHome.resolve("solr.xml"), solrxml.getBytes(StandardCharsets.UTF_8));- JettyConfig jettyConfig = buildJettyConfig();+ JettyConfig jettyConfig = JettyConfig.builder().build();JettySolrRunner runner =new JettySolrRunner(solrHome.toString(), new Properties(), jettyConfig);