From b4a8995ceb1ac85e94755920df41fa17c5724068 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Sat, 18 Oct 2025 23:41:37 -0400 Subject: [PATCH 1/8] SOLR-16367: Don't depend on Apache HttpClient solrj-streaming DatabaseMetaDataImpl ZkController ConcurrentUpdateHttp2SolrClient (jetty) --- .../src/java/org/apache/solr/cloud/ZkController.java | 10 +++++----- .../client/solrj/io/sql/DatabaseMetaDataImpl.java | 4 ++-- .../solrj/impl/ConcurrentUpdateHttp2SolrClient.java | 12 +++++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java index bc41a64136e..d9a6cae4b5e 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java @@ -62,7 +62,7 @@ import org.apache.solr.client.solrj.cloud.SolrCloudManager; import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient; import org.apache.solr.client.solrj.impl.CloudSolrClient; -import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder; +import org.apache.solr.client.solrj.impl.Http2SolrClient; import org.apache.solr.client.solrj.impl.SolrClientCloudManager; import org.apache.solr.client.solrj.impl.SolrZkClientTimeout; import org.apache.solr.client.solrj.impl.ZkClientClusterStateProvider; @@ -2306,12 +2306,12 @@ private ZkCoreNodeProps waitForLeaderToSeeDownState( } // short timeouts, we may be in a storm and this is just best effort, and maybe we should be - // the - // leader now + // the leader now + // TODO .withHttpClient(getCoreContainer().getDefaultHttpSolrClient()) try (SolrClient client = - new Builder(leaderBaseUrl) + new Http2SolrClient.Builder(leaderBaseUrl) .withConnectionTimeout(8000, TimeUnit.MILLISECONDS) - .withSocketTimeout(30000, TimeUnit.MILLISECONDS) + .withIdleTimeout(30000, TimeUnit.MILLISECONDS) .build()) { WaitForState prepCmd = new WaitForState(); prepCmd.setCoreName(leaderCoreName); diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java index d5b71d57219..5228f98dae3 100644 --- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java +++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java @@ -28,7 +28,7 @@ import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.impl.CloudSolrClient; -import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder; +import org.apache.solr.client.solrj.impl.Http2SolrClient; import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.common.cloud.ClusterState; import org.apache.solr.common.util.SimpleOrderedMap; @@ -124,7 +124,7 @@ public String getDatabaseProductVersion() throws SQLException { for (String node : liveNodes) { try { String nodeURL = Utils.getBaseUrlForNodeName(node, urlScheme); - solrClient = new Builder(nodeURL).build(); + solrClient = new Http2SolrClient.Builder(nodeURL).build(); QueryResponse rsp = solrClient.query(sysQuery); return String.valueOf( diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java index 58f59eb8eaf..91f57fe55cc 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java @@ -32,7 +32,6 @@ 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.ConcurrentUpdateSolrClient.Update; import org.apache.solr.client.solrj.request.UpdateRequest; import org.apache.solr.client.solrj.util.ClientUtils; import org.apache.solr.common.SolrException; @@ -177,6 +176,9 @@ protected ConcurrentUpdateHttp2SolrClient(Builder builder) { // processedCount is now managed by StallDetection } + /** Class representing an UpdateRequest and an optional collection. */ + private record Update(UpdateRequest request, String collection) {} + /** Opens a connection and sends everything... */ class Runner implements Runnable { @@ -237,16 +239,16 @@ void sendUpdateStream() throws Exception { InputStreamResponseListener responseListener = null; try (Http2SolrClient.OutStream out = - client.initOutStream(basePath, update.getRequest(), update.getCollection())) { + client.initOutStream(basePath, update.request(), update.collection())) { Update upd = update; while (upd != null) { - UpdateRequest req = upd.getRequest(); - if (!out.belongToThisStream(req, upd.getCollection())) { + UpdateRequest req = upd.request(); + if (!out.belongToThisStream(req, upd.collection())) { // Request has different params or destination core/collection, return to queue queue.add(upd); break; } - client.send(out, upd.getRequest(), upd.getCollection()); + client.send(out, upd.request(), upd.collection()); out.flush(); notifyQueueAndRunnersIfEmptyQueue(); From e98ccbad88400f0b1519143dab8104713b5b003e Mon Sep 17 00:00:00 2001 From: David Smiley Date: Sat, 18 Oct 2025 23:43:54 -0400 Subject: [PATCH 2/8] SOLR-17962: Move Apache HttpClient SolrClients to test-framework They will eventually be deleted after tests are migrated. --- solr/core/gradle.lockfile | 8 ++++---- solr/cross-dc-manager/gradle.lockfile | 6 +++--- solr/modules/analysis-extras/gradle.lockfile | 6 +++--- solr/modules/clustering/gradle.lockfile | 6 +++--- solr/modules/cross-dc/gradle.lockfile | 6 +++--- solr/modules/cuvs/gradle.lockfile | 6 +++--- solr/modules/extraction/gradle.lockfile | 6 +++--- solr/modules/gcs-repository/gradle.lockfile | 6 +++--- solr/modules/jwt-auth/gradle.lockfile | 6 +++--- solr/modules/langid/gradle.lockfile | 6 +++--- solr/modules/llm/gradle.lockfile | 6 +++--- solr/modules/ltr/gradle.lockfile | 6 +++--- solr/modules/opentelemetry/gradle.lockfile | 6 +++--- solr/modules/s3-repository/gradle.lockfile | 6 +++--- solr/modules/scripting/gradle.lockfile | 6 +++--- solr/modules/sql/gradle.lockfile | 6 +++--- solr/server/gradle.lockfile | 3 --- solr/solrj-streaming/gradle.lockfile | 8 ++++---- solr/solrj-zookeeper/gradle.lockfile | 8 ++++---- solr/solrj/build.gradle | 10 +++------- solr/solrj/gradle.lockfile | 8 ++++---- .../apache/solr/client/solrj/impl/StallDetection.java | 6 +++--- solr/test-framework/build.gradle | 7 +++++++ solr/test-framework/gradle.lockfile | 6 +++--- .../solr/client/solrj/impl/CloudLegacySolrClient.java | 0 .../client/solrj/impl/ConcurrentUpdateSolrClient.java | 0 .../apache/solr/client/solrj/impl/HttpClientUtil.java | 0 .../client/solrj/impl/HttpClusterStateProvider.java | 0 .../apache/solr/client/solrj/impl/HttpSolrClient.java | 2 +- .../solr/client/solrj/impl/LBHttpSolrClient.java | 0 .../apache/solr/client/solrj/impl/PreemptiveAuth.java | 0 .../solr/client/solrj/impl/SolrClientBuilder.java | 0 .../solr/client/solrj/impl/SolrHttpClientBuilder.java | 0 .../solrj/impl/SolrHttpClientContextBuilder.java | 0 .../client/solrj/impl/SolrHttpRequestRetryHandler.java | 0 .../solrj/impl/SolrPortAwareCookieSpecFactory.java | 0 .../apache/solr/client/solrj/impl/package-info.java} | 6 +----- .../client/solrj/impl/SolrPortAwareCookieSpecTest.java | 0 solr/webapp/gradle.lockfile | 3 --- 39 files changed, 79 insertions(+), 86 deletions(-) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java (100%) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java (100%) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java (100%) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java (100%) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java (99%) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java (100%) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/PreemptiveAuth.java (100%) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java (100%) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java (100%) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientContextBuilder.java (100%) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.java (100%) rename solr/{solrj => test-framework}/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.java (100%) rename solr/{solrj/src/java/org/apache/solr/client/solrj/impl/BaseHttpSolrClient.java => test-framework/src/java/org/apache/solr/client/solrj/impl/package-info.java} (87%) rename solr/{solrj => test-framework}/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java (100%) diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index 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,runtimeClassp com.microsoft.onnxruntime:onnxruntime:1.23.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-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,testRuntimeClasspath commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath io.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,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 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,runtimeLib org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.kafka:kafka-clients:3.9.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.kafka:kafka-group-coordinator-api:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.kafka:kafka-group-coordinator:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index 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,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index 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,runtimeLib org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index 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,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.kafka:kafka-clients:3.9.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfile index 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,runtimeLib org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index fa2dc94f4cf..2c500e343de 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -122,9 +122,9 @@ org.apache.commons:commons-math3:3.6.1=compileClasspath,jarValidation,runtimeCla org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.james:apache-mime4j-core:0.8.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.james:apache-mime4j-dom:0.8.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index 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,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index 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,runtimeLib org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index 6a560903424..f91781cf6cd 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,runtimeLib org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfile index 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,runtimeLib org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index de00f483d4d..7addfe67462 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,runtimeLib org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index 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,runtimeLib org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index 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,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index 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,runtimeLib org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index 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,testRuntimeClasspath org.apache.httpcomponents.client5:httpclient5:5.2.1=jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.httpcomponents.core5:httpcore5-h2:5.2=jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index 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,solrCore org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,solrCore org.apache.curator:curator-client:5.9.0=jarValidation,runtimeClasspath,solrCore org.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,solrCore org.apache.logging.log4j:log4j-1.2-api:2.21.0=jarValidation,libExt,runtimeClasspath org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,libExt,runtimeClasspath,solrCore org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,libExt,runtimeClasspath,solrCore diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index 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,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-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,testRuntimeClasspath commons-io:commons-io:2.17.0=permitTestUnusedDeclared commons-io:commons-io:2.20.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath @@ -100,9 +100,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents.client5:httpclient5:5.2.1=jarValidation,testRuntimeClasspath org.apache.httpcomponents.core5:httpcore5-h2:5.2=jarValidation,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index 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,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-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,testRuntimeClasspath commons-io:commons-io:2.17.0=apiHelper commons-io:commons-io:2.20.0=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath @@ -97,9 +97,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspath org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle index 9965c607d27..ce5c89e1c03 100644 --- a/solr/solrj/build.gradle +++ b/solr/solrj/build.gradle @@ -43,15 +43,11 @@ dependencies { implementation libs.eclipse.jetty.io runtimeOnly 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') diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index f61d0f435e9..9edea824db7 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -31,7 +31,7 @@ com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-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,testRuntimeClasspath commons-io:commons-io:2.17.0=permitTestUnusedDeclared commons-io:commons-io:2.20.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath @@ -93,9 +93,9 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspath org.apache.curator:curator-client:5.9.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath 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.java index 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 @@ /** * Utility class for detecting stalls in request processing. * - *

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. + *

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/test-framework/build.gradle b/solr/test-framework/build.gradle index 86f83e33c39..c0f9c53a86f 100644 --- a/solr/test-framework/build.gradle +++ b/solr/test-framework/build.gradle @@ -102,4 +102,11 @@ 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 } diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index 54dd4c556a5..40547ad76d3 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -84,9 +84,9 @@ org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath, org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath 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/impl/CloudLegacySolrClient.java similarity index 100% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java 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/impl/ConcurrentUpdateSolrClient.java similarity index 100% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java 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/impl/HttpClientUtil.java similarity index 100% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java 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/impl/HttpClusterStateProvider.java similarity index 100% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java diff --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/impl/HttpSolrClient.java similarity index 99% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java index b5de3894268..d3618e0a03d 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/impl/HttpSolrClient.java @@ -95,7 +95,7 @@ * @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/impl/LBHttpSolrClient.java similarity index 100% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java 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/impl/PreemptiveAuth.java similarity index 100% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveAuth.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/PreemptiveAuth.java 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/impl/SolrClientBuilder.java similarity index 100% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java 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/impl/SolrHttpClientBuilder.java similarity index 100% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java 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/impl/SolrHttpClientContextBuilder.java similarity index 100% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientContextBuilder.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientContextBuilder.java 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/impl/SolrHttpRequestRetryHandler.java similarity index 100% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.java 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/impl/SolrPortAwareCookieSpecFactory.java similarity index 100% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.java 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/impl/package-info.java similarity index 87% rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseHttpSolrClient.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/impl/package-info.java index e07b98ebfcf..712cc4cedb1 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/impl/package-info.java @@ -15,9 +15,5 @@ * limitations under the License. */ +/** Concrete implementations of client API classes. */ package org.apache.solr.client.solrj.impl; - -import org.apache.solr.client.solrj.SolrClient; - -@Deprecated -public abstract class BaseHttpSolrClient extends SolrClient {} 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/impl/SolrPortAwareCookieSpecTest.java similarity index 100% rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java rename to solr/test-framework/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index 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,solrCore org.apache.commons:commons-math3:3.6.1=permitUnusedDeclared,solrCore org.apache.curator:curator-client:5.9.0=permitUnusedDeclared,solrCore org.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,solrCore org.apache.logging.log4j:log4j-1.2-api:2.21.0=serverLib org.apache.logging.log4j:log4j-api:2.21.0=permitUnusedDeclared,serverLib,solrCore org.apache.logging.log4j:log4j-core:2.21.0=permitUnusedDeclared,serverLib,solrCore From 54183972f739a5ae7f6d11b4bb690bd6045ce597 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Sun, 19 Oct 2025 09:18:06 -0400 Subject: [PATCH 3/8] Use the built-in client (thus listeners) instead of 8 sec connection timeout --- solr/core/src/java/org/apache/solr/cloud/ZkController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java index d9a6cae4b5e..4cb6a598432 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java @@ -2307,10 +2307,11 @@ private ZkCoreNodeProps waitForLeaderToSeeDownState( // short timeouts, we may be in a storm and this is just best effort, and maybe we should be // the leader now - // TODO .withHttpClient(getCoreContainer().getDefaultHttpSolrClient()) + // TODO ideally want 8sec connection timeout but can't easily also share the client + // listeners try (SolrClient client = new Http2SolrClient.Builder(leaderBaseUrl) - .withConnectionTimeout(8000, TimeUnit.MILLISECONDS) + .withHttpClient(getCoreContainer().getDefaultHttpSolrClient()) .withIdleTimeout(30000, TimeUnit.MILLISECONDS) .build()) { WaitForState prepCmd = new WaitForState(); From cd662db3484f63e44a1868a72f27fb8a8ba21012 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Sun, 19 Oct 2025 10:31:52 -0400 Subject: [PATCH 4/8] CHANGES.txt, ref guide --- solr/CHANGES.txt | 4 ++++ .../modules/deployment-guide/pages/solrj.adoc | 16 +++++----------- .../pages/major-changes-in-solr-10.adoc | 3 ++- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 8d209d7b4d3..a97749615d4 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -249,6 +249,10 @@ Deprecation Removals * SOLR-17771: Remove `CloudSolrClient.Builder`. (James Dyer) +* SOLR-17962: 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. + (David Smiley) + Dependency Upgrades --------------------- diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc index 1a2ad326ab4..7a78ef39969 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/LBHttpSolrClient.html[`LBHttp2SolrClient`] - an internal client tjat 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/ConcurrentUpdateSolrClient.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 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.adoc index bcd10974008..fde6ea195e5 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 Overseer From c46384b9ed05ed6361b19a7854a160caa26803fe Mon Sep 17 00:00:00 2001 From: David Smiley Date: Sun, 19 Oct 2025 13:36:04 -0400 Subject: [PATCH 5/8] ref guide changes --- .../examples/UsingSolrJRefGuideExamplesTest.java | 8 ++++---- .../modules/deployment-guide/pages/solrj.adoc | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.java b/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.java index 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.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 @@ private SolrClient getSolrClient() { 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 @@ private void ensureNoLeftoverOutputExpectations() { 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.adoc index 7a78ef39969..e61f17567f7 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc @@ -97,9 +97,9 @@ Requests are sent in the form of {solr-javadocs}/solrj/org/apache/solr/client/so - {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/LBHttpSolrClient.html[`LBHttp2SolrClient`] - an internal client tjat 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/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/ConcurrentUpdateSolrClient.html[`ConcurrentUpdateHttp2SolrClient`] - geared towards indexing-centric workloads. +- {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. === Common Configuration Options @@ -116,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"). From 19dfe0400f3653fb2987a2d91480790beda5bff0 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Mon, 27 Oct 2025 13:16:04 -0400 Subject: [PATCH 6/8] Move to package org.apache.solr.client.solrj.apache Expose some impls --- .../org/apache/solr/cloud/AliasIntegrationTest.java | 2 +- .../org/apache/solr/cloud/BalanceReplicasTest.java | 2 +- .../ChaosMonkeyNothingIsSafeWithPullReplicasTest.java | 2 +- .../org/apache/solr/cloud/CreateRoutedAliasTest.java | 2 +- .../test/org/apache/solr/cloud/ForceLeaderTest.java | 2 +- .../solr/cloud/FullSolrCloudDistribCmdsTest.java | 2 +- .../test/org/apache/solr/cloud/HttpPartitionTest.java | 2 +- .../solr/cloud/LeaderElectionContextKeyTest.java | 2 +- .../org/apache/solr/cloud/LeaderTragicEventTest.java | 2 +- .../apache/solr/cloud/LeaderVoteWaitTimeoutTest.java | 2 +- .../org/apache/solr/cloud/MigrateReplicasTest.java | 2 +- .../apache/solr/cloud/RecoveryStrategyStressTest.java | 4 ++-- .../org/apache/solr/cloud/RecoveryZkTestWithAuth.java | 4 ++-- .../test/org/apache/solr/cloud/RouteFieldTest.java | 2 +- .../test/org/apache/solr/cloud/SSLMigrationTest.java | 4 ++-- .../solr/cloud/TestAuthenticationFramework.java | 2 +- .../org/apache/solr/cloud/TestCloudConsistency.java | 2 +- .../test/org/apache/solr/cloud/TestConfigSetsAPI.java | 2 +- .../cloud/TestLeaderElectionWithEmptyReplica.java | 4 ++-- .../solr/cloud/TestMiniSolrCloudClusterSSL.java | 4 ++-- .../test/org/apache/solr/cloud/TestPullReplica.java | 2 +- .../org/apache/solr/cloud/TestRandomFlRTGCloud.java | 2 +- .../solr/cloud/TestRandomRequestDistribution.java | 2 +- .../apache/solr/cloud/TestStressInPlaceUpdates.java | 2 +- .../test/org/apache/solr/cloud/TestTlogReplica.java | 4 ++-- .../cloud/api/collections/CollectionReloadTest.java | 2 +- .../CollectionsAPIAsyncDistributedZkTest.java | 2 +- .../solr/cloud/api/collections/ShardSplitTest.java | 4 ++-- .../TestCollectionsAPIViaSolrCloudCluster.java | 2 +- .../collections/TestRequestStatusCollectionAPI.java | 2 +- .../apache/solr/filestore/TestDistribFileStore.java | 4 ++-- .../org/apache/solr/handler/TestConfigReload.java | 2 +- .../solr/handler/TestReplicationHandlerBackup.java | 2 +- .../test/org/apache/solr/handler/TestRestoreCore.java | 2 +- .../solr/handler/TestSolrConfigHandlerConcurrent.java | 2 +- .../org/apache/solr/handler/V2ApiIntegrationTest.java | 2 +- .../solr/handler/admin/AdminHandlersProxyTest.java | 2 +- .../solr/handler/admin/CoreAdminHandlerTest.java | 2 +- .../solr/handler/admin/ZookeeperReadAPITest.java | 2 +- .../admin/ZookeeperStatusHandlerFailureTest.java | 2 +- .../handler/admin/ZookeeperStatusHandlerTest.java | 2 +- .../solr/handler/admin/api/ClusterPropsAPITest.java | 4 ++-- .../DistributedQueryElevationComponentTest.java | 2 +- .../solr/handler/component/SearchHandlerTest.java | 2 +- .../solr/metrics/SolrMetricsIntegrationTest.java | 4 ++-- .../src/test/org/apache/solr/pkg/TestPackages.java | 4 ++-- .../apache/solr/schema/TestCloudManagedSchema.java | 2 +- .../org/apache/solr/search/TestCoordinatorRole.java | 2 +- .../src/test/org/apache/solr/search/TestSolrJ.java | 2 +- .../solr/security/BasicAuthIntegrationTest.java | 4 ++-- .../apache/solr/security/BasicAuthStandaloneTest.java | 2 +- .../org/apache/solr/security/MultiAuthPluginTest.java | 2 +- .../security/PKIAuthenticationIntegrationTest.java | 2 +- .../solr/security/TestAuthorizationFramework.java | 4 ++-- .../org/apache/solr/servlet/HideStackTraceTest.java | 2 +- .../org/apache/solr/servlet/SecurityHeadersTest.java | 2 +- .../solr/update/DeleteByIdWithRouterFieldTest.java | 2 +- .../apache/solr/update/SolrCmdDistributorTest.java | 2 +- .../apache/solr/update/TestInPlaceUpdatesDistrib.java | 2 +- .../TestSimplePropagatorDistributedTracing.java | 2 +- .../security/jwt/JWTAuthPluginIntegrationTest.java | 2 +- solr/solrj/build.gradle | 1 - solr/solrj/gradle.lockfile | 2 +- .../solr/client/solrj/impl/CloudSolrClient.java | 4 ++-- .../apache/solr/client/solrj/impl/LBSolrClient.java | 2 +- .../solr/client/solrj/impl/SolrZkClientTimeout.java | 2 +- .../solr/client/solrj/SolrExampleBinaryTest.java | 2 +- .../apache/solr/client/solrj/SolrExampleCborTest.java | 2 +- .../apache/solr/client/solrj/SolrExampleTests.java | 2 +- .../apache/solr/client/solrj/SolrExampleXMLTest.java | 2 +- .../apache/solr/client/solrj/SolrExceptionTest.java | 4 ++-- .../solr/client/solrj/SolrSchemalessExampleTest.java | 4 ++-- .../org/apache/solr/client/solrj/TestBatchUpdate.java | 2 +- .../solr/client/solrj/TestLBHttpSolrClient.java | 6 +++--- .../solr/client/solrj/TestSolrJErrorHandling.java | 2 +- .../solr/client/solrj/embedded/JettyWebappTest.java | 2 +- .../client/solrj/embedded/SolrExampleJettyTest.java | 4 ++-- .../solrj/embedded/SolrExampleStreamingTest.java | 2 +- .../client/solrj/impl/BasicHttpSolrClientTest.java | 3 +++ .../client/solrj/impl/CloudHttp2SolrClientTest.java | 2 ++ .../client/solrj/impl/CloudSolrClientBuilderTest.java | 1 + .../client/solrj/impl/CloudSolrClientCacheTest.java | 1 + .../impl/CloudSolrClientMultiConstructorTest.java | 1 + .../solr/client/solrj/impl/CloudSolrClientTest.java | 2 ++ ...rrentUpdateHttp2SolrClientMultiCollectionTest.java | 1 + .../impl/ConcurrentUpdateSolrClientBadInputTest.java | 1 + .../impl/ConcurrentUpdateSolrClientBuilderTest.java | 3 ++- ...ConcurrentUpdateSolrClientMultiCollectionTest.java | 1 + .../solrj/impl/ConcurrentUpdateSolrClientTest.java | 1 + .../client/solrj/impl/HttpSolrClientBadInputTest.java | 1 + .../client/solrj/impl/HttpSolrClientTestBase.java | 1 + .../solrj/impl/LBHttpSolrClientBadInputTest.java | 1 + .../PreemptiveBasicAuthClientBuilderFactoryTest.java | 1 + .../solrj/impl/SendUpdatesToLeadersOverrideTest.java | 1 + .../solr/client/solrj/request/TestV2Request.java | 2 +- .../solrj/response/InputStreamResponseParserTest.java | 2 +- .../client/solrj/response/TestSuggesterResponse.java | 2 +- solr/test-framework/build.gradle | 2 ++ solr/test-framework/gradle.lockfile | 2 +- .../src/java/org/apache/solr/SolrJettyTestBase.java | 2 +- .../src/java/org/apache/solr/SolrTestCaseJ4.java | 11 ++++------- .../solrj/{impl => apache}/CloudLegacySolrClient.java | 8 +++++++- .../{impl => apache}/ConcurrentUpdateSolrClient.java | 4 +++- .../client/solrj/{impl => apache}/HttpClientUtil.java | 3 ++- .../{impl => apache}/HttpClusterStateProvider.java | 4 +++- .../client/solrj/{impl => apache}/HttpSolrClient.java | 8 +++++++- .../solrj/{impl => apache}/LBHttpSolrClient.java | 6 +++++- .../client/solrj/{impl => apache}/PreemptiveAuth.java | 2 +- .../solrj/{impl => apache}/SolrClientBuilder.java | 4 ++-- .../solrj/{impl => apache}/SolrHttpClientBuilder.java | 2 +- .../SolrHttpClientContextBuilder.java | 2 +- .../{impl => apache}/SolrHttpRequestRetryHandler.java | 2 +- .../SolrPortAwareCookieSpecFactory.java | 2 +- .../client/solrj/{impl => apache}/package-info.java | 4 ++-- .../cloud/AbstractBasicDistributedZkTestBase.java | 2 +- .../AbstractChaosMonkeyNothingIsSafeTestBase.java | 2 +- .../solr/cloud/AbstractFullDistribZkTestBase.java | 2 +- .../apache/solr/cloud/AbstractRecoveryZkTestBase.java | 4 ++-- .../apache/solr/cloud/AbstractSyncSliceTestBase.java | 2 +- .../cloud/AbstractUnloadDistributedZkTestBase.java | 2 +- .../cloud/FullThrottleStoppableIndexingThread.java | 4 ++-- .../org/apache/solr/cloud/MiniSolrCloudCluster.java | 2 +- .../org/apache/solr/cloud/SolrCloudAuthTestCase.java | 2 +- .../java/org/apache/solr/cloud/SolrCloudTestCase.java | 4 ++-- .../AbstractCloudBackupRestoreTestCase.java | 4 ++-- .../org/apache/solr/embedded/JettySolrRunner.java | 2 +- .../java/org/apache/solr/util/RestTestHarness.java | 2 +- .../src/java/org/apache/solr/util/SSLTestConfig.java | 2 +- .../java/org/apache/solr/util/SolrJettyTestRule.java | 2 +- .../client/solrj/apache}/ConnectionReuseTest.java | 2 +- .../solr/client/solrj/apache}/HttpClientUtilTest.java | 4 ++-- .../solrj/apache}/HttpSolrClientBuilderTest.java | 6 ++++-- .../solrj/apache}/HttpSolrClientConPoolTest.java | 3 ++- .../apache}/HttpSolrClientSSLAuthConPoolTest.java | 2 +- .../solrj/apache}/LBHttpSolrClientBuilderTest.java | 6 ++++-- .../client/solrj/apache}/LBHttpSolrClientTest.java | 4 +++- .../{impl => apache}/SolrPortAwareCookieSpecTest.java | 2 +- 137 files changed, 201 insertions(+), 155 deletions(-) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/CloudLegacySolrClient.java (97%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/ConcurrentUpdateSolrClient.java (99%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/HttpClientUtil.java (99%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/HttpClusterStateProvider.java (91%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/HttpSolrClient.java (98%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/LBHttpSolrClient.java (97%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/PreemptiveAuth.java (98%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/SolrClientBuilder.java (98%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/SolrHttpClientBuilder.java (98%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/SolrHttpClientContextBuilder.java (98%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/SolrHttpRequestRetryHandler.java (99%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/SolrPortAwareCookieSpecFactory.java (98%) rename solr/test-framework/src/java/org/apache/solr/client/solrj/{impl => apache}/package-info.java (85%) rename solr/{core/src/test/org/apache/solr/client/solrj/impl => test-framework/src/test/org/apache/solr/client/solrj/apache}/ConnectionReuseTest.java (99%) rename solr/{solrj/src/test/org/apache/solr/client/solrj/impl => test-framework/src/test/org/apache/solr/client/solrj/apache}/HttpClientUtilTest.java (98%) rename solr/{solrj/src/test/org/apache/solr/client/solrj/impl => test-framework/src/test/org/apache/solr/client/solrj/apache}/HttpSolrClientBuilderTest.java (93%) rename solr/{solrj/src/test/org/apache/solr/client/solrj/impl => test-framework/src/test/org/apache/solr/client/solrj/apache}/HttpSolrClientConPoolTest.java (98%) rename solr/{solrj/src/test/org/apache/solr/client/solrj/impl => test-framework/src/test/org/apache/solr/client/solrj/apache}/HttpSolrClientSSLAuthConPoolTest.java (96%) rename solr/{solrj/src/test/org/apache/solr/client/solrj/impl => test-framework/src/test/org/apache/solr/client/solrj/apache}/LBHttpSolrClientBuilderTest.java (93%) rename solr/{solrj/src/test/org/apache/solr/client/solrj/impl => test-framework/src/test/org/apache/solr/client/solrj/apache}/LBHttpSolrClientTest.java (94%) rename solr/test-framework/src/test/org/apache/solr/client/solrj/{impl => apache}/SolrPortAwareCookieSpecTest.java (99%) diff --git a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.java index 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 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.java index 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 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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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 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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.java index 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 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/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 index 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.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/solrj/build.gradle b/solr/solrj/build.gradle index ce5c89e1c03..b9520d5b0fd 100644 --- a/solr/solrj/build.gradle +++ b/solr/solrj/build.gradle @@ -88,7 +88,6 @@ dependencies { testRuntimeOnly(libs.apache.log4j.slf4j2impl, { exclude group: "org.apache.logging.log4j", module: "log4j-api" }) - testImplementation libs.apache.commons.lang3 testImplementation libs.fasterxml.jackson.core.core } diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 9edea824db7..db547de09b9 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -88,7 +88,7 @@ junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.17.7=jarValidation,testCompileClasspath,testRuntimeClasspath org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspath org.apache.curator:curator-client:5.9.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=jarValidation,testCompileClasspath,testRuntimeClasspath diff --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.java index 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 { + protected static class StateCache extends ConcurrentHashMap { 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; @Override public 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.java index 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 boolean equals(Object obj) { } } - protected static class EndpointIterator { + public static class EndpointIterator { Endpoint endpoint; List 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.java index 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/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java index 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.java index 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.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.java index 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.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.java index 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.java index 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 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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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 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.java index 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 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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.gradle index c0f9c53a86f..dfe4044e476 100644 --- a/solr/test-framework/build.gradle +++ b/solr/test-framework/build.gradle @@ -109,4 +109,6 @@ dependencies { }) 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.lockfile index 40547ad76d3..450ac982fe6 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -79,7 +79,7 @@ javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcess junit:junit:4.13.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.antlr:antlr4-runtime:4.13.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.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,testRuntimeClasspath org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java index 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 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.java index 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.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 @@ private void randomizeCloudSolrClient() { } } - /** - * 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. */ @Deprecated public static class RandomizingCloudSolrClientBuilder extends CloudLegacySolrClient.Builder { diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.java similarity index 97% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.java index 2c660c63228..51ec0cca26a 100644 --- a/solr/test-framework/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 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/test-framework/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java similarity index 99% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java index 0d8e79412b1..d81314c05c8 100644 --- a/solr/test-framework/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.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/test-framework/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java similarity index 99% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java index feb1bdbf056..1b567b74bbe 100644 --- a/solr/test-framework/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.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/test-framework/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.java similarity index 91% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.java index 2877184bcde..7c715ba23f6 100644 --- a/solr/test-framework/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 APIs diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java similarity index 98% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java index d3618e0a03d..ec2f3d2844c 100644 --- a/solr/test-framework/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.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; diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java similarity index 97% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java index d250f0a5d8f..b926808ddb9 100644 --- a/solr/test-framework/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.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/test-framework/src/java/org/apache/solr/client/solrj/impl/PreemptiveAuth.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/PreemptiveAuth.java similarity index 98% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/PreemptiveAuth.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/PreemptiveAuth.java index 2b8c0477d58..26d02e20b07 100644 --- a/solr/test-framework/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/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java similarity index 98% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java index 94657ab7b9d..8e3ccc37311 100644 --- a/solr/test-framework/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.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/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientBuilder.java similarity index 98% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientBuilder.java index 82bfc21c2d0..6139c8d19b8 100644 --- a/solr/test-framework/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/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientContextBuilder.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientContextBuilder.java similarity index 98% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientContextBuilder.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientContextBuilder.java index 19088135180..5f50d309cc3 100644 --- a/solr/test-framework/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/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpRequestRetryHandler.java similarity index 99% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpRequestRetryHandler.java index 2ec94c5cbf4..b3bb70a014c 100644 --- a/solr/test-framework/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/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.java similarity index 98% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.java index 668fcd2ccea..64af36f273f 100644 --- a/solr/test-framework/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/test-framework/src/java/org/apache/solr/client/solrj/impl/package-info.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java similarity index 85% rename from solr/test-framework/src/java/org/apache/solr/client/solrj/impl/package-info.java rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java index 712cc4cedb1..bfdeeef2287 100644 --- a/solr/test-framework/src/java/org/apache/solr/client/solrj/impl/package-info.java +++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java @@ -15,5 +15,5 @@ * limitations under the License. */ -/** Concrete implementations of client API classes. */ -package org.apache.solr.client.solrj.impl; +/** 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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java index 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 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.java index 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 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.java index 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.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.java index 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.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.java index 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.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.java index 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 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.java index 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.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.java index 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.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.java index 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.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.java index 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.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.java similarity index 99% rename from solr/core/src/test/org/apache/solr/client/solrj/impl/ConnectionReuseTest.java rename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConnectionReuseTest.java index b10f72152e1..5768f34f6e9 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; 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.java similarity index 98% rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java rename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpClientUtilTest.java index 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.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.java similarity index 93% rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.java rename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.java index 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.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.java similarity index 98% rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java rename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.java index 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.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.java similarity index 96% rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.java rename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientSSLAuthConPoolTest.java index 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.java similarity index 93% rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.java rename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientBuilderTest.java index 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.java similarity index 94% rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java rename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.java index 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/test-framework/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecTest.java similarity index 99% rename from solr/test-framework/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java rename to solr/test-framework/src/test/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecTest.java index 2f9b98d7cbd..73b1536a3c5 100644 --- a/solr/test-framework/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; From 2bffd89d8188f48b92ab6ecb1aa0caed1dd91f79 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Mon, 27 Oct 2025 20:33:33 -0400 Subject: [PATCH 7/8] Move CHANGES.txt entry to changelog --- .../SOLR-17962-MoveDeprecatedToTestFramework.yml | 12 ++++++++++++ solr/CHANGES.txt | 4 ---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/SOLR-17962-MoveDeprecatedToTestFramework.yml diff --git a/changelog/unreleased/SOLR-17962-MoveDeprecatedToTestFramework.yml b/changelog/unreleased/SOLR-17962-MoveDeprecatedToTestFramework.yml new file mode 100644 index 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: + - 17962 diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index c188bbfcd92..7b0393fd50e 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -255,10 +255,6 @@ Deprecation Removals * SOLR-17771: Remove `CloudSolrClient.Builder`. (James Dyer) -* SOLR-17962: 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. - (David Smiley) - Dependency Upgrades --------------------- From b446b93a8f2863e6d855a90c615128625bc11004 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Tue, 28 Oct 2025 22:00:45 -0400 Subject: [PATCH 8/8] ignore a test we're going to delete soon --- .../apache/solr/client/solrj/apache/ConnectionReuseTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConnectionReuseTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConnectionReuseTest.java index 5768f34f6e9..a5bbf93a0b2 100644 --- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConnectionReuseTest.java +++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConnectionReuseTest.java @@ -46,11 +46,13 @@ 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());