Apache Solr open-source search software
SOLR-17962 Move deprecated SolrClient impls (Apache HttpClient) to test-framework (#3793)
David Smileycf7f5079e806
diff --git a/changelog/unreleased/SOLR-17962-MoveDeprecatedToTestFramework.yml b/changelog/unreleased/SOLR-17962-MoveDeprecatedToTestFramework.ymlnew file mode 100644index 00000000000..9a928512005--- /dev/null+++ b/changelog/unreleased/SOLR-17962-MoveDeprecatedToTestFramework.yml@@ -0,0 +1,12 @@+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc+title: The deprecated SolrClient implementations based on Apache HttpClient are removed from Solrj,+ thus the related dependencies are no longer present.+ They temporarily live on in the test framework.+type: other # added, changed, fixed, deprecated, removed, dependency_update, security, other+authors:+ - name: David Smiley+links:+ - name: SOLR-17962+ url: https://issues.apache.org/jira/browse/SOLR-17962+issues:+ - 17962diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfileindex 857f486daf5..453b1f64320 100644--- a/solr/core/gradle.lockfile+++ b/solr/core/gradle.lockfile@@ -36,7 +36,7 @@ com.jayway.jsonpath:json-path:2.9.0=compileClasspath,jarValidation,runtimeClasspcom.microsoft.onnxruntime:onnxruntime:1.23.0=jarValidation,testRuntimeClasspathcom.tdunning:t-digest:3.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcommons-cli:commons-cli:1.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-commons-codec:commons-codec:1.19.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+commons-codec:commons-codec:1.19.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcommons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathio.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspathio.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath@@ -92,9 +92,9 @@ org.apache.commons:commons-math3:3.6.1=apiHelper,compileClasspath,jarValidation,org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-api:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathdiff --git a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.javaindex 3863043fc1a..194b5b3b1aa 100644--- a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java@@ -38,8 +38,8 @@ 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.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.cloud.SolrCloudManager;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ClusterStateProvider;import org.apache.solr.client.solrj.impl.ZkClientClusterStateProvider;diff --git a/solr/core/src/test/org/apache/solr/cloud/BalanceReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/BalanceReplicasTest.javaindex b93d5bc3f34..b1144d5caff 100644--- a/solr/core/src/test/org/apache/solr/cloud/BalanceReplicasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/BalanceReplicasTest.java@@ -34,7 +34,7 @@ import org.apache.http.entity.ByteArrayEntity;import org.apache.http.entity.ContentType;import org.apache.http.util.EntityUtils;import org.apache.solr.client.api.model.BalanceReplicasRequestBody;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.javaindex 6652009774f..6800052434e 100644--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java b/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.javaindex 69f8f1adc1e..2aa959842ce 100644--- a/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java@@ -37,7 +37,7 @@ import org.apache.http.impl.client.CloseableHttpClient;import org.apache.http.util.EntityUtils;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.javaindex c3008437440..f4b8d94113e 100644--- a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java@@ -24,8 +24,8 @@ import java.util.List;import java.util.Optional;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.javaindex c6177a51c06..74dfe014c23 100644--- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java@@ -30,9 +30,9 @@ 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.SolrQuery;+import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient;import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.RequestStatusState;diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.javaindex 7527af9cc08..8332d2646d2 100644--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java@@ -36,8 +36,8 @@ import org.apache.solr.JSONTestUtil;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.apache.HttpSolrClient;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionContextKeyTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionContextKeyTest.javaindex 06deacc0bd9..ea48ae83a96 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionContextKeyTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionContextKeyTest.java@@ -23,7 +23,7 @@ import java.util.Locale;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.common.cloud.ClusterState;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.javaindex 38d67942591..49b0fdc5072 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java@@ -27,7 +27,7 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrClient.RemoteSolrException;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.javaindex 9aec02771d1..a81204dfee5 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java@@ -34,8 +34,8 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/cloud/MigrateReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/MigrateReplicasTest.javaindex b65643ca0f5..46e2fb41a99 100644--- a/solr/core/src/test/org/apache/solr/cloud/MigrateReplicasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/MigrateReplicasTest.java@@ -37,7 +37,7 @@ import org.apache.http.entity.ContentType;import org.apache.http.util.EntityUtils;import org.apache.solr.client.api.model.MigrateReplicasRequestBody;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.javaindex 06c03971a96..16d63e2ea58 100644--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.java@@ -25,8 +25,8 @@ 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.impl.CloudLegacySolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.javaindex 05691b2c80c..77c910a8da2 100644--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java@@ -26,8 +26,8 @@ import org.apache.solr.client.solrj.SolrQuery;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.impl.CloudLegacySolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.SolrHttpConstants;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java b/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.javaindex 22afebb4fb3..0b6bd761ee5 100644--- a/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java@@ -26,8 +26,8 @@ import java.util.List;import java.util.Map;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.schema.SchemaRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.javaindex 7bf580a865c..bbdfecf3475 100644--- a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java@@ -24,8 +24,8 @@ import java.util.Properties;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.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.LBHttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.LBHttpSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.javaindex b36e1549a8a..9e38a8c9aef 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java@@ -24,8 +24,8 @@ import java.util.Map;import org.apache.http.HttpRequestInterceptor;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpClientUtil;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.javaindex 8d2043da00e..4360f7c5d76 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java@@ -32,8 +32,8 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.cloud.SocketProxy;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.javaindex a652c10b84c..e318ee02821 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java@@ -70,7 +70,7 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.ConfigSetAdminRequest;import org.apache.solr.client.solrj.request.ConfigSetAdminRequest.Create;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.javaindex 5bab0e126b9..991750adcc1 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java@@ -23,9 +23,9 @@ 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.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient.Builder;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.javaindex 7b4dbb21a15..c82864b7f6f 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java@@ -35,10 +35,10 @@ 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.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.Http2SolrClient;-import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.SolrHttpConstants;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.javaindex 438b693e2ee..d7cf33aad8a 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java@@ -40,7 +40,7 @@ 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.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.javaindex 4b9d0bde0d4..8cd083c248a 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java@@ -40,8 +40,8 @@ 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.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.javaindex 463bb677dc4..d82addc73c1 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java@@ -30,7 +30,7 @@ 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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.overseer.OverseerAction;import org.apache.solr.common.cloud.ClusterState;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.javaindex df4cc03abec..777188e10d8 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicLong;import org.apache.commons.math3.primes.Primes;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.UpdateResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.javaindex eea30196557..46cd780b33f 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java@@ -47,9 +47,9 @@ 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.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.javaindex 99761457974..3546677792a 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.java@@ -27,7 +27,7 @@ import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.StringEntity;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.javaindex 535ae336392..da75f561f1c 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@@ -30,8 +30,8 @@ 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.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.RequestStatusState;import org.apache.solr.cloud.SolrCloudTestCase;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 4b5a784185d..9a827e2a8b7 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@@ -41,9 +41,9 @@ 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.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;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 4eeca04c43a..5b7efcfb940 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@@ -31,7 +31,7 @@ import org.apache.http.client.methods.HttpGet;import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.StringEntity;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestRequestStatusCollectionAPI.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestRequestStatusCollectionAPI.javaindex f47a08ca8e4..1e6e0681808 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestRequestStatusCollectionAPI.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestRequestStatusCollectionAPI.java@@ -26,7 +26,7 @@ import java.util.Map;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.RequestStatusState;import org.apache.solr.cloud.BasicDistributedZkTest;diff --git a/solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java b/solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.javaindex 580abd12944..0efdb3ca25d 100644--- a/solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java+++ b/solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java@@ -37,8 +37,8 @@ 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.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.RemoteExecutionException;import org.apache.solr.client.solrj.request.FileStoreApi;import org.apache.solr.client.solrj.request.V2Request;diff --git a/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java b/solr/core/src/test/org/apache/solr/handler/TestConfigReload.javaindex 36ce1c08377..37dffc09030 100644--- a/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java+++ b/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;import org.apache.http.HttpEntity;import org.apache.http.client.methods.HttpGet;import org.apache.http.util.EntityUtils;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.cloud.ZkConfigSetService;import org.apache.solr.common.LinkedHashMapWriter;diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.javaindex e147bb44dcc..f59aa9cdffd 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java@@ -41,7 +41,7 @@ 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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.embedded.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.javaindex 5eb89f66990..6d00d5a69b5 100644--- a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java+++ b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java@@ -30,7 +30,7 @@ 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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.embedded.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.javaindex 1147e483329..6730e580298 100644--- a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java+++ b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java@@ -31,7 +31,7 @@ import org.apache.http.HttpEntity;import org.apache.http.client.methods.HttpGet;import org.apache.http.util.EntityUtils;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.common.LinkedHashMapWriter;diff --git a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.javaindex b8819db6652..e903dfabb82 100644--- a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java@@ -30,7 +30,7 @@ import org.apache.solr.client.solrj.ResponseParser;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.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.impl.JavaBinResponseParser;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/AdminHandlersProxyTest.java b/solr/core/src/test/org/apache/solr/handler/admin/AdminHandlersProxyTest.javaindex 14c03db7650..ef39b046a6f 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/AdminHandlersProxyTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/AdminHandlersProxyTest.java@@ -23,7 +23,7 @@ import java.util.Set;import org.apache.http.client.HttpClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.response.SimpleSolrResponse;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 4e96b051815..59ec9c9bdf5 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@@ -36,7 +36,7 @@ import org.apache.solr.client.api.model.CoreStatusResponse;import org.apache.solr.client.solrj.JacksonContentWriter;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperReadAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperReadAPITest.javaindex 31609dc8318..ea4cd30a048 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperReadAPITest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperReadAPITest.java@@ -25,7 +25,7 @@ import java.util.Map;import java.util.stream.Collectors;import org.apache.commons.io.IOUtils;import org.apache.solr.client.api.model.ZooKeeperStat;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.ZookeeperReadApi;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerFailureTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerFailureTest.javaindex 6a8b4f9b6e6..e4e5a737ae8 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerFailureTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerFailureTest.java@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.javaindex 79b580ed9d9..4c54a96e8b3 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/ClusterPropsAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/ClusterPropsAPITest.javaindex a3cbbd2b6dc..b4e5e87a680 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/api/ClusterPropsAPITest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/ClusterPropsAPITest.java@@ -28,8 +28,8 @@ import org.apache.http.client.methods.HttpDelete;import org.apache.http.client.methods.HttpGet;import org.apache.http.client.methods.HttpPut;import org.apache.http.entity.StringEntity;-import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.util.Utils;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.javaindex be385f807b9..6e31daac172 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java@@ -20,7 +20,7 @@ import org.apache.lucene.util.Constants;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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;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 d0bab51541d..579c02491a9 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,8 +23,8 @@ 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.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.javaindex 7c54856a061..8d646539c5f 100644--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java@@ -28,8 +28,8 @@ import java.util.Set;import org.apache.http.client.HttpClient;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.util.Utils;import org.apache.solr.core.CoreContainer;diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.javaindex 494ad8c530e..07468d138d0 100644--- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java+++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java@@ -46,8 +46,8 @@ 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.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.RemoteExecutionException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.javaindex 1e5c69846fe..bb6c2a78ca8 100644--- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java+++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;import org.apache.solr.client.api.model.CoreStatusResponse;import org.apache.solr.client.solrj.JacksonContentWriter;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.common.cloud.SolrZkClient;diff --git a/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java b/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.javaindex 38ec012375b..bb316236012 100644--- a/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java+++ b/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java@@ -37,9 +37,9 @@ import org.apache.http.HttpResponse;import org.apache.http.client.methods.HttpGet;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.Http2SolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrJ.java b/solr/core/src/test/org/apache/solr/search/TestSolrJ.javaindex 3f275673f35..4d3c4a3c9d7 100644--- a/solr/core/src/test/org/apache/solr/search/TestSolrJ.java+++ b/solr/core/src/test/org/apache/solr/search/TestSolrJ.java@@ -25,7 +25,7 @@ import java.util.Random;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.impl.ConcurrentUpdateSolrClient;+import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.util.RTimer;import org.slf4j.Logger;diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.javaindex c4035ea0380..1bd45efc256 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java@@ -37,8 +37,8 @@ import org.apache.solr.cli.StatusTool;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.impl.CloudLegacySolrClient;-import org.apache.solr.client.solrj.impl.HttpClientUtil;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.QueryRequest;diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.javaindex c1ef9d05b67..466e3ffed78 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java@@ -37,7 +37,7 @@ 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.impl.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.common.params.MapSolrParams;import org.apache.solr.common.util.Utils;import org.apache.solr.embedded.JettyConfig;diff --git a/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java b/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.javaindex abe6cbbfd55..f04bd268cda 100644--- a/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java+++ b/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java@@ -46,7 +46,7 @@ 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.impl.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.CommandOperation;import org.apache.solr.common.util.Utils;diff --git a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.javaindex 9f016ab2647..fbb0cd88c7b 100644--- a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java@@ -24,7 +24,7 @@ import java.security.Principal;import java.util.Map;import java.util.concurrent.atomic.AtomicInteger;import org.apache.http.client.HttpClient;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.cloud.SolrCloudAuthTestCase;diff --git a/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java b/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.javaindex 3fdda76715d..bc5e1576842 100644--- a/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java+++ b/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java@@ -25,8 +25,8 @@ import java.util.function.Predicate;import org.apache.http.client.HttpClient;import org.apache.http.client.methods.HttpGet;import org.apache.http.util.EntityUtils;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;-import org.apache.solr.client.solrj.impl.HttpClientUtil;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.java b/solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.javaindex 867796733b4..db58af874c2 100644--- a/solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.java+++ b/solr/core/src/test/org/apache/solr/servlet/HideStackTraceTest.java@@ -25,7 +25,7 @@ import org.apache.http.util.EntityUtils;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;-import org.apache.solr.client.solrj.impl.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.handler.component.ResponseBuilder;import org.apache.solr.handler.component.SearchComponent;import org.apache.solr.util.SolrJettyTestRule;diff --git a/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java b/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.javaindex cecca9bbcc1..b097febe41f 100644--- a/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java+++ b/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java@@ -23,7 +23,7 @@ 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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.params.SolrParams;diff --git a/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.java b/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.javaindex 6910aed10ce..c014c842ef7 100644--- a/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.java+++ b/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.java@@ -26,7 +26,7 @@ import java.util.stream.Collectors;import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.IOUtils;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.LBSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.javaindex 0bdb7078bea..bbb6818ab14 100644--- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java+++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java@@ -30,7 +30,7 @@ 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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.LukeRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrDocumentList;diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.javaindex fe75428c695..ef169bba282 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,7 @@ 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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.schema.SchemaRequest.Field;import org.apache.solr.client.solrj.response.UpdateResponse;diff --git a/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.java b/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.javaindex 80940b31da6..e822352bc39 100644--- a/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.java+++ b/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.java@@ -26,8 +26,8 @@ import java.util.Optional;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.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfileindex b22aacffe76..89f6c3c7584 100644--- a/solr/cross-dc-manager/gradle.lockfile+++ b/solr/cross-dc-manager/gradle.lockfile@@ -104,9 +104,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLiborg.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.kafka:kafka-clients:3.9.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.kafka:kafka-group-coordinator-api:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.apache.kafka:kafka-group-coordinator:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathdiff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfileindex 0109dfc55be..0755383e6c4 100644--- a/solr/modules/analysis-extras/gradle.lockfile+++ b/solr/modules/analysis-extras/gradle.lockfile@@ -85,9 +85,9 @@ org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfileindex 3fb93cf4366..3956d4fc49a 100644--- a/solr/modules/clustering/gradle.lockfile+++ b/solr/modules/clustering/gradle.lockfile@@ -82,9 +82,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLiborg.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfileindex 55ed1b6b2fd..691dd1cb522 100644--- a/solr/modules/cross-dc/gradle.lockfile+++ b/solr/modules/cross-dc/gradle.lockfile@@ -85,9 +85,9 @@ org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.kafka:kafka-clients:3.9.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfileindex 0def87f8749..50bfde70279 100644--- a/solr/modules/cuvs/gradle.lockfile+++ b/solr/modules/cuvs/gradle.lockfile@@ -84,9 +84,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLiborg.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfileindex 728ce9a36b4..0ff229b9282 100644--- a/solr/modules/extraction/gradle.lockfile+++ b/solr/modules/extraction/gradle.lockfile@@ -87,9 +87,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLiborg.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfileindex d871a7328af..5c9b3c36d4b 100644--- a/solr/modules/gcs-repository/gradle.lockfile+++ b/solr/modules/gcs-repository/gradle.lockfile@@ -133,9 +133,9 @@ org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfileindex 67a2db3d9be..53ce9aa43ca 100644--- a/solr/modules/jwt-auth/gradle.lockfile+++ b/solr/modules/jwt-auth/gradle.lockfile@@ -100,9 +100,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLiborg.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.javaindex f0ca70fe55c..1650fbb4788 100644--- a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java+++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java@@ -57,7 +57,7 @@ import org.apache.http.entity.ContentType;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.lucene.tests.mockfile.FilterPath;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.SolrCloudAuthTestCase;import org.apache.solr.common.SolrException;diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfileindex 943907a4607..bef5adb997e 100644--- a/solr/modules/langid/gradle.lockfile+++ b/solr/modules/langid/gradle.lockfile@@ -84,9 +84,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLiborg.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfileindex 65fcd7bcc6c..febb1155d26 100644--- a/solr/modules/llm/gradle.lockfile+++ b/solr/modules/llm/gradle.lockfile@@ -97,9 +97,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLiborg.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfileindex d4364c51501..44debb42806 100644--- a/solr/modules/ltr/gradle.lockfile+++ b/solr/modules/ltr/gradle.lockfile@@ -83,9 +83,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLiborg.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfileindex 78e279a77b1..f794d05b31c 100644--- a/solr/modules/opentelemetry/gradle.lockfile+++ b/solr/modules/opentelemetry/gradle.lockfile@@ -114,9 +114,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLiborg.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfileindex 433df8f62ec..3d1b670cedc 100644--- a/solr/modules/s3-repository/gradle.lockfile+++ b/solr/modules/s3-repository/gradle.lockfile@@ -109,9 +109,9 @@ org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfileindex 2e6aa241656..5c53df53d4f 100644--- a/solr/modules/scripting/gradle.lockfile+++ b/solr/modules/scripting/gradle.lockfile@@ -82,9 +82,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLiborg.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfileindex c9aa391d53e..890237bbc88 100644--- a/solr/modules/sql/gradle.lockfile+++ b/solr/modules/sql/gradle.lockfile@@ -93,9 +93,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspathorg.apache.httpcomponents.client5:httpclient5:5.2.1=jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.apache.httpcomponents.core5:httpcore5-h2:5.2=jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.apache.httpcomponents.core5:httpcore5:5.2.3=jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibsorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfileindex 9d8af037e3e..64790086950 100644--- a/solr/server/gradle.lockfile+++ b/solr/server/gradle.lockfile@@ -76,9 +76,6 @@ org.apache.commons:commons-lang3:3.19.0=jarValidation,runtimeClasspath,solrCoreorg.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,solrCoreorg.apache.curator:curator-client:5.9.0=jarValidation,runtimeClasspath,solrCoreorg.apache.curator:curator-framework:5.9.0=jarValidation,runtimeClasspath,solrCore-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,solrCore-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,solrCore-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,solrCoreorg.apache.logging.log4j:log4j-1.2-api:2.21.0=jarValidation,libExt,runtimeClasspathorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,libExt,runtimeClasspath,solrCoreorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,libExt,runtimeClasspath,solrCorediff --git a/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.java b/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.javaindex b9975eba2cc..dc8e860a363 100644--- a/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.java+++ b/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.java@@ -32,7 +32,7 @@ import org.apache.solr.client.solrj.SolrQuery.ORDER;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.beans.Field;import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.impl.Http2SolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.QueryResponse;@@ -242,9 +242,9 @@ public class UsingSolrJRefGuideExamplesTest extends SolrCloudTestCase {private SolrClient getTechProductSolrClient() {// tag::solrj-solrclient-timeouts[]final String solrUrl = "http://localhost:8983/solr";- return new HttpSolrClient.Builder(solrUrl)+ return new Http2SolrClient.Builder(solrUrl).withConnectionTimeout(10000, TimeUnit.MILLISECONDS)- .withSocketTimeout(60000, TimeUnit.MILLISECONDS)+ .withIdleTimeout(60000, TimeUnit.MILLISECONDS).build();// end::solrj-solrclient-timeouts[]}@@ -318,7 +318,7 @@ public class UsingSolrJRefGuideExamplesTest extends SolrCloudTestCase {final StringBuilder builder = new StringBuilder();builder.append("Leftover output was expected but not printed:");for (String expectedLine : expectedLines) {- builder.append("\n\t" + expectedLine);+ builder.append("\n\t").append(expectedLine);}fail(builder.toString());}diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adocindex 1a2ad326ab4..e61f17567f7 100644--- a/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc@@ -95,18 +95,12 @@ Requests are sent in the form of {solr-javadocs}/solrj/org/apache/solr/client/so`SolrClient` has a few concrete implementations, each geared towards a different usage-pattern or resiliency model:-- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/HttpSolrClient.html[`HttpSolrClient`] - geared towards query-centric workloads, though also a good general-purpose client.-Communicates directly with a single Solr node.-- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/Http2SolrClient.html[`Http2SolrClient`] - async, non-blocking and general-purpose client that leverage HTTP/2 using the Jetty Http library.-- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.html[`HttpJdkSolrClient`] - General-purpose client using the JDK's built-in Http Client. Supports both Http/2 and Http/1.1. Supports async. Targeted for those users wishing to minimize application dependencies.-- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/LBHttpSolrClient.html[`LBHttpSolrClient`] - balances request load across a list of Solr nodes.-Adjusts the list of "in-service" nodes based on node health.-- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.html[`LBHttp2SolrClient`] - just like `LBHttpSolrClient` but using `Http2SolrClient` instead, with the Jetty Http library.-- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/CloudSolrClient.html[`CloudSolrClient`] - geared towards communicating with SolrCloud deployments.-Uses already-recorded ZooKeeper state to discover and route requests to healthy Solr nodes.-- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.html[`ConcurrentUpdateSolrClient`] - geared towards indexing-centric workloads.+- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/Http2SolrClient.html[`Http2SolrClient`] - a general purpose client based on Jetty HttpClient. Supports HTTP/2 and HTTP/1.1, async, non-blocking. Most used & tested.+- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.html[`HttpJdkSolrClient`] - a general purpose client based on JDK HttpClient. Supports HTTP/2 and HTTP/1.1, async, non-blocking. Has no dependencies.+- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.html[`LBHttp2SolrClient`] - an internal client that delegates to other clients pointed at different URLs for fail-over/availability. Adjusts the list of "in-service" nodes based on node health.+- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/CloudSolrClient.html[`CloudSolrClient`] - the ideal client for SolrCloud. Using the "cluster state", it routes requests to the optimal nodes, including splitting out the documents in an UpdateRequest to different nodes.+- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.html[`ConcurrentUpdateHttp2SolrClient`] - geared towards indexing-centric workloads.Buffers documents internally before sending larger batches to Solr.-- {solr-javadocs}/solrj/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.html[`ConcurrentUpdateHttp2SolrClient`] - just like `ConcurrentUpdateSolrClient` but using `Http2SolrClient` instead, with the Jetty Http library.=== Common Configuration Options@@ -122,7 +116,7 @@ A few notable exceptions to this are described below:- *Http2SolrClient* - Users of `Http2SolrClient` may choose to skip providing a root URL to their client, in favor of specifying the URL as an argument for the `Http2SolrClient.requestWithBaseUrl` method.Calling any other `request` methods on a URL-less `Http2SolrClient` will result in an `IllegalArgumentException`.-- *LBHttpSolrClient* and *LBHttp2SolrClient* - Solr's "load balancing" clients are frequently used to round-robin requests across a set of replicas or cores.+- *LBHttp2SolrClient* - Solr's "load balancing" client is frequently used to round-robin requests across a set of replicas or cores.URLs are still expected to point to the Solr root (i.e. "/solr"), but to support this use-case the URLs are often supplemented by an additional parameter to specify the targeted core.Alternatively, some "load balancing" methods make use of an `Endpoint` abstraction to provide this URL and core information in a more structured way.- *CloudSolrClient* - Like many clients, CloudSolrClient accepts a series of URLs pointing to the Solr root path (i.e. "/solr").diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adocindex e809b9e8d8f..a2902b67753 100644--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc@@ -73,7 +73,8 @@ Users who previously relied on collection-specific URLs to avoid including the c* Rename BinaryResponseParser and BinaryRequestWriter including StreamingBinaryResponseParser to JavaBinRequestWriter, JavaBinResponseParser, StreamingJavaBinResponseParser.This makes it clear that they pertain specifically to “JavaBin” rather than binary in general.-* The system property `solr.httpclient.builder.factory` now only configures SolrClients using a Jetty based HttpClient, not an Apache one.+* The deprecated SolrClient implementations based on Apache HttpClient are removed from Solrj, thus the related dependencies are no longer present.+The system property `solr.httpclient.builder.factory` now only configures SolrClients using a Jetty based HttpClient.=== SolrCloud Overseerdiff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfileindex 4ae0c77a17e..c304adabf04 100644--- a/solr/solrj-streaming/gradle.lockfile+++ b/solr/solrj-streaming/gradle.lockfile@@ -31,7 +31,7 @@ com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspathcom.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspathcommons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath-commons-codec:commons-codec:1.19.0=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath+commons-codec:commons-codec:1.19.0=jarValidation,testRuntimeClasspathcommons-io:commons-io:2.17.0=permitTestUnusedDeclaredcommons-io:commons-io:2.20.0=jarValidation,testCompileClasspath,testRuntimeClasspathio.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath@@ -100,9 +100,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspathorg.apache.httpcomponents.client5:httpclient5:5.2.1=jarValidation,testRuntimeClasspathorg.apache.httpcomponents.core5:httpcore5-h2:5.2=jarValidation,testRuntimeClasspathorg.apache.httpcomponents.core5:httpcore5:5.2.3=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfileindex 42a6f950feb..82db56eafe3 100644--- a/solr/solrj-zookeeper/gradle.lockfile+++ b/solr/solrj-zookeeper/gradle.lockfile@@ -36,7 +36,7 @@ com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspathcom.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspathcommons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath-commons-codec:commons-codec:1.19.0=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath+commons-codec:commons-codec:1.19.0=jarValidation,testRuntimeClasspathcommons-io:commons-io:2.17.0=apiHelpercommons-io:commons-io:2.20.0=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspathio.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath@@ -97,9 +97,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspathorg.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradleindex 9965c607d27..b9520d5b0fd 100644--- a/solr/solrj/build.gradle+++ b/solr/solrj/build.gradle@@ -43,15 +43,11 @@ dependencies {implementation libs.eclipse.jetty.ioruntimeOnly libs.eclipse.jetty.alpnjavaclient- implementation(libs.apache.httpcomponents.httpmime, {- exclude group: "commons-codec", module: "commons-codec"- exclude group: "commons-logging", module: "commons-logging"- })- implementation libs.apache.httpcomponents.httpclient- implementation libs.apache.httpcomponents.httpcore-compileOnly libs.stephenc.jcip.annotations+ testImplementation libs.apache.httpcomponents.httpclient+ testImplementation libs.apache.httpcomponents.httpcore+testImplementation project(':solr:test-framework')testImplementation project(':solr:core')testImplementation project(':solr:solrj')@@ -92,7 +88,6 @@ dependencies {testRuntimeOnly(libs.apache.log4j.slf4j2impl, {exclude group: "org.apache.logging.log4j", module: "log4j-api"})- testImplementation libs.apache.commons.lang3testImplementation libs.fasterxml.jackson.core.core}diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfileindex f61d0f435e9..db547de09b9 100644--- a/solr/solrj/gradle.lockfile+++ b/solr/solrj/gradle.lockfile@@ -31,7 +31,7 @@ com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspathcom.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspathcommons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath-commons-codec:commons-codec:1.19.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+commons-codec:commons-codec:1.19.0=jarValidation,testCompileClasspath,testRuntimeClasspathcommons-io:commons-io:2.17.0=permitTestUnusedDeclaredcommons-io:commons-io:2.20.0=jarValidation,testCompileClasspath,testRuntimeClasspathio.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath@@ -88,14 +88,14 @@ junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspathnet.bytebuddy:byte-buddy:1.17.7=jarValidation,testCompileClasspath,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspathorg.apache.commons:commons-exec:1.5.0=jarValidation,testRuntimeClasspath-org.apache.commons:commons-lang3:3.19.0=jarValidation,testCompileClasspath,testRuntimeClasspath+org.apache.commons:commons-lang3:3.19.0=jarValidation,testRuntimeClasspathorg.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspathorg.apache.curator:curator-client:5.9.0=jarValidation,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=jarValidation,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspathorg.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.javaindex ac12e5b5722..d5a12688a7a 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java@@ -119,11 +119,11 @@ public abstract class CloudSolrClient extends SolrClient {protected volatile Object[] locks = objectList(3);- static class StateCache extends ConcurrentHashMap<String, ExpiringCachedDocCollection> {+ protected static class StateCache extends ConcurrentHashMap<String, ExpiringCachedDocCollection> {final AtomicLong puts = new AtomicLong();final AtomicLong hits = new AtomicLong();final Lock evictLock = new ReentrantLock(true);- protected volatile long timeToLiveMs = 60 * 1000L;+ public volatile long timeToLiveMs = 60 * 1000L;@Overridepublic ExpiringCachedDocCollection get(Object key) {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.javaindex a0d13b7c7c4..b2560bc7eae 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java@@ -230,7 +230,7 @@ public abstract class LBSolrClient extends SolrClient {}}- protected static class EndpointIterator {+ public static class EndpointIterator {Endpoint endpoint;List<Endpoint> skipped;int numServersTried;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.javaindex dbdeb16094a..1fb0da1e963 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.java@@ -26,7 +26,7 @@ public class SolrZkClientTimeout {public static final int DEFAULT_ZK_CONNECT_TIMEOUT =EnvUtils.getPropertyAsInteger("solr.zookeeper.client.connect.timeout", 15000);- interface SolrZkClientTimeoutAware {+ public interface SolrZkClientTimeoutAware {void setZkClientTimeout(int zkClientTimeout);void setZkConnectTimeout(int zkConnectTimeout);diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StallDetection.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StallDetection.javaindex d36a58168eb..2530e5c0fb8 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StallDetection.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StallDetection.java@@ -25,9 +25,9 @@ import java.util.function.IntSupplier;/*** Utility class for detecting stalls in request processing.*- * <p>This class is used by {@link ConcurrentUpdateHttp2SolrClient} and {@link- * ConcurrentUpdateSolrClient} to detect when request processing has stalled, which can happen if- * the server is unresponsive or if there's a problem with the connection.+ * <p>This class is used by {@link ConcurrentUpdateHttp2SolrClient} to detect when request+ * processing has stalled, which can happen if the server is unresponsive or if there's a problem+ * with the connection.*/public class StallDetection {private final LongAdder processedCount;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.javaindex 4866431b290..133ed764db6 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java@@ -17,7 +17,7 @@package org.apache.solr.client.solrj;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.junit.BeforeClass;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.javaindex af039be9d1c..898a9628f74 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.java@@ -27,7 +27,7 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.Set;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.javaindex 8ed1d9ded4d..50ab432931c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java@@ -41,10 +41,10 @@ import java.util.Map;import java.util.Random;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;import org.apache.solr.client.solrj.embedded.SolrExampleStreamingHttp2Test;import org.apache.solr.client.solrj.embedded.SolrExampleStreamingTest.ErrorTrackingConcurrentUpdateSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.XMLResponseParser;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.javaindex befaad61dbb..df45f977791 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java@@ -17,7 +17,7 @@package org.apache.solr.client.solrj;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.XMLRequestWriter;import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.junit.BeforeClass;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.javaindex 13c279a62dd..4c3a7d3c5dc 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java@@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.solr.SolrTestCase;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.junit.Test;/**diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.javaindex 26ed8939696..42d2e78048a 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java@@ -30,8 +30,8 @@ import org.apache.http.HttpResponse;import org.apache.http.client.HttpClient;import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.InputStreamEntity;-import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.javaindex c43ef1602d4..078d2e5c50b 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java@@ -20,8 +20,8 @@ import java.io.IOException;import java.util.Iterator;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.beans.Field;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;import org.apache.solr.client.solrj.impl.XMLRequestWriter;import org.apache.solr.client.solrj.response.QueryResponse;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 16f56d74ae0..596840c0d3e 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java@@ -29,9 +29,9 @@ import java.util.concurrent.TimeUnit;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.lucene.util.IOUtils;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;-import org.apache.solr.client.solrj.impl.LBHttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpSolrClient;+import org.apache.solr.client.solrj.apache.LBHttpSolrClient;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.SolrResponseBase;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.javaindex 8d6cc79fca7..5c6f4ad6113 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java@@ -37,7 +37,7 @@ import java.util.concurrent.CopyOnWriteArrayList;import java.util.concurrent.atomic.AtomicInteger;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;import org.apache.solr.client.solrj.impl.XMLRequestWriter;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.javaindex e08500af688..fd062f3d632 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java@@ -29,7 +29,7 @@ import org.apache.http.client.methods.HttpRequestBase;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.http.impl.client.HttpClients;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.util.ExternalPaths;import org.eclipse.jetty.ee10.webapp.WebAppContext;import org.eclipse.jetty.server.Connector;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.javaindex ee9bc159c62..9050a0dec7c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java@@ -34,8 +34,8 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrExampleTests;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.javaindex 294d3034c84..7946d9d19f6 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java@@ -22,7 +22,7 @@ import java.util.EnumSet;import java.util.List;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrExampleTests;-import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient;+import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient;import org.apache.solr.client.solrj.impl.XMLRequestWriter;import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;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 cb6ea1df7df..676c91e0bda 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@@ -61,6 +61,9 @@ 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.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpSolrClient;+import org.apache.solr.client.solrj.apache.SolrPortAwareCookieSpecFactory;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;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 e5224d3b15a..060d01a6414 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,6 +42,8 @@ import org.apache.solr.client.solrj.SolrJMetricTestUtils;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.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBuilderTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBuilderTest.javaindex 10e9c68b033..39d728394a1 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBuilderTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBuilderTest.java@@ -24,6 +24,7 @@ import java.util.List;import java.util.Optional;import java.util.concurrent.TimeUnit;import org.apache.solr.SolrTestCase;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.junit.Test;public class CloudSolrClientBuilderTest extends SolrTestCase {diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.javaindex 406023254c2..b2041bba2b8 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java@@ -35,6 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger;import java.util.function.Function;import org.apache.http.NoHttpResponseException;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.solrj.apache.LBHttpSolrClient;import org.apache.solr.client.solrj.cloud.DelegatingClusterStateProvider;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.cloud.ClusterState;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.javaindex dc540e49693..ff50829ef24 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java@@ -24,6 +24,7 @@ import java.util.List;import java.util.Optional;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCase;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.junit.Test;public class CloudSolrClientMultiConstructorTest extends SolrTestCase {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 8768f209268..7f45e692827 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,6 +42,8 @@ import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientMultiCollectionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientMultiCollectionTest.javaindex b285f819cf9..b5a0526a4db 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientMultiCollectionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientMultiCollectionTest.java@@ -21,6 +21,7 @@ import java.io.IOException;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.apache.ConcurrentUpdateSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;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 c5dceedd7c4..eb8cfa71d8a 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@@ -21,6 +21,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.apache.ConcurrentUpdateSolrClient;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/ConcurrentUpdateSolrClientBuilderTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBuilderTest.javaindex 111b306e21e..f20c2bc198b 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBuilderTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBuilderTest.java@@ -25,7 +25,8 @@ import java.util.concurrent.TimeUnit;import org.apache.solr.SolrTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient.Builder;+import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient;+import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient.Builder;import org.junit.Test;/** Unit tests for {@link Builder}. */diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientMultiCollectionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientMultiCollectionTest.javaindex 4227df3f5c8..90a4a512d62 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientMultiCollectionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientMultiCollectionTest.java@@ -21,6 +21,7 @@ import java.io.IOException;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.apache.ConcurrentUpdateSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;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 4e23bdb1d41..0ab4a03da75 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,6 +35,7 @@ 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.apache.ConcurrentUpdateSolrClient;import org.apache.solr.client.solrj.request.JavaBinUpdateRequestCodec;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;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 1b064ef16ae..006264c6603 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@@ -21,6 +21,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.apache.HttpSolrClient;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/HttpSolrClientTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.javaindex 4a25432cbfa..79266ac9024 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java@@ -41,6 +41,7 @@ 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.apache.HttpClientUtil;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;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 b9ce2a1bbfb..50b040b780f 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@@ -21,6 +21,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.apache.LBHttpSolrClient;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/PreemptiveBasicAuthClientBuilderFactoryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientBuilderFactoryTest.javaindex 0a785dd3dc5..d50ede6ba57 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientBuilderFactoryTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientBuilderFactoryTest.java@@ -24,6 +24,7 @@ import java.nio.file.Files;import java.nio.file.Path;import java.util.Properties;import org.apache.solr.SolrTestCase;+import org.apache.solr.client.solrj.apache.HttpClientUtil;public class PreemptiveBasicAuthClientBuilderFactoryTest extends SolrTestCase {diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SendUpdatesToLeadersOverrideTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SendUpdatesToLeadersOverrideTest.javaindex 89c674b01ee..48ca0bd515a 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SendUpdatesToLeadersOverrideTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SendUpdatesToLeadersOverrideTest.java@@ -32,6 +32,7 @@ import java.util.Optional;import java.util.Set;import java.util.stream.Collectors;import org.apache.solr.client.solrj.SolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestV2Request.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestV2Request.javaindex 3963886a028..09c11077fa8 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestV2Request.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestV2Request.java@@ -24,7 +24,7 @@ import java.util.List;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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.response.V2Response;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.cloud.ClusterState;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseParserTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseParserTest.javaindex e6ec1082982..4a39234d52d 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseParserTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseParserTest.java@@ -26,7 +26,7 @@ import org.apache.solr.client.solrj.ResponseParser;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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.javaindex b3a45dc36ed..f16ba45d6e9 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java@@ -24,7 +24,7 @@ import org.apache.solr.client.solrj.ResponseParser;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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradleindex 86f83e33c39..dfe4044e476 100644--- a/solr/test-framework/build.gradle+++ b/solr/test-framework/build.gradle@@ -102,4 +102,13 @@ dependencies {exclude group: "io.prometheus", module: "prometheus-metrics-shaded-protobuf"exclude group: "io.prometheus", module: "prometheus-metrics-config"})++ implementation(libs.apache.httpcomponents.httpmime, {+ exclude group: "commons-codec", module: "commons-codec"+ exclude group: "commons-logging", module: "commons-logging"+ })+ implementation libs.apache.httpcomponents.httpclient+ implementation libs.apache.httpcomponents.httpcore++ testImplementation libs.apache.commons.lang3}diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfileindex 54dd4c556a5..450ac982fe6 100644--- a/solr/test-framework/gradle.lockfile+++ b/solr/test-framework/gradle.lockfile@@ -79,14 +79,14 @@ javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessjunit:junit:4.13.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathorg.apache.commons:commons-exec:1.5.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath-org.apache.commons:commons-lang3:3.19.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath+org.apache.commons:commons-lang3:3.19.0=apiHelper,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathorg.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apache.curator:curator-test:5.9.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apache.logging.log4j:log4j-api:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apache.logging.log4j:log4j-core:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathdiff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.javaindex b1bcc99482f..69b9606f4eb 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java@@ -23,7 +23,7 @@ import java.util.SortedMap;import org.apache.commons.io.file.PathUtils;import org.apache.http.client.HttpClient;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.embedded.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.SolrJettyTestRule;diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.javaindex 45310d2c745..257e6ac9431 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java@@ -81,12 +81,12 @@ import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems;import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.Constants;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.ClusterStateProvider;import org.apache.solr.client.solrj.impl.Http2SolrClient;-import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.response.SolrResponseBase;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.cloud.IpTables;@@ -2573,10 +2573,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {}}- /**- * A variant of {@link org.apache.solr.client.solrj.impl.CloudLegacySolrClient.Builder} that will- * randomize some internal settings.- */+ /** A variant of {@code CloudSolrClient.Builder} that will randomize some internal settings. */@Deprecatedpublic static class RandomizingCloudSolrClientBuilder extends CloudLegacySolrClient.Builder {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.javasimilarity index 97%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.javaindex 2c660c63228..51ec0cca26a 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.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.impl;+package org.apache.solr.client.solrj.apache;import java.io.IOException;import java.util.ArrayList;@@ -26,6 +26,12 @@ import java.util.concurrent.TimeUnit;import org.apache.http.NoHttpResponseException;import org.apache.http.client.HttpClient;import org.apache.http.conn.ConnectTimeoutException;+import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.impl.ClusterStateProvider;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.impl.LBSolrClient;+import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;import org.apache.solr.client.solrj.impl.SolrZkClientTimeout.SolrZkClientTimeoutAware;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrException;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.javasimilarity index 99%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.javaindex 0d8e79412b1..d81314c05c8 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.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.impl;+package org.apache.solr.client.solrj.apache;import java.io.IOException;import java.io.InputStream;@@ -41,6 +41,8 @@ import org.apache.http.entity.EntityTemplate;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.impl.ConcurrentUpdateHttp2SolrClient;+import org.apache.solr.client.solrj.impl.StallDetection;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.common.SolrException;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.javasimilarity index 99%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.javaindex feb1bdbf056..1b567b74bbe 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.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.impl;+package org.apache.solr.client.solrj.apache;import java.io.IOException;import java.io.InputStream;@@ -61,6 +61,7 @@ import org.apache.http.protocol.HttpContext;import org.apache.http.protocol.HttpRequestExecutor;import org.apache.http.ssl.SSLContexts;import org.apache.http.util.EntityUtils;+import org.apache.solr.client.solrj.impl.SolrHttpConstants;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.javasimilarity index 91%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.javaindex 2877184bcde..7c715ba23f6 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.java@@ -14,12 +14,14 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.apache;import java.io.IOException;import java.util.List;import org.apache.http.client.HttpClient;import org.apache.solr.client.solrj.SolrClient;+import org.apache.solr.client.solrj.impl.BaseHttpClusterStateProvider;+import org.apache.solr.client.solrj.impl.Http2ClusterStateProvider;/*** Retrieves cluster state via Solr HTTP APIsdiff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.javasimilarity index 98%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.javaindex b5de3894268..ec2f3d2844c 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.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.impl;+package org.apache.solr.client.solrj.apache;import static org.apache.solr.common.util.Utils.getObjectByPath;@@ -76,6 +76,12 @@ import org.apache.solr.client.solrj.ResponseParser;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.impl.Http2SolrClient;+import org.apache.solr.client.solrj.impl.HttpJdkSolrClient;+import org.apache.solr.client.solrj.impl.InputStreamResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.impl.RemoteExecutionException;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.common.SolrException;@@ -95,7 +101,7 @@ import org.slf4j.MDC;* @deprecated Please use {@link Http2SolrClient} or {@link HttpJdkSolrClient}*/@Deprecated(since = "9.0")-public class HttpSolrClient extends BaseHttpSolrClient {+public class HttpSolrClient extends SolrClient {private static final Charset FALLBACK_CHARSET = StandardCharsets.UTF_8;private static final long serialVersionUID = -946812319974801896L;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.javasimilarity index 97%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.javaindex d250f0a5d8f..b926808ddb9 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.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.impl;+package org.apache.solr.client.solrj.apache;import java.util.ArrayList;import java.util.HashSet;@@ -24,6 +24,10 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.TimeUnit;import org.apache.http.client.HttpClient;import org.apache.solr.client.solrj.SolrClient;+import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.impl.LBHttp2SolrClient;+import org.apache.solr.client.solrj.impl.LBSolrClient;import org.apache.solr.common.params.ModifiableSolrParams;/**diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveAuth.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/PreemptiveAuth.javasimilarity index 98%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveAuth.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/PreemptiveAuth.javaindex 2b8c0477d58..26d02e20b07 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveAuth.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/PreemptiveAuth.java@@ -15,7 +15,7 @@* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.apache;import java.io.IOException;import org.apache.http.HttpException;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.javasimilarity index 98%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.javaindex 94657ab7b9d..8e3ccc37311 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.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.impl;+package org.apache.solr.client.solrj.apache;import java.util.Set;import java.util.concurrent.TimeUnit;@@ -22,7 +22,7 @@ import org.apache.http.client.HttpClient;import org.apache.http.client.config.RequestConfig;import org.apache.http.client.methods.Configurable;import org.apache.solr.client.solrj.ResponseParser;-import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;+import org.apache.solr.client.solrj.apache.HttpSolrClient.Builder;import org.apache.solr.client.solrj.request.RequestWriter;/**diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientBuilder.javasimilarity index 98%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientBuilder.javaindex 82bfc21c2d0..6139c8d19b8 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientBuilder.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.impl;+package org.apache.solr.client.solrj.apache;import org.apache.http.auth.AuthSchemeProvider;import org.apache.http.client.CredentialsProvider;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientContextBuilder.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientContextBuilder.javasimilarity index 98%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientContextBuilder.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientContextBuilder.javaindex 19088135180..5f50d309cc3 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientContextBuilder.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientContextBuilder.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.impl;+package org.apache.solr.client.solrj.apache;import org.apache.http.auth.AuthSchemeProvider;import org.apache.http.client.CredentialsProvider;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpRequestRetryHandler.javasimilarity index 99%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpRequestRetryHandler.javaindex 2ec94c5cbf4..b3bb70a014c 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpRequestRetryHandler.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.impl;+package org.apache.solr.client.solrj.apache;import java.io.IOException;import java.io.InterruptedIOException;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.javasimilarity index 98%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.javaindex 668fcd2ccea..64af36f273f 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.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.impl;+package org.apache.solr.client.solrj.apache;import java.util.Collection;import org.apache.http.cookie.ClientCookie;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseHttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.javasimilarity index 82%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseHttpSolrClient.javarename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.javaindex e07b98ebfcf..bfdeeef2287 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseHttpSolrClient.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java@@ -15,9 +15,5 @@* limitations under the License.*/-package org.apache.solr.client.solrj.impl;--import org.apache.solr.client.solrj.SolrClient;--@Deprecated-public abstract class BaseHttpSolrClient extends SolrClient {}+/** Apache HttpClient based {@link org.apache.solr.client.solrj.SolrClient} implementations */+package org.apache.solr.client.solrj.apache;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 c87715d3445..1dae465d515 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@@ -45,7 +45,7 @@ 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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeyNothingIsSafeTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeyNothingIsSafeTestBase.javaindex 8c8a115636e..a80134a4252 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeyNothingIsSafeTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeyNothingIsSafeTestBase.java@@ -23,7 +23,7 @@ import java.util.Set;import java.util.concurrent.TimeUnit;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.ZkStateReader;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 21e5c954d6f..1d7c0361c89 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@@ -52,9 +52,9 @@ import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;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 3cb3339f48c..1e7aa064edd 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@@ -22,8 +22,8 @@ import java.util.List;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.impl.CloudLegacySolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.javaindex 8fd212930e6..b3f254bbedc 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java@@ -30,7 +30,7 @@ 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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;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 1cbc29b1146..2ad56bdd2c6 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@@ -30,7 +30,7 @@ import java.util.concurrent.TimeoutException;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.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java b/solr/test-framework/src/java/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.javaindex 23846f0fff2..dab85c10a8d 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java@@ -26,9 +26,9 @@ import java.util.concurrent.atomic.AtomicInteger;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.apache.ConcurrentUpdateSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.common.SolrInputDocument;import org.slf4j.Logger;import org.slf4j.LoggerFactory;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 b559a233a80..01c0fe43d34 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@@ -56,8 +56,8 @@ import java.util.concurrent.atomic.AtomicReference;import java.util.function.Consumer;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.embedded.SSLConfig;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.ConfigSetAdminRequest;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 014e936289e..b5d9e805922 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,7 +41,7 @@ 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.impl.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.common.util.StrUtils;import org.apache.solr.common.util.Utils;import org.apache.solr.core.CoreContainer;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 c4cffced3df..c7d51040b4b 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@@ -43,8 +43,8 @@ import org.apache.solr.client.api.model.CoreStatusResponse;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.impl.CloudLegacySolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.common.cloud.CollectionStatePredicate;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.javaindex 2d0cb44941b..7bdef3b8082 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java@@ -31,9 +31,9 @@ import java.util.TreeMap;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest.ClusterProp;import org.apache.solr.client.solrj.response.RequestStatusState;diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.javaindex 78dcdcd24cf..8bc00fec346 100644--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java@@ -53,9 +53,9 @@ import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicLong;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.apache.HttpSolrClient;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.client.solrj.request.CoresApi;import org.apache.solr.common.util.TimeSource;import org.apache.solr.common.util.Utils;diff --git a/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.javaindex 5640c312406..93a2eef3a68 100644--- a/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java+++ b/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java@@ -32,7 +32,7 @@ import org.apache.http.entity.ContentType;import org.apache.http.entity.StringEntity;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.http.util.EntityUtils;-import org.apache.solr.client.solrj.impl.HttpClientUtil;+import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.common.params.ModifiableSolrParams;/** Facilitates testing Solr's REST API via a provided embedded Jetty */diff --git a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.javaindex 6f58d3c39fc..74e4fdf6f39 100644--- a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java+++ b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java@@ -36,8 +36,8 @@ import org.apache.http.conn.ssl.SSLConnectionSocketFactory;import org.apache.http.conn.ssl.TrustSelfSignedStrategy;import org.apache.http.ssl.SSLContextBuilder;import org.apache.http.ssl.SSLContexts;+import org.apache.solr.client.solrj.apache.HttpClientUtil.SocketFactoryRegistryProvider;import org.apache.solr.client.solrj.embedded.SSLConfig;-import org.apache.solr.client.solrj.impl.HttpClientUtil.SocketFactoryRegistryProvider;import org.apache.solr.client.solrj.impl.SolrHttpConstants;import org.eclipse.jetty.util.resource.Resource;import org.eclipse.jetty.util.resource.ResourceFactory;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 9d05b0af949..061bdaa0d5f 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@@ -21,7 +21,7 @@ import java.nio.file.Path;import java.util.Properties;import java.util.concurrent.ConcurrentHashMap;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.common.util.IOUtils;import org.apache.solr.core.CoreContainer;import org.apache.solr.embedded.JettyConfig;diff --git a/solr/core/src/test/org/apache/solr/client/solrj/impl/ConnectionReuseTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConnectionReuseTest.javasimilarity index 98%rename from solr/core/src/test/org/apache/solr/client/solrj/impl/ConnectionReuseTest.javarename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConnectionReuseTest.javaindex b10f72152e1..a5bbf93a0b2 100644--- a/solr/core/src/test/org/apache/solr/client/solrj/impl/ConnectionReuseTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConnectionReuseTest.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.impl;+package org.apache.solr.client.solrj.apache;import java.io.IOException;import java.lang.invoke.MethodHandles;@@ -46,11 +46,13 @@ import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.update.AddUpdateCommand;import org.apache.solr.util.TestInjection;import org.junit.BeforeClass;+import org.junit.Ignore;import org.junit.Test;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@SuppressSSL+@Ignore("https://issues.apache.org/jira/browse/SOLR-17962")public class ConnectionReuseTest extends SolrCloudTestCase {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpClientUtilTest.javasimilarity index 98%rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.javarename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpClientUtilTest.javaindex c75b0bf053c..193ac9e6de1 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpClientUtilTest.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.impl;+package org.apache.solr.client.solrj.apache;import java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;@@ -34,7 +34,7 @@ import org.apache.http.entity.InputStreamEntity;import org.apache.http.entity.StringEntity;import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.impl.HttpClientUtil.SocketFactoryRegistryProvider;+import org.apache.solr.client.solrj.apache.HttpClientUtil.SocketFactoryRegistryProvider;import org.apache.solr.common.util.SuppressForbidden;import org.junit.After;import org.junit.Rule;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.javasimilarity index 93%rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.javarename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.javaindex f1b79749742..fea60566e42 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.java@@ -15,7 +15,7 @@* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.apache;import java.io.IOException;import org.apache.http.client.HttpClient;@@ -23,7 +23,9 @@ import org.apache.http.impl.client.HttpClientBuilder;import org.apache.solr.SolrTestCase;import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;+import org.apache.solr.client.solrj.apache.HttpSolrClient.Builder;+import org.apache.solr.client.solrj.impl.InputStreamResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.common.params.ModifiableSolrParams;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.javasimilarity index 98%rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.javarename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.javaindex edde231559a..6022040eb3c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.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.impl;+package org.apache.solr.client.solrj.apache;import java.io.IOException;import java.util.ArrayList;@@ -29,6 +29,7 @@ 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.impl.LBSolrClient;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientSSLAuthConPoolTest.javasimilarity index 96%rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.javarename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientSSLAuthConPoolTest.javaindex ba78c0b4c7e..6fd123ca72e 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientSSLAuthConPoolTest.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.impl;+package org.apache.solr.client.solrj.apache;import java.net.URL;import java.util.Arrays;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientBuilderTest.javasimilarity index 93%rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.javarename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientBuilderTest.javaindex d2f31d05424..a0c2ec676f0 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientBuilderTest.java@@ -15,14 +15,16 @@* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.apache;import java.io.IOException;import org.apache.http.client.HttpClient;import org.apache.http.impl.client.HttpClientBuilder;import org.apache.solr.SolrTestCase;import org.apache.solr.client.solrj.ResponseParser;-import org.apache.solr.client.solrj.impl.LBHttpSolrClient.Builder;+import org.apache.solr.client.solrj.apache.LBHttpSolrClient.Builder;+import org.apache.solr.client.solrj.impl.InputStreamResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.common.params.ModifiableSolrParams;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.javasimilarity index 94%rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.javarename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.javaindex f7c1722bc01..ba97c548bb2 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.java@@ -14,12 +14,14 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.apache;import java.io.IOException;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.solr.SolrTestCase;import org.apache.solr.client.solrj.ResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.impl.LBSolrClient;import org.apache.solr.common.params.ModifiableSolrParams;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecTest.javasimilarity index 99%rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.javarename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecTest.javaindex 2f9b98d7cbd..73b1536a3c5 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecTest.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.impl;+package org.apache.solr.client.solrj.apache;import org.apache.http.cookie.CookieAttributeHandler;import org.apache.http.cookie.CookieOrigin;diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfileindex de329280360..a1ee4d70349 100644--- a/solr/webapp/gradle.lockfile+++ b/solr/webapp/gradle.lockfile@@ -76,9 +76,6 @@ org.apache.commons:commons-lang3:3.19.0=permitUnusedDeclared,solrCoreorg.apache.commons:commons-math3:3.6.1=permitUnusedDeclared,solrCoreorg.apache.curator:curator-client:5.9.0=permitUnusedDeclared,solrCoreorg.apache.curator:curator-framework:5.9.0=permitUnusedDeclared,solrCore-org.apache.httpcomponents:httpclient:4.5.14=permitUnusedDeclared,solrCore-org.apache.httpcomponents:httpcore:4.4.16=permitUnusedDeclared,solrCore-org.apache.httpcomponents:httpmime:4.5.14=permitUnusedDeclared,solrCoreorg.apache.logging.log4j:log4j-1.2-api:2.21.0=serverLiborg.apache.logging.log4j:log4j-api:2.21.0=permitUnusedDeclared,serverLib,solrCoreorg.apache.logging.log4j:log4j-core:2.21.0=permitUnusedDeclared,serverLib,solrCore