From 755c6d1364abce5ecd153666df3df8f0b58ec467 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Fri, 31 Oct 2025 22:28:45 -0400
Subject: [PATCH 01/27] SOLR-17968: Rename HttpSolrClient to
 HttpApacheSolrClient

WILL NOT COMPILE

Not widely updating anything yet; just touch this source file.
---
 ...rClient.java => HttpApacheSolrClient.java} | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
 rename solr/test-framework/src/java/org/apache/solr/client/solrj/apache/{HttpSolrClient.java => HttpApacheSolrClient.java} (98%)

diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
similarity index 98%
rename from solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java
rename to solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
index ec2f3d2844c6..4edc49d3d853 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
@@ -101,7 +101,7 @@
  * @deprecated Please use {@link Http2SolrClient} or {@link HttpJdkSolrClient}
  */
 @Deprecated(since = "9.0")
-public class HttpSolrClient extends SolrClient {
+public class HttpApacheSolrClient extends SolrClient {
 
   private static final Charset FALLBACK_CHARSET = StandardCharsets.UTF_8;
   private static final long serialVersionUID = -946812319974801896L;
@@ -111,7 +111,7 @@ public class HttpSolrClient extends SolrClient {
   static final String USER_AGENT =
       "Solr[" + MethodHandles.lookup().lookupClass().getName() + "] " + SolrVersion.LATEST_STRING;
 
-  static final Class<HttpSolrClient> cacheKey = HttpSolrClient.class;
+  static final Class<HttpApacheSolrClient> cacheKey = HttpApacheSolrClient.class;
 
   /** The URL of the Solr server. */
   protected volatile String baseUrl;
@@ -153,7 +153,7 @@ public class HttpSolrClient extends SolrClient {
   private final int soTimeout;
 
   /** Use the builder to create this client */
-  protected HttpSolrClient(Builder builder) {
+  protected HttpApacheSolrClient(Builder builder) {
     this.baseUrl = builder.baseSolrUrl;
     if (baseUrl.endsWith("/")) {
       baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
@@ -807,7 +807,7 @@ public boolean isUseMultiPartPost() {
   }
 
   /**
-   * Constructs {@link HttpSolrClient} instances from provided configuration.
+   * Constructs {@link HttpApacheSolrClient} instances from provided configuration.
    *
    * @deprecated Please use {@link Http2SolrClient}
    */
@@ -827,7 +827,7 @@ public Builder() {
      * <p>The provided URL must point to the root Solr path ("/solr"), for example:
      *
      * <pre>
-     *   SolrClient client = new HttpSolrClient.Builder()
+     *   SolrClient client = new HttpApacheSolrClient.Builder()
      *       .withBaseSolrUrl("http://my-solr-server:8983/solr")
      *       .withDefaultCollection("core1")
      *       .build();
@@ -864,14 +864,14 @@ public Builder(String baseSolrUrl) {
       this.responseParser = new JavaBinResponseParser();
     }
 
-    /** Chooses whether created {@link HttpSolrClient}s use compression by default. */
+    /** Chooses whether created clients use compression by default. */
     public Builder allowCompression(boolean compression) {
       this.compression = compression;
       return this;
     }
 
     /**
-     * Adds to the set of params that the created {@link HttpSolrClient} will add on all requests
+     * Adds to the set of params that the created client will add on all requests
      *
      * @param params a set of parameters to add to the invariant-params list. These params must be
      *     unique and may not duplicate a param already in the invariant list.
@@ -889,14 +889,14 @@ public Builder withInvariantParams(ModifiableSolrParams params) {
       return this;
     }
 
-    /** Create a {@link HttpSolrClient} based on provided configuration. */
-    public HttpSolrClient build() {
+    /** Create a {@link HttpApacheSolrClient} based on provided configuration. */
+    public HttpApacheSolrClient build() {
       if (baseSolrUrl == null) {
         throw new IllegalArgumentException(
             "Cannot create HttpSolrClient without a valid baseSolrUrl!");
       }
 
-      return new HttpSolrClient(this);
+      return new HttpApacheSolrClient(this);
     }
 
     @Override

From f35170a3a587562f14ef25da184d87704d98bc40 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Fri, 31 Oct 2025 22:53:40 -0400
Subject: [PATCH 02/27] SOLR-17968: HttpSolrClient returns in
 org.apache.solr.client.solrj

WILL NOT COMPILE

Enhanced our clients to use it.
---
 .../solr/client/solrj/HttpSolrClient.java     | 31 +++++++++++++++
 .../client/solrj/impl/HttpSolrClientBase.java | 39 +++++++++----------
 .../solrj/apache/HttpApacheSolrClient.java    | 21 +++++-----
 3 files changed, 61 insertions(+), 30 deletions(-)
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/HttpSolrClient.java

diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/HttpSolrClient.java
new file mode 100644
index 000000000000..4bb0b409fb72
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/HttpSolrClient.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.client.solrj;
+
+/** A {@link SolrClient} based on HTTP. */
+public abstract class HttpSolrClient extends SolrClient {
+  protected final String baseUrl;
+
+  protected HttpSolrClient(String baseUrl) {
+    this.baseUrl = baseUrl;
+  }
+
+  /** Typically looks like {@code http://localhost:8983/solr} (no core or collection) */
+  public String getBaseURL() {
+    return baseUrl;
+  }
+}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
index 92cc3b79cafb..83274cab8acd 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
@@ -35,6 +35,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
+import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.ResponseParser;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
@@ -48,15 +49,12 @@
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.common.util.Utils;
 
-public abstract class HttpSolrClientBase extends SolrClient {
+public abstract class HttpSolrClientBase extends HttpSolrClient {
 
   protected static final String DEFAULT_PATH = ClientUtils.DEFAULT_PATH;
   protected static final Charset FALLBACK_CHARSET = StandardCharsets.UTF_8;
   private static final List<String> errPath = Arrays.asList("metadata", "error-class");
 
-  /** The URL of the Solr server. */
-  protected final String serverBaseUrl;
-
   protected final long requestTimeoutMillis;
 
   protected final Set<String> urlParamNames;
@@ -71,18 +69,7 @@ public abstract class HttpSolrClientBase extends SolrClient {
   protected final String basicAuthAuthorizationStr;
 
   protected HttpSolrClientBase(String serverBaseUrl, HttpSolrClientBuilderBase<?, ?> builder) {
-    if (serverBaseUrl != null) {
-      if (!serverBaseUrl.equals("/") && serverBaseUrl.endsWith("/")) {
-        serverBaseUrl = serverBaseUrl.substring(0, serverBaseUrl.length() - 1);
-      }
-
-      if (serverBaseUrl.startsWith("//")) {
-        serverBaseUrl = serverBaseUrl.substring(1, serverBaseUrl.length());
-      }
-      this.serverBaseUrl = serverBaseUrl;
-    } else {
-      this.serverBaseUrl = null;
-    }
+    super(extractBaseUrl(serverBaseUrl));
     this.requestTimeoutMillis = builder.getRequestTimeoutMillis();
     this.basicAuthAuthorizationStr = builder.basicAuthAuthorizationStr;
     if (builder.requestWriter != null) {
@@ -99,11 +86,25 @@ protected HttpSolrClientBase(String serverBaseUrl, HttpSolrClientBuilderBase<?,
     }
   }
 
+  private static String extractBaseUrl(String serverBaseUrl) {
+    if (serverBaseUrl == null) {
+      return null;
+    }
+    if (!serverBaseUrl.equals("/") && serverBaseUrl.endsWith("/")) {
+      serverBaseUrl = serverBaseUrl.substring(0, serverBaseUrl.length() - 1);
+    }
+
+    if (serverBaseUrl.startsWith("//")) {
+      serverBaseUrl = serverBaseUrl.substring(1);
+    }
+    return serverBaseUrl;
+  }
+
   public abstract HttpSolrClientBuilderBase<?, ?> builder();
 
   protected String getRequestUrl(SolrRequest<?> solrRequest, String collection)
       throws MalformedURLException {
-    return ClientUtils.buildRequestUrl(solrRequest, serverBaseUrl, collection);
+    return ClientUtils.buildRequestUrl(solrRequest, getBaseURL(), collection);
   }
 
   protected ResponseParser responseParser(SolrRequest<?> solrRequest) {
@@ -370,10 +371,6 @@ public boolean isV2ApiRequest(final SolrRequest<?> request) {
     return request.getApiVersion() == SolrRequest.ApiVersion.V2;
   }
 
-  public String getBaseURL() {
-    return serverBaseUrl;
-  }
-
   public ResponseParser getParser() {
     return parser;
   }
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
index 4edc49d3d853..d35905e9901b 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
@@ -72,6 +72,7 @@
 import org.apache.http.message.BasicHeader;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.solr.client.api.util.SolrVersion;
+import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.ResponseParser;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
@@ -101,7 +102,7 @@
  * @deprecated Please use {@link Http2SolrClient} or {@link HttpJdkSolrClient}
  */
 @Deprecated(since = "9.0")
-public class HttpApacheSolrClient extends SolrClient {
+public class HttpApacheSolrClient extends HttpSolrClient {
 
   private static final Charset FALLBACK_CHARSET = StandardCharsets.UTF_8;
   private static final long serialVersionUID = -946812319974801896L;
@@ -113,9 +114,6 @@ public class HttpApacheSolrClient extends SolrClient {
 
   static final Class<HttpApacheSolrClient> cacheKey = HttpApacheSolrClient.class;
 
-  /** The URL of the Solr server. */
-  protected volatile String baseUrl;
-
   /**
    * Default value: null / empty.
    *
@@ -154,10 +152,7 @@ public class HttpApacheSolrClient extends SolrClient {
 
   /** Use the builder to create this client */
   protected HttpApacheSolrClient(Builder builder) {
-    this.baseUrl = builder.baseSolrUrl;
-    if (baseUrl.endsWith("/")) {
-      baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
-    }
+    super(extractBaseUrl(builder));
 
     if (baseUrl.indexOf('?') >= 0) {
       throw new RuntimeException(
@@ -192,6 +187,14 @@ protected HttpApacheSolrClient(Builder builder) {
     this.defaultCollection = builder.defaultCollection;
   }
 
+  private static String extractBaseUrl(Builder builder) {
+    String baseUrl = builder.baseSolrUrl;
+    if (baseUrl.endsWith("/")) {
+      baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
+    }
+    return baseUrl;
+  }
+
   public Set<String> getUrlParamNames() {
     return urlParamNames;
   }
@@ -845,7 +848,7 @@ public Builder withBaseSolrUrl(String baseSolrUrl) {
      * <p>The provided URL must point to the root Solr path ("/solr"), for example:
      *
      * <pre>
-     *   SolrClient client = new HttpSolrClient.Builder("http://my-solr-server:8983/solr")
+     *   SolrClient client = new HttpApacheSolrClient.Builder("http://my-solr-server:8983/solr")
      *       .withDefaultCollection("core1")
      *       .build();
      *   QueryResponse resp = client.query(new SolrQuery("*:*"));

From 7552398adadaf3792e4966da1c8492d5624c362c Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Fri, 31 Oct 2025 23:26:21 -0400
Subject: [PATCH 03/27] Reference HttpApacheSolrClient where appropriate.

---
 .../apache/solr/cloud/HttpPartitionTest.java  |  4 +-
 .../cloud/LeaderElectionContextKeyTest.java   |  4 +-
 .../solr/cloud/LeaderTragicEventTest.java     |  7 +--
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java |  4 +-
 .../cloud/RecoveryStrategyStressTest.java     |  4 +-
 .../solr/cloud/RecoveryZkTestWithAuth.java    |  4 +-
 .../org/apache/solr/cloud/RouteFieldTest.java |  4 +-
 .../solr/cloud/TestCloudConsistency.java      |  4 +-
 .../TestLeaderElectionWithEmptyReplica.java   |  4 +-
 .../cloud/TestMiniSolrCloudClusterSSL.java    |  4 +-
 .../solr/cloud/TestRandomFlRTGCloud.java      |  6 +--
 .../cloud/TestRandomRequestDistribution.java  |  6 +--
 .../solr/cloud/TestStressInPlaceUpdates.java  |  2 +-
 .../apache/solr/cloud/TestTlogReplica.java    |  8 ++--
 .../CollectionsAPIAsyncDistributedZkTest.java |  4 +-
 .../cloud/api/collections/ShardSplitTest.java |  8 ++--
 .../TestRequestStatusCollectionAPI.java       |  4 +-
 .../solr/filestore/TestDistribFileStore.java  |  9 ++--
 .../handler/TestReplicationHandlerBackup.java |  4 +-
 .../apache/solr/handler/TestRestoreCore.java  |  4 +-
 .../handler/admin/CoreAdminHandlerTest.java   | 22 +++++-----
 .../handler/admin/ZookeeperReadAPITest.java   |  9 ++--
 .../ZookeeperStatusHandlerFailureTest.java    |  4 +-
 .../admin/ZookeeperStatusHandlerTest.java     |  4 +-
 .../admin/api/ClusterPropsAPITest.java        |  8 ++--
 ...istributedQueryElevationComponentTest.java |  4 +-
 .../handler/component/SearchHandlerTest.java  |  8 ++--
 .../metrics/SolrMetricsIntegrationTest.java   |  4 +-
 .../org/apache/solr/pkg/TestPackages.java     |  6 +--
 .../solr/schema/TestCloudManagedSchema.java   |  4 +-
 .../solr/search/TestCoordinatorRole.java      | 10 ++---
 .../solr/servlet/SecurityHeadersTest.java     |  4 +-
 .../update/DeleteByIdWithRouterFieldTest.java |  4 +-
 .../solr/update/SolrCmdDistributorTest.java   |  2 +-
 .../update/TestInPlaceUpdatesDistrib.java     |  2 +-
 .../client/solrj/SolrExampleBinaryTest.java   |  4 +-
 .../client/solrj/SolrExampleCborTest.java     |  4 +-
 .../solr/client/solrj/SolrExampleTests.java   |  1 -
 .../solr/client/solrj/SolrExampleXMLTest.java |  4 +-
 .../solr/client/solrj/SolrExceptionTest.java  |  4 +-
 .../solrj/SolrSchemalessExampleTest.java      |  6 +--
 .../solr/client/solrj/TestBatchUpdate.java    |  8 ++--
 .../client/solrj/TestLBHttpSolrClient.java    |  4 +-
 .../client/solrj/TestSolrJErrorHandling.java  |  6 +--
 .../solrj/embedded/SolrExampleJettyTest.java  |  4 +-
 .../solrj/impl/BasicHttpSolrClientTest.java   | 44 ++++++++++---------
 .../impl/HttpSolrClientBadInputTest.java      |  2 +-
 .../client/solrj/request/TestV2Request.java   |  8 ++--
 .../InputStreamResponseParserTest.java        |  4 +-
 .../solrj/response/TestSuggesterResponse.java |  4 +-
 .../org/apache/solr/SolrJettyTestBase.java    |  6 +--
 .../java/org/apache/solr/SolrTestCaseJ4.java  |  9 ++--
 .../apache/ConcurrentUpdateSolrClient.java    |  9 ++--
 .../client/solrj/apache/HttpClientUtil.java   |  2 +-
 .../apache/HttpClusterStateProvider.java      |  5 ++-
 .../client/solrj/apache/LBHttpSolrClient.java | 17 +++----
 .../solrj/apache/SolrClientBuilder.java       |  2 +-
 .../AbstractBasicDistributedZkTestBase.java   |  9 ++--
 .../cloud/AbstractFullDistribZkTestBase.java  | 11 ++---
 .../cloud/AbstractRecoveryZkTestBase.java     |  4 +-
 .../solr/cloud/AbstractSyncSliceTestBase.java |  4 +-
 .../AbstractUnloadDistributedZkTestBase.java  | 10 ++---
 .../FullThrottleStoppableIndexingThread.java  |  2 +-
 .../apache/solr/cloud/SolrCloudTestCase.java  |  4 +-
 .../AbstractCloudBackupRestoreTestCase.java   |  4 +-
 .../apache/solr/embedded/JettySolrRunner.java |  6 +--
 .../apache/solr/util/SolrJettyTestRule.java   |  4 +-
 .../solrj/apache/ConnectionReuseTest.java     |  6 +--
 .../apache/HttpSolrClientBuilderTest.java     | 15 ++++---
 .../apache/HttpSolrClientConPoolTest.java     | 10 ++---
 .../solrj/apache/LBHttpSolrClientTest.java    |  4 +-
 71 files changed, 229 insertions(+), 214 deletions(-)

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 8332d2646d25..17d45100da9b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -36,7 +36,7 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.cloud.SocketProxy;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -522,7 +522,7 @@ protected SolrClient getHttpSolrClient(Replica replica, String collection) {
   protected int sendDoc(String collectionName, int docId, JettySolrRunner leaderJetty)
       throws IOException, SolrServerException {
     try (SolrClient solrClient =
-        new HttpSolrClient.Builder(leaderJetty.getBaseUrl().toString()).build()) {
+        new HttpApacheSolrClient.Builder(leaderJetty.getBaseUrl().toString()).build()) {
       return sendDoc(docId, solrClient, collectionName);
     }
   }
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 ea48ae83a960..dde69729546a 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.common.cloud.ClusterState;
@@ -93,7 +93,7 @@ public void test()
     assertNotNull(replica);
 
     try (SolrClient shardLeaderClient =
-        new HttpSolrClient.Builder(replica.get("base_url").toString()).build()) {
+        new HttpApacheSolrClient.Builder(replica.get("base_url").toString()).build()) {
       assertEquals(
           1L, getElectionNodes(TEST_COLLECTION_1, shard, stateReader.getZkClient()).size());
       List<String> collection2Shard1Nodes =
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 49b0fdc50726..779cd911eb33 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -113,7 +113,7 @@ public void testLeaderFailsOver() throws Exception {
     updateResponse = new UpdateRequest().add("id", "2").commit(cluster.getSolrClient(), collection);
     assertEquals(0, updateResponse.getStatus());
     try (SolrClient followerClient =
-        new HttpSolrClient.Builder(oldLeader.getBaseUrl())
+        new HttpApacheSolrClient.Builder(oldLeader.getBaseUrl())
             .withDefaultCollection(oldLeader.getCoreName())
             .build()) {
       QueryResponse queryResponse = new QueryRequest(new SolrQuery("*:*")).process(followerClient);
@@ -131,7 +131,8 @@ private Replica corruptLeader(String collection) throws IOException, SolrServerE
       log.info("Will crash leader : {}", oldLeader);
 
       final Replica leaderReplica = dc.getLeader("shard1");
-      try (SolrClient solrClient = new HttpSolrClient.Builder(leaderReplica.getBaseUrl()).build()) {
+      try (SolrClient solrClient =
+          new HttpApacheSolrClient.Builder(leaderReplica.getBaseUrl()).build()) {
         new UpdateRequest().add("id", "99").commit(solrClient, leaderReplica.getCoreName());
         fail("Should have injected tragedy");
       } catch (RemoteSolrException e) {
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 a81204dfee58..6fb4194d505c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
@@ -34,7 +34,7 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.cloud.SocketProxy;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
@@ -295,7 +295,7 @@ public void testMostInSyncReplicasCanWinElection() throws Exception {
   private void addDoc(String collection, int docId, JettySolrRunner solrRunner)
       throws IOException, SolrServerException {
     try (SolrClient solrClient =
-        new HttpSolrClient.Builder(solrRunner.getBaseUrl().toString()).build()) {
+        new HttpApacheSolrClient.Builder(solrRunner.getBaseUrl().toString()).build()) {
       solrClient.add(collection, new SolrInputDocument("id", String.valueOf(docId)));
       solrClient.commit(collection);
     }
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 16d63e2ea589..3654aba68269 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.java
@@ -26,7 +26,7 @@
 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.common.cloud.DocCollection;
@@ -116,7 +116,7 @@ private void assertShardConsistency(Slice shard, boolean expectDocs) throws Exce
     int i = 0;
     for (Replica replica : replicas) {
       try (var client =
-          new HttpSolrClient.Builder(replica.getBaseUrl())
+          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
               .withDefaultCollection(replica.getCoreName())
               .withHttpClient(((CloudLegacySolrClient) cluster.getSolrClient()).getHttpClient())
               .build()) {
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 77c910a8da2f..921587418a95 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java
@@ -27,7 +27,7 @@
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -111,7 +111,7 @@ private void assertShardConsistency(Slice shard, boolean expectDocs) throws Exce
     int i = 0;
     for (Replica replica : replicas) {
       try (var client =
-          new HttpSolrClient.Builder(replica.getBaseUrl())
+          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
               .withDefaultCollection(replica.getCoreName())
               .withHttpClient(((CloudLegacySolrClient) cluster.getSolrClient()).getHttpClient())
               .build()) {
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 0b6bd761ee5a..e75c933caa18 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java
@@ -26,7 +26,7 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -177,7 +177,7 @@ private SolrDocumentList getDocsMatching(String coreUrl, QueryRequest request)
     final var baseUrl = URLUtil.extractBaseUrl(coreUrl);
     final var coreName = URLUtil.extractCoreFromCoreUrl(coreUrl);
     try (SolrClient solrClient =
-        new HttpSolrClient.Builder(baseUrl).withDefaultCollection(coreName).build()) {
+        new HttpApacheSolrClient.Builder(baseUrl).withDefaultCollection(coreName).build()) {
       return (SolrDocumentList) solrClient.request(request).get("response");
     }
   }
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 4360f7c5d764..e3c6b11d3737 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java
@@ -32,7 +32,7 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.cloud.SocketProxy;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
@@ -301,7 +301,7 @@ private void addDocs(String collection, int numDocs, int startId)
   private void addDoc(String collection, int docId, JettySolrRunner solrRunner)
       throws IOException, SolrServerException {
     try (SolrClient solrClient =
-        new HttpSolrClient.Builder(solrRunner.getBaseUrl().toString()).build()) {
+        new HttpApacheSolrClient.Builder(solrRunner.getBaseUrl().toString()).build()) {
       solrClient.add(
           collection,
           new SolrInputDocument("id", String.valueOf(docId), "fieldName_s", String.valueOf(docId)));
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 991750adcc1b..8b8e2948f3ad 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java
@@ -24,7 +24,7 @@
 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.apache.HttpSolrClient.Builder;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
@@ -118,7 +118,7 @@ private static int assertConsistentReplicas(CloudSolrClient cloudClient, Slice s
     int count = 0;
     for (Replica replica : shard.getReplicas()) {
       SolrClient client =
-          new Builder(replica.getBaseUrl())
+          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
               .withDefaultCollection(replica.getCoreName())
               .withHttpClient(((CloudLegacySolrClient) cloudClient).getHttpClient())
               .build();
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 c82864b7f6fe..6acd75060a1b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
@@ -35,8 +35,8 @@
 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.HttpApacheSolrClient;
 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.SolrHttpConstants;
@@ -434,7 +434,7 @@ public static SolrClient getRandomizedHttpSolrClient(String url) {
     // would prevent us from finding bugs with regular HttpSolrClient instantiation.
     // This test fails if you return a Http2SolrClient
     if (random().nextBoolean()) {
-      return (new HttpSolrClient.Builder(url)).build();
+      return (new HttpApacheSolrClient.Builder(url)).build();
     } // else...
     return getHttpSolrClient(url);
   }
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 8cd083c248af..92ba07c8a2e5 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
@@ -40,7 +40,7 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.InputStreamResponseParser;
 import org.apache.solr.client.solrj.impl.XMLResponseParser;
@@ -430,8 +430,8 @@ private String makeXml(String s) {
 
   /** Helper to convert from wt string parameter to actual SolrClient. */
   private static SolrClient getSolrClient(final String jettyBaseUrl, final String wt) {
-    HttpSolrClient.Builder builder =
-        new HttpSolrClient.Builder(jettyBaseUrl).withDefaultCollection(COLLECTION_NAME);
+    var builder =
+        new HttpApacheSolrClient.Builder(jettyBaseUrl).withDefaultCollection(COLLECTION_NAME);
     switch (wt) {
       case "xml":
         builder.withResponseParser(RAW_XML_RESPONSE_PARSER);
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 d82addc73c1a..8ec6883b19d6 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.cloud.overseer.OverseerAction;
 import org.apache.solr.common.cloud.ClusterState;
@@ -109,7 +109,7 @@ private void testRequestTracking() throws Exception {
     String baseUrl = replicas.iterator().next().getBaseUrl();
     if (!baseUrl.endsWith("/")) baseUrl += "/";
     try (SolrClient client =
-        new HttpSolrClient.Builder(baseUrl)
+        new HttpApacheSolrClient.Builder(baseUrl)
             .withDefaultCollection("a1x2")
             .withConnectionTimeout(2000, TimeUnit.MILLISECONDS)
             .withSocketTimeout(5000, TimeUnit.MILLISECONDS)
@@ -221,7 +221,7 @@ private void testQueryAgainstDownReplica() throws Exception {
     String baseUrl = notLeader.getBaseUrl();
     log.info("Firing queries against path={} and collection=football", baseUrl);
     try (SolrClient client =
-        new HttpSolrClient.Builder(baseUrl)
+        new HttpApacheSolrClient.Builder(baseUrl)
             .withDefaultCollection("football")
             .withConnectionTimeout(2000, TimeUnit.MILLISECONDS)
             .withSocketTimeout(5000, TimeUnit.MILLISECONDS)
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 777188e10d8a..2e3921429c3b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
@@ -29,8 +29,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.commons.math3.primes.Primes;
+import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
-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 46cd780b33fa..3ec7f8e46733 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
@@ -48,7 +48,7 @@
 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.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
@@ -417,7 +417,7 @@ public void testRealTimeGet()
     List<String> ids = new ArrayList<>(slice.getReplicas().size());
     for (Replica rAdd : slice.getReplicas()) {
       try (SolrClient client =
-          new HttpSolrClient.Builder(rAdd.getBaseUrl())
+          new HttpApacheSolrClient.Builder(rAdd.getBaseUrl())
               .withDefaultCollection(rAdd.getCoreName())
               .withHttpClient(httpClient)
               .build()) {
@@ -429,7 +429,7 @@ public void testRealTimeGet()
       assertEquals("bar", docCloudClient.getFieldValue("foo_s"));
       for (Replica rGet : slice.getReplicas()) {
         try (SolrClient client =
-            new HttpSolrClient.Builder(rGet.getBaseUrl())
+            new HttpApacheSolrClient.Builder(rGet.getBaseUrl())
                 .withDefaultCollection(rGet.getCoreName())
                 .withHttpClient(httpClient)
                 .build()) {
@@ -443,7 +443,7 @@ public void testRealTimeGet()
     SolrDocumentList previousAllIdsResult = null;
     for (Replica rAdd : slice.getReplicas()) {
       try (SolrClient client =
-          new HttpSolrClient.Builder(rAdd.getBaseUrl())
+          new HttpApacheSolrClient.Builder(rAdd.getBaseUrl())
               .withDefaultCollection(rAdd.getCoreName())
               .withHttpClient(httpClient)
               .build()) {
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 da75f561f1c7..8badd349f9d8 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,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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.response.RequestStatusState;
@@ -233,7 +233,7 @@ public void testAsyncIdRaceCondition() throws Exception {
     SolrClient[] clients = new SolrClient[cluster.getJettySolrRunners().size()];
     int j = 0;
     for (JettySolrRunner r : cluster.getJettySolrRunners()) {
-      clients[j++] = new HttpSolrClient.Builder(r.getBaseUrl().toString()).build();
+      clients[j++] = new HttpApacheSolrClient.Builder(r.getBaseUrl().toString()).build();
     }
     RequestStatusState state =
         CollectionAdminRequest.createCollection("testAsyncIdRaceCondition", "conf1", 1, 1)
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 9a827e2a8b7c..b4c0cebb1934 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
@@ -42,7 +42,7 @@
 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -240,7 +240,7 @@ private void doSplitStaticIndexReplication(SolrIndexSplitter.SplitMethod splitMe
                   .get(0)
                   .getBaseUrl();
           try (var control =
-              new HttpSolrClient.Builder(control_collection)
+              new HttpApacheSolrClient.Builder(control_collection)
                   .withHttpClient(((CloudLegacySolrClient) client).getHttpClient())
                   .build()) {
             state = addReplica.processAndWait(control, 30);
@@ -305,7 +305,7 @@ private int assertConsistentReplicas(Slice shard) throws SolrServerException, IO
     int count = 0;
     for (Replica replica : shard.getReplicas()) {
       var client =
-          new HttpSolrClient.Builder(replica.getBaseUrl())
+          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
               .withDefaultCollection(replica.getCoreName())
               .withHttpClient(((CloudLegacySolrClient) cloudClient).getHttpClient())
               .build();
@@ -1276,7 +1276,7 @@ protected void splitShard(
     String baseUrl = shardToJetty.get(SHARD1).get(0).jetty.getBaseUrl().toString();
 
     try (SolrClient baseServer =
-        new HttpSolrClient.Builder(baseUrl)
+        new HttpApacheSolrClient.Builder(baseUrl)
             .withConnectionTimeout(30, TimeUnit.SECONDS)
             .withSocketTimeout(5, TimeUnit.MINUTES)
             .build()) {
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 1e6e0681808b..128ab2b81381 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.response.RequestStatusState;
 import org.apache.solr.cloud.BasicDistributedZkTest;
@@ -233,7 +233,7 @@ protected NamedList<Object> sendRequest(ModifiableSolrParams params)
     String baseUrl = shardToJetty.get(SHARD1).get(0).jetty.getBaseUrl().toString();
 
     try (SolrClient baseServer =
-        new HttpSolrClient.Builder(baseUrl)
+        new HttpApacheSolrClient.Builder(baseUrl)
             .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
             .build()) {
       return baseServer.request(request);
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 0efdb3ca25d0..7847b5ffe39a 100644
--- a/solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java
+++ b/solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java
@@ -34,11 +34,12 @@
 import java.util.function.Predicate;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.client.methods.HttpDelete;
+import org.apache.solr.client.solrj.HttpSolrClient;
 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.apache.HttpApacheSolrClient;
 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;
@@ -182,7 +183,7 @@ public void testFileStoreManagement() throws Exception {
       String path =
           j.getBaseURLV2() + "/cluster/filestore/files" + "/package/mypkg/v1.0/runtimelibs.jar";
       HttpDelete del = new HttpDelete(path);
-      try (HttpSolrClient cl = (HttpSolrClient) j.newClient()) {
+      try (var cl = (HttpApacheSolrClient) j.newClient()) {
         HttpClientUtil.executeHttpMethod(cl.getHttpClient(), path, Utils.JSONCONSUMER, del);
       }
       expected = Collections.singletonMap(":files:/package/mypkg/v1.0/runtimelibs.jar", null);
@@ -204,7 +205,7 @@ public static void checkAllNodesForFile(
       assertResponseValues(10, new Fetcher(url, jettySolrRunner), expected);
 
       if (verifyContent) {
-        try (HttpSolrClient solrClient = (HttpSolrClient) jettySolrRunner.newClient()) {
+        try (var solrClient = (HttpApacheSolrClient) jettySolrRunner.newClient()) {
           ByteBuffer buf =
               HttpClientUtil.executeGET(
                   solrClient.getHttpClient(),
@@ -229,7 +230,7 @@ public Fetcher(String s, JettySolrRunner jettySolrRunner) {
 
     @Override
     public NavigableObject call() throws Exception {
-      try (HttpSolrClient solrClient = (HttpSolrClient) jetty.newClient()) {
+      try (var solrClient = (HttpApacheSolrClient) jetty.newClient()) {
         return (NavigableObject)
             HttpClientUtil.executeGET(solrClient.getHttpClient(), this.url, JAVABINCONSUMER);
       }
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 f59aa9cdffd8..8945a51c26d1 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.embedded.JettyConfig;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.junit.After;
@@ -80,7 +80,7 @@ private static JettySolrRunner createAndStartJetty(ReplicationTestHelper.SolrIns
 
   private static SolrClient createNewSolrClient(int port) {
     final String baseUrl = buildUrl(port);
-    return new HttpSolrClient.Builder(baseUrl)
+    return new HttpApacheSolrClient.Builder(baseUrl)
         .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
         .withSocketTimeout(60000, TimeUnit.MILLISECONDS)
         .build();
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 6d00d5a69b52..a642c18be777 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.embedded.JettyConfig;
 import org.apache.solr.embedded.JettySolrRunner;
@@ -66,7 +66,7 @@ private static JettySolrRunner createAndStartJetty(ReplicationTestHelper.SolrIns
   private static SolrClient createNewSolrClient(int port) {
 
     final String baseUrl = buildUrl(port);
-    return new HttpSolrClient.Builder(baseUrl)
+    return new HttpApacheSolrClient.Builder(baseUrl)
         .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
         .withSocketTimeout(60000, TimeUnit.MILLISECONDS)
         .build();
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 59ec9c9bdf57..499b8d57e289 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrException;
@@ -315,7 +315,7 @@ public void testDeleteInstanceDir() throws Exception {
     runner.start();
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(runner.getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
             .withDefaultCollection("corex")
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
@@ -327,7 +327,7 @@ public void testDeleteInstanceDir() throws Exception {
     }
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(runner.getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
@@ -342,7 +342,7 @@ public void testDeleteInstanceDir() throws Exception {
     // 2> is deleted after rename properly.
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(runner.getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
@@ -356,7 +356,7 @@ public void testDeleteInstanceDir() throws Exception {
     }
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(runner.getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
@@ -389,7 +389,7 @@ public void testUnloadForever() throws Exception {
     runner.start();
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(runner.getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
             .withDefaultCollection("corex")
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
@@ -401,7 +401,7 @@ public void testUnloadForever() throws Exception {
     }
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(runner.getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
             .withDefaultCollection("corex")
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
@@ -411,7 +411,7 @@ public void testUnloadForever() throws Exception {
     }
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(runner.getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
@@ -426,7 +426,7 @@ public void testUnloadForever() throws Exception {
             SolrClient.RemoteSolrException.class,
             () -> {
               try (SolrClient client =
-                  new HttpSolrClient.Builder(runner.getBaseUrl().toString())
+                  new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
                       .withDefaultCollection("corex")
                       .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
                       .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT * 1000, TimeUnit.MILLISECONDS)
@@ -454,7 +454,7 @@ public void testDeleteInstanceDirAfterCreateFailure() throws Exception {
     runner.start();
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(runner.getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
             .withDefaultCollection("corex")
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
@@ -481,7 +481,7 @@ public void testDeleteInstanceDirAfterCreateFailure() throws Exception {
         StandardCopyOption.REPLACE_EXISTING);
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(runner.getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
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 ea4cd30a0485..d19f044004f2 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,8 @@
 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.ZookeeperReadApi;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.SolrException;
@@ -66,7 +67,7 @@ public void tearDown() throws Exception {
 
   @Test
   public void testZkread() throws Exception {
-    try (HttpSolrClient client = new HttpSolrClient.Builder(baseUrl.toString()).build()) {
+    try (var client = new HttpApacheSolrClient.Builder(baseUrl.toString()).build()) {
       final var securityJsonRequest = new ZookeeperReadApi.ReadNode("/security.json");
       final var securityJsonResponse = securityJsonRequest.process(client);
       assertEquals(200, securityJsonResponse.getHttpStatus());
@@ -116,7 +117,7 @@ public void testZkread() throws Exception {
 
   @Test
   public void testRequestingDataFromNonexistentNodeReturnsAnError() throws Exception {
-    try (HttpSolrClient client = new HttpSolrClient.Builder(baseUrl.toString()).build()) {
+    try (HttpSolrClient client = new HttpApacheSolrClient.Builder(baseUrl.toString()).build()) {
       final var missingNodeReq = new ZookeeperReadApi.ReadNode("/configs/_default/nonexistentnode");
       final var missingNodeResponse = missingNodeReq.process(client);
       assertEquals(404, missingNodeResponse.getHttpStatus());
@@ -130,7 +131,7 @@ public void testRequestingDataFromNonexistentNodeReturnsAnError() throws Excepti
 
   @Test
   public void testCanListChildNodes() throws Exception {
-    try (HttpSolrClient client = new HttpSolrClient.Builder(baseUrl.toString()).build()) {
+    try (HttpSolrClient client = new HttpApacheSolrClient.Builder(baseUrl.toString()).build()) {
       final var listDefaultFilesReq = new ZookeeperReadApi.ListNodes("/configs/_default");
       final var listDefaultFilesResponse = listDefaultFilesReq.process(client);
 
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 e4e5a737ae81..5089ac102ca0 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.JsonMapResponseParser;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.cloud.SolrCloudTestCase;
@@ -53,7 +53,7 @@ public void monitorZookeeperAfterZkShutdown()
           ExecutionException,
           TimeoutException {
     URL baseUrl = cluster.getJettySolrRunner(0).getBaseUrl();
-    HttpSolrClient solr = new HttpSolrClient.Builder(baseUrl.toString()).build();
+    var solr = new HttpApacheSolrClient.Builder(baseUrl.toString()).build();
     GenericSolrRequest mntrReq =
         new GenericSolrRequest(SolrRequest.METHOD.GET, "/admin/zookeeper/status");
     mntrReq.setResponseParser(new JsonMapResponseParser());
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 4c54a96e8b39..e90d6f4cf5d9 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.JsonMapResponseParser;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.cloud.SolrCloudTestCase;
@@ -78,7 +78,7 @@ public void monitorZookeeper()
           ExecutionException,
           TimeoutException {
     URL baseUrl = cluster.getJettySolrRunner(0).getBaseUrl();
-    HttpSolrClient solr = new HttpSolrClient.Builder(baseUrl.toString()).build();
+    var solr = new HttpApacheSolrClient.Builder(baseUrl.toString()).build();
     GenericSolrRequest mntrReq =
         new GenericSolrRequest(SolrRequest.METHOD.GET, "/admin/zookeeper/status");
     mntrReq.setResponseParser(new JsonMapResponseParser());
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 b4e5e87a6803..c70e5155656a 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.apache.HttpApacheSolrClient;
 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;
@@ -88,7 +88,7 @@ public void tearDown() throws Exception {
 
   @Test
   public void testClusterPropertyOpsAllGood() throws Exception {
-    try (HttpSolrClient client = new HttpSolrClient.Builder(baseUrl.toString()).build()) {
+    try (var client = new HttpApacheSolrClient.Builder(baseUrl.toString()).build()) {
       // List Properties, confirm the test property does not exist
       // This ignores eventually existing other properties
       Object o =
@@ -147,7 +147,7 @@ public void testClusterPropertyOpsAllGood() throws Exception {
 
   @Test
   public void testClusterPropertyNestedBulkSet() throws Exception {
-    try (HttpSolrClient client = new HttpSolrClient.Builder(baseUrl.toString()).build()) {
+    try (var client = new HttpApacheSolrClient.Builder(baseUrl.toString()).build()) {
       // Create a single cluster property using the Bulk/Nested set ClusterProp API
       HttpPut httpPut = new HttpPut(baseUrlV2ClusterProps);
       httpPut.setHeader("Content-Type", "application/json");
@@ -185,7 +185,7 @@ public void testClusterPropertyNestedBulkSet() throws Exception {
 
   @Test
   public void testClusterPropertyFetchNonExistentProperty() throws Exception {
-    try (HttpSolrClient client = new HttpSolrClient.Builder(baseUrl.toString()).build()) {
+    try (var client = new HttpApacheSolrClient.Builder(baseUrl.toString()).build()) {
       // Fetch Cluster Property that doesn't exist
       String path = baseUrlV2ClusterProps + "/ext.clusterPropThatDoesNotExist";
       HttpGet fetchClusterPropertyGet = new HttpGet(path);
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 6e31daac1721..76d7419f8f65 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.JavaBinResponseParser;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocument;
@@ -168,7 +168,7 @@ public void test() throws Exception {
     // Force javabin format
     final String clientUrl = jettys.get(0).getBaseUrl().toString();
     try (SolrClient client =
-        new HttpSolrClient.Builder(clientUrl)
+        new HttpApacheSolrClient.Builder(clientUrl)
             .withDefaultCollection("collection1")
             .withResponseParser(new JavaBinResponseParser())
             .build(); ) {
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 579c02491a9f..53e096cf89ff 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
@@ -23,7 +23,7 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -159,7 +159,7 @@ public void testZkConnected() throws Exception {
       JettySolrRunner jetty = miniCluster.getReplicaJetty(replica);
       // Use the replica's core URL to avoid ZK communication
       try (SolrClient client =
-          new HttpSolrClient.Builder(replica.getBaseUrl())
+          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
               .withDefaultCollection(replica.getCoreName())
               .build()) {
         jetty.getCoreContainer().getZkController().getZkClient().close();
@@ -210,7 +210,7 @@ public void testRequireZkConnected() throws Exception {
       req = new QueryRequest(params); // TODO Can be removed when SOLR-17314 fixed
       // Use the replica's core URL to avoid ZK communication
       try (SolrClient solrClient =
-          new HttpSolrClient.Builder(disconnectedReplica.getBaseUrl())
+          new HttpApacheSolrClient.Builder(disconnectedReplica.getBaseUrl())
               .withDefaultCollection(disconnectedReplica.getCoreName())
               .build()) {
         ignoreException("ZooKeeper is not connected");
@@ -269,7 +269,7 @@ public void testRequireZkConnectedDistrib() throws Exception {
       }
       Replica connectedReplica = connectedSlice.getReplicas().iterator().next();
       try (SolrClient solrClient =
-          new HttpSolrClient.Builder(connectedReplica.getBaseUrl())
+          new HttpApacheSolrClient.Builder(connectedReplica.getBaseUrl())
               .withDefaultCollection(connectedReplica.getCoreName())
               .build()) {
         ignoreException("ZooKeeper is not connected");
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 8d646539c5fd..5be32429d6ad 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.apache.HttpApacheSolrClient;
 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;
@@ -130,7 +130,7 @@ public void testZkMetrics() throws Exception {
     }
 
     try (SolrClient solrClient = j.newClient()) {
-      HttpClient httpClient = ((HttpSolrClient) solrClient).getHttpClient();
+      HttpClient httpClient = ((HttpApacheSolrClient) solrClient).getHttpClient();
       var initialChildrenFetched =
           SolrMetricTestUtils.getCounterDatapoint(
                   reader, "solr_zk_cumulative_children_fetched", baseLabels)
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 07468d138d0f..6c486e706cbe 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.apache.HttpApacheSolrClient;
 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;
@@ -531,7 +531,7 @@ private void executeReq(
       Utils.InputStreamConsumer<?> parser,
       Map<String, Object> expected)
       throws Exception {
-    try (HttpSolrClient client = (HttpSolrClient) jetty.newClient()) {
+    try (var client = (HttpApacheSolrClient) jetty.newClient()) {
       TestDistribFileStore.assertResponseValues(
           10,
           () ->
@@ -690,7 +690,7 @@ public void testAPI() throws Exception {
           new Callable<NavigableObject>() {
             @Override
             public NavigableObject call() throws Exception {
-              try (HttpSolrClient solrClient = (HttpSolrClient) jetty.newClient()) {
+              try (var solrClient = (HttpApacheSolrClient) jetty.newClient()) {
                 return (NavigableObject)
                     HttpClientUtil.executeGET(
                         solrClient.getHttpClient(), path, Utils.JAVABINCONSUMER);
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 bb6c2a78ca81..7ffa511a6909 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
 import org.apache.solr.common.cloud.SolrZkClient;
@@ -62,7 +62,7 @@ public void test() throws Exception {
 
     // create a client that does not have the /collection1 as part of the URL.
     try (SolrClient rootClient =
-        new HttpSolrClient.Builder(buildUrl(jettys.get(which).getLocalPort())).build()) {
+        new HttpApacheSolrClient.Builder(buildUrl(jettys.get(which).getLocalPort())).build()) {
       NamedList<?> namedListResponse = rootClient.request(request);
       final var statusByCore =
           JacksonContentWriter.DEFAULT_MAPPER.convertValue(
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 bb316236012b..c26e007d8533 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java
@@ -37,7 +37,7 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@@ -621,8 +621,8 @@ public void testConfigset() throws Exception {
       // However using solr client would drop cache response header, hence we need to use the
       // underlying httpClient which has SSL correctly configured
 
-      try (HttpSolrClient solrClient =
-          new HttpSolrClient.Builder(coordinatorJetty.getBaseUrl().toString()).build()) {
+      try (var solrClient =
+          new HttpApacheSolrClient.Builder(coordinatorJetty.getBaseUrl().toString()).build()) {
         HttpResponse response =
             solrClient
                 .getHttpClient()
@@ -900,8 +900,8 @@ public void testCoreReload() throws Exception {
         System.clearProperty(NodeRoles.NODE_ROLES_PROP);
       }
 
-      try (HttpSolrClient coordinatorClient =
-          new HttpSolrClient.Builder(coordinatorJetty.getBaseUrl().toString()).build()) {
+      try (var coordinatorClient =
+          new HttpApacheSolrClient.Builder(coordinatorJetty.getBaseUrl().toString()).build()) {
         HttpResponse response =
             coordinatorClient
                 .getHttpClient()
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 b097febe41ff..7f305220d788 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.params.SolrParams;
@@ -68,7 +68,7 @@ public void testHeaders() throws Exception {
     // same...
     for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
       try (SolrClient solrClient = jetty.newClient()) {
-        final HttpClient client = ((HttpSolrClient) solrClient).getHttpClient();
+        final HttpClient client = ((HttpApacheSolrClient) solrClient).getHttpClient();
 
         // path shouldn't matter -- even if bogus / 404
         for (String path : Arrays.asList("/select", "/bogus")) {
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 c014c842ef71..b5d4a4b0e50f 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.LBSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -82,7 +82,7 @@ public static void setupClusterAndCollection() throws Exception {
     ClusterState clusterState = cluster.getSolrClient().getClusterState();
     for (Replica replica : clusterState.getCollection(COLL).getReplicas()) {
       clients.add(
-          new HttpSolrClient.Builder(replica.getBaseUrl())
+          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
               .withDefaultCollection(replica.getCoreName())
               .build());
     }
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 bbb6818ab141..258d56e4b834 100644
--- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
@@ -27,10 +27,10 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.solr.BaseDistributedSearchTestCase;
+import org.apache.solr.client.solrj.HttpSolrClient;
 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.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 ef169bba2822..e2801e6de0dd 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
@@ -35,9 +35,9 @@
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.NoMergePolicy;
 import org.apache.lucene.tests.util.TestUtil;
+import org.apache.solr.client.solrj.HttpSolrClient;
 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.request.UpdateRequest;
 import org.apache.solr.client.solrj.request.schema.SchemaRequest.Field;
 import org.apache.solr.client.solrj.response.UpdateResponse;
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 133ed764db6f..c439492b4702 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;
 import org.apache.solr.client.solrj.impl.JavaBinResponseParser;
 import org.junit.BeforeClass;
@@ -35,7 +35,7 @@ public static void beforeTest() throws Exception {
 
   @Override
   public SolrClient createNewSolrClient() {
-    return new HttpSolrClient.Builder(getBaseUrl())
+    return new HttpApacheSolrClient.Builder(getBaseUrl())
         .withDefaultCollection(DEFAULT_TEST_CORENAME)
         .allowMultiPartPost(random().nextBoolean())
         .withRequestWriter(new JavaBinRequestWriter())
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 898a9628f747..9eaba18f9eb5 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;
 import org.apache.solr.client.solrj.request.RequestWriter;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -51,7 +51,7 @@ public static void beforeTest() throws Exception {
 
   @Override
   public SolrClient createNewSolrClient() {
-    return new HttpSolrClient.Builder(getBaseUrl())
+    return new HttpApacheSolrClient.Builder(getBaseUrl())
         .withDefaultCollection(DEFAULT_TEST_CORENAME)
         .allowMultiPartPost(random().nextBoolean())
         .withRequestWriter(cborRequestWriter())
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 50ab432931c6..b945c0884061 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,7 +41,6 @@
 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;
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 df45f9777916..9c4476a38afc 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.XMLRequestWriter;
 import org.apache.solr.client.solrj.impl.XMLResponseParser;
 import org.junit.BeforeClass;
@@ -35,7 +35,7 @@ public static void beforeTest() throws Exception {
 
   @Override
   public SolrClient createNewSolrClient() {
-    return new HttpSolrClient.Builder(getBaseUrl())
+    return new HttpApacheSolrClient.Builder(getBaseUrl())
         .withDefaultCollection(DEFAULT_TEST_CORENAME)
         .allowMultiPartPost(random().nextBoolean())
         .withRequestWriter(new XMLRequestWriter())
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 4c3a7d3c5dc1..34521629acfc 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.apache.HttpClientUtil;
-import org.apache.solr.client.solrj.apache.HttpSolrClient;
 import org.junit.Test;
 
 /**
@@ -41,7 +41,7 @@ public void testSolrException() throws Throwable {
       // set a 1ms timeout to let the connection fail faster.
       httpClient = HttpClientUtil.createClient(null);
       try (SolrClient client =
-          new HttpSolrClient.Builder("http://" + SolrTestCaseJ4.DEAD_HOST_1 + "/solr/")
+          new HttpApacheSolrClient.Builder("http://" + SolrTestCaseJ4.DEAD_HOST_1 + "/solr/")
               .withHttpClient(httpClient)
               .withConnectionTimeout(1, TimeUnit.MILLISECONDS)
               .build()) {
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 42d2e78048ac..cd82808d506c 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.apache.HttpApacheSolrClient;
 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;
@@ -131,8 +131,8 @@ public void testFieldMutating() throws Exception {
 
   @Override
   public SolrClient createNewSolrClient() {
-    HttpSolrClient.Builder httpSolrClientBuilder =
-        new HttpSolrClient.Builder(getBaseUrl())
+    var httpSolrClientBuilder =
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .allowMultiPartPost(random().nextBoolean());
     if (random().nextBoolean()) {
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 078d2e5c50b7..99e3d48e8fb8 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,7 +20,7 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.beans.Field;
 import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;
 import org.apache.solr.client.solrj.impl.XMLRequestWriter;
@@ -47,7 +47,7 @@ public static void beforeTest() throws Exception {
   @Test
   public void testWithXml() throws Exception {
     try (SolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withRequestWriter(new XMLRequestWriter())
             .build()) {
@@ -59,7 +59,7 @@ public void testWithXml() throws Exception {
   @Test
   public void testWithBinary() throws Exception {
     try (SolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withRequestWriter(new JavaBinRequestWriter())
             .build()) {
@@ -71,7 +71,7 @@ public void testWithBinary() throws Exception {
   @Test
   public void testWithBinaryBean() throws Exception {
     try (SolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withRequestWriter(new JavaBinRequestWriter())
             .build()) {
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 596840c0d3e2..0f3a3781515f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
@@ -29,8 +29,8 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.lucene.util.IOUtils;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 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;
@@ -99,7 +99,7 @@ private void addDocs(SolrInstance solrInstance) throws IOException, SolrServerEx
     }
     SolrResponseBase resp;
     try (SolrClient client =
-        new HttpSolrClient.Builder(solrInstance.getBaseUrl())
+        new HttpApacheSolrClient.Builder(solrInstance.getBaseUrl())
             .withDefaultCollection(solrInstance.getDefaultCollection())
             .withHttpClient(httpClient)
             .build()) {
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 5c6f4ad61138..2a531d3f9f13 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;
 import org.apache.solr.client.solrj.impl.XMLRequestWriter;
 import org.apache.solr.client.solrj.response.QueryResponse;
@@ -102,7 +102,7 @@ public void showExceptions() throws Exception {
   @Test
   public void testWithXml() throws Exception {
     try (SolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withRequestWriter(new XMLRequestWriter())
             .build()) {
@@ -114,7 +114,7 @@ public void testWithXml() throws Exception {
   @Test
   public void testWithBinary() throws Exception {
     try (SolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withRequestWriter(new JavaBinRequestWriter())
             .build()) {
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 9050a0dec7c6..11ca36d5b472 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.apache.HttpApacheSolrClient;
 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;
@@ -61,7 +61,7 @@ public static void beforeTest() throws Exception {
   public void testBadSetup() {
     String url = "http" + (isSSLMode() ? "s" : "") + "://127.0.0.1/?core=xxx";
     // This test does NOT fail for Http2SolrClient
-    expectThrows(Exception.class, () -> new HttpSolrClient.Builder(url).build());
+    expectThrows(Exception.class, () -> new HttpApacheSolrClient.Builder(url).build());
   }
 
   @Test
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 676c91e0bdae..529263c10732 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
@@ -17,6 +17,7 @@
 package org.apache.solr.client.solrj.impl;
 
 import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -56,13 +57,14 @@
 import org.apache.solr.SolrJettyTestBase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.api.util.SolrVersion;
+import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrRequest.METHOD;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 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;
@@ -141,7 +143,7 @@ public static void clear() {
     public static HashMap<String, String> headers = null;
     public static Map<String, String[]> parameters = null;
     public static String queryString = null;
-    public static jakarta.servlet.http.Cookie[] cookies = null;
+    public static Cookie[] cookies = null;
 
     public static void setErrorCode(Integer code) {
       errorCode = code;
@@ -187,7 +189,7 @@ private void setQueryString(HttpServletRequest req) {
     }
 
     private void setCookies(HttpServletRequest req) {
-      jakarta.servlet.http.Cookie[] ck = req.getCookies();
+      Cookie[] ck = req.getCookies();
       cookies = req.getCookies();
     }
 
@@ -238,7 +240,7 @@ public void testTimeout() throws Exception {
     final var queryRequest = new QueryRequest(q);
     queryRequest.setPath("/slow/foo" + queryRequest.getPath());
     try (SolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
             .withSocketTimeout(2000, TimeUnit.MILLISECONDS)
             .build()) {
@@ -350,7 +352,7 @@ public void testQuery() throws Exception {
 
     // XML
     try (HttpSolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withResponseParser(new XMLResponseParser())
             .build()) {
       // XML/GET
@@ -444,7 +446,7 @@ public void testDelete() throws Exception {
 
     // XML
     try (HttpSolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withResponseParser(new XMLResponseParser())
             .build()) {
       final var deleteByQueryRequest = new UpdateRequest();
@@ -509,7 +511,7 @@ public void testUpdate() throws Exception {
     DebugServlet.clear();
     // XML response and writer
     try (HttpSolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withRequestWriter(new XMLRequestWriter())
             .withResponseParser(new XMLResponseParser())
             .build()) {
@@ -533,7 +535,7 @@ public void testUpdate() throws Exception {
     DebugServlet.clear();
     // javabin request
     try (HttpSolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withRequestWriter(new JavaBinRequestWriter())
             .withResponseParser(new JavaBinResponseParser())
             .build()) {
@@ -564,21 +566,21 @@ public void testRedirect() throws Exception {
     queryRequest.setPath(redirectPath + queryRequest.getPath());
 
     // default for redirect is false.
-    try (HttpSolrClient client = new HttpSolrClient.Builder(getBaseUrl()).build()) {
+    try (HttpSolrClient client = new HttpApacheSolrClient.Builder(getBaseUrl()).build()) {
       SolrServerException e =
           expectThrows(SolrServerException.class, () -> queryRequest.process(client));
       assertTrue(e.getMessage().contains("redirect"));
     }
 
     try (HttpSolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl()).withFollowRedirects(true).build()) {
+        new HttpApacheSolrClient.Builder(getBaseUrl()).withFollowRedirects(true).build()) {
       // No exception expected
       queryRequest.process(client);
     }
 
     // And with explicit false:
     try (HttpSolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl()).withFollowRedirects(false).build()) {
+        new HttpApacheSolrClient.Builder(getBaseUrl()).withFollowRedirects(false).build()) {
       SolrServerException e =
           expectThrows(SolrServerException.class, () -> queryRequest.process(client));
       assertTrue(e.getMessage().contains("redirect"));
@@ -600,7 +602,7 @@ public void testCompression() throws Exception {
     }
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl()).allowCompression(true).build()) {
+        new HttpApacheSolrClient.Builder(getBaseUrl()).allowCompression(true).build()) {
       try {
         queryRequest.process(client);
       } catch (SolrClient.RemoteSolrException ignored) {
@@ -609,7 +611,7 @@ public void testCompression() throws Exception {
     }
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl()).allowCompression(false).build()) {
+        new HttpApacheSolrClient.Builder(getBaseUrl()).allowCompression(false).build()) {
       try {
         queryRequest.process(client);
       } catch (SolrClient.RemoteSolrException ignored) {
@@ -672,7 +674,7 @@ public void testCollectionParameters() throws IOException, SolrServerException {
   public void testGetRawStream() throws SolrServerException, IOException {
     CloseableHttpClient httpClient = HttpClientUtil.createClient(null);
     try (SolrClient solrClient =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withHttpClient(httpClient)
             .withResponseParser(null)
@@ -761,7 +763,7 @@ public void testInterceptors() {
       // Assert cookies from UseContextCallback
       assertNotNull(DebugServlet.cookies);
       boolean foundCookie = false;
-      for (jakarta.servlet.http.Cookie cookie : DebugServlet.cookies) {
+      for (Cookie cookie : DebugServlet.cookies) {
         if (cookieName.equals(cookie.getName()) && cookieValue.equals(cookie.getValue())) {
           foundCookie = true;
           break;
@@ -798,7 +800,7 @@ private void verifyServletState(HttpSolrClient client, SolrRequest<?> request) {
       if (values != null) {
         for (String value : values) {
           boolean shouldBeInQueryString =
-              client.getUrlParamNames().contains(name)
+              ((HttpApacheSolrClient) client).getUrlParamNames().contains(name)
                   || (request.getQueryParams() != null && request.getQueryParams().contains(name));
           assertEquals(
               shouldBeInQueryString, DebugServlet.queryString.contains(name + "=" + value));
@@ -814,7 +816,7 @@ private void verifyServletState(HttpSolrClient client, SolrRequest<?> request) {
   @Test
   public void testQueryString() throws Exception {
     final String debugPath = "/debug/foo";
-    HttpSolrClient.Builder builder = new HttpSolrClient.Builder(getBaseUrl());
+    HttpApacheSolrClient.Builder builder = new HttpApacheSolrClient.Builder(getBaseUrl());
     try (HttpSolrClient client =
         builder.withTheseParamNamesInTheUrl(Set.of("serverOnly")).build()) {
       // test without request query params
@@ -867,16 +869,16 @@ public void testQueryString() throws Exception {
   @Test
   @SuppressWarnings({"try"})
   public void testInvariantParams() throws IOException {
-    try (HttpSolrClient createdClient =
-        new HttpSolrClient.Builder()
+    try (var createdClient =
+        new HttpApacheSolrClient.Builder()
             .withBaseSolrUrl(getBaseUrl())
             .withInvariantParams(SolrTestCaseJ4.params("param", "value"))
             .build()) {
       assertEquals("value", createdClient.getInvariantParams().get("param"));
     }
 
-    try (HttpSolrClient createdClient =
-        new HttpSolrClient.Builder()
+    try (var createdClient =
+        new HttpApacheSolrClient.Builder()
             .withBaseSolrUrl(getBaseUrl())
             .withInvariantParams(SolrTestCaseJ4.params("fq", "fq1", "fq", "fq2"))
             .build()) {
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 006264c66034..bdc9c5086a54 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
@@ -20,8 +20,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.solr.SolrJettyTestBase;
+import org.apache.solr.client.solrj.HttpSolrClient;
 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/request/TestV2Request.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestV2Request.java
index 09c11077fa8c..87b0a8147c6a 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.response.V2Response;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.cloud.ClusterState;
@@ -85,7 +85,8 @@ public void testIsCollectionRequest() {
   @Test
   public void testHttpSolrClient() throws Exception {
     SolrClient solrClient =
-        new HttpSolrClient.Builder(cluster.getJettySolrRunner(0).getBaseUrl().toString()).build();
+        new HttpApacheSolrClient.Builder(cluster.getJettySolrRunner(0).getBaseUrl().toString())
+            .build();
     doTest(solrClient);
     solrClient.close();
   }
@@ -162,7 +163,8 @@ public void testV2Forwarding() throws Exception {
             .withMethod(SolrRequest.METHOD.GET)
             .build();
 
-    try (SolrClient client1 = new HttpSolrClient.Builder().withBaseSolrUrl(testServer).build()) {
+    try (SolrClient client1 =
+        new HttpApacheSolrClient.Builder().withBaseSolrUrl(testServer).build()) {
       V2Response rsp = v2r.process(client1);
       assertEquals("0", rsp._getStr("responseHeader/status"));
     }
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 4a39234d52d9..c6f7279b1df2 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.InputStreamResponseParser;
 import org.apache.solr.client.solrj.impl.XMLResponseParser;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -64,7 +64,7 @@ public void doBefore() throws IOException, SolrServerException {
   public void testQueryParse() throws Exception {
 
     try (SolrClient client =
-        new HttpSolrClient.Builder(getBaseUrl())
+        new HttpApacheSolrClient.Builder(getBaseUrl())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withResponseParser(new InputStreamResponseParser("xml"))
             .build()) {
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 f16ba45d6e9c..362b19357de8 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.JavaBinResponseParser;
 import org.apache.solr.client.solrj.impl.XMLResponseParser;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -142,7 +142,7 @@ private void addSampleDocs() throws SolrServerException, IOException {
   private SolrClient createSuggestSolrClient() {
     final ResponseParser randomParser =
         random().nextBoolean() ? new JavaBinResponseParser() : new XMLResponseParser();
-    return new HttpSolrClient.Builder()
+    return new HttpApacheSolrClient.Builder()
         .withBaseSolrUrl(getBaseUrl())
         .withDefaultCollection(DEFAULT_TEST_CORENAME)
         .withResponseParser(randomParser)
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 69b9606f4ebb..bc7578900833 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.embedded.JettyConfig;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.util.SolrJettyTestRule;
@@ -119,13 +119,13 @@ protected SolrClient getSolrClient() {
    * options.
    */
   public SolrClient createNewSolrClient() {
-    return new HttpSolrClient.Builder(getBaseUrl())
+    return new HttpApacheSolrClient.Builder(getBaseUrl())
         .withDefaultCollection(DEFAULT_TEST_CORENAME)
         .build();
   }
 
   protected HttpClient getHttpClient() {
-    HttpSolrClient client = (HttpSolrClient) getSolrClient();
+    var client = (HttpApacheSolrClient) getSolrClient();
     return client.getHttpClient();
   }
 
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 8068705858a7..30bf12314fe9 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -81,9 +81,10 @@
 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.HttpSolrClient;
 import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 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.ClusterStateProvider;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
@@ -2622,7 +2623,7 @@ private void randomizeCloudSolrClient() {
    */
   @Deprecated // We are migrating away from Apache HttpClient.
   public static HttpClient getHttpClient(String url) {
-    return new HttpSolrClient.Builder(url).build().getHttpClient();
+    return new HttpApacheSolrClient.Builder(url).build().getHttpClient();
   }
 
   /**
@@ -2632,7 +2633,7 @@ public static HttpClient getHttpClient(String url) {
    * @param url the base URL for a Solr node. Should not contain a core or collection name.
    */
   public static HttpSolrClient getHttpSolrClient(String url) {
-    return new HttpSolrClient.Builder(url).build();
+    return new HttpApacheSolrClient.Builder(url).build();
   }
 
   /** Create a basic HttpSolrClient pointed at the specified replica */
@@ -2649,7 +2650,7 @@ public static HttpSolrClient getHttpSolrClient(Replica replica) {
    *     core-aware requests
    */
   public static HttpSolrClient getHttpSolrClient(String url, String defaultCoreName) {
-    return new HttpSolrClient.Builder(url).withDefaultCollection(defaultCoreName).build();
+    return new HttpApacheSolrClient.Builder(url).withDefaultCollection(defaultCoreName).build();
   }
 
   /**
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java
index d81314c05c8d..dfe5ccd7e4dd 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java
@@ -38,6 +38,7 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentProducer;
 import org.apache.http.entity.EntityTemplate;
+import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -76,7 +77,7 @@
 public class ConcurrentUpdateSolrClient extends SolrClient {
   private static final long serialVersionUID = 1L;
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  private HttpSolrClient client;
+  private HttpApacheSolrClient client;
   final BlockingQueue<Update> queue;
   final ExecutorService scheduler;
   final Queue<Runner> runners;
@@ -105,8 +106,8 @@ protected ConcurrentUpdateSolrClient(Builder builder) {
     this.internalHttpClient = (builder.httpClient == null);
     final var httpSolrClientBuilder =
         (URLUtil.isBaseUrl(builder.baseSolrUrl))
-            ? new HttpSolrClient.Builder(builder.baseSolrUrl)
-            : new HttpSolrClient.Builder(URLUtil.extractBaseUrl(builder.baseSolrUrl))
+            ? new HttpApacheSolrClient.Builder(builder.baseSolrUrl)
+            : new HttpApacheSolrClient.Builder(URLUtil.extractBaseUrl(builder.baseSolrUrl))
                 .withDefaultCollection(URLUtil.extractCoreFromCoreUrl(builder.baseSolrUrl));
     this.client =
         httpSolrClientBuilder
@@ -344,7 +345,7 @@ public void writeTo(OutputStream out) throws IOException {
           method.setConfig(requestConfigBuilder.build());
 
           method.setEntity(template);
-          method.addHeader("User-Agent", HttpSolrClient.USER_AGENT);
+          method.addHeader("User-Agent", HttpApacheSolrClient.USER_AGENT);
           method.addHeader("Content-Type", contentType);
 
           response =
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java
index 1b567b74bbee..428d09e3a9db 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java
@@ -571,7 +571,7 @@ public static void setHttpClientRequestContextBuilder(
    */
   public static HttpClientContext createNewHttpClientRequestContext() {
     HttpClientContext context =
-        httpClientRequestContextBuilder.createContext(HttpSolrClient.cacheKey);
+        httpClientRequestContextBuilder.createContext(HttpApacheSolrClient.cacheKey);
 
     return context;
   }
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.java
index 7c715ba23f6a..1cb2b72e9ab3 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.java
@@ -42,7 +42,10 @@ public HttpClusterStateProvider(List<String> solrUrls, HttpClient httpClient) th
 
   @Override
   protected SolrClient getSolrClient(String baseUrl) {
-    return new HttpSolrClient.Builder().withBaseSolrUrl(baseUrl).withHttpClient(httpClient).build();
+    return new HttpApacheSolrClient.Builder()
+        .withBaseSolrUrl(baseUrl)
+        .withHttpClient(httpClient)
+        .build();
   }
 
   @Override
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
index b926808ddb99..11321c151b4a 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
@@ -23,6 +23,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import org.apache.http.client.HttpClient;
+import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.JavaBinResponseParser;
@@ -103,7 +104,7 @@ public class LBHttpSolrClient extends LBSolrClient {
   private final HttpClient httpClient;
   private final boolean clientIsInternal;
   private final ConcurrentHashMap<String, HttpSolrClient> urlToClient = new ConcurrentHashMap<>();
-  private final HttpSolrClient.Builder httpSolrClientBuilder;
+  private final HttpApacheSolrClient.Builder httpSolrClientBuilder;
   private volatile Set<String> urlParamNames = new HashSet<>();
 
   final int connectionTimeoutMillis;
@@ -140,8 +141,8 @@ private HttpClient constructClient(List<Endpoint> solrEndpoints) {
     return HttpClientUtil.createClient(params);
   }
 
-  protected HttpSolrClient makeSolrClient(Endpoint server) {
-    HttpSolrClient client;
+  protected HttpApacheSolrClient makeSolrClient(Endpoint server) {
+    HttpApacheSolrClient client;
     if (httpSolrClientBuilder != null) {
       synchronized (this) {
         httpSolrClientBuilder
@@ -163,7 +164,7 @@ protected HttpSolrClient makeSolrClient(Endpoint server) {
       }
     } else {
       final var clientBuilder =
-          new HttpSolrClient.Builder(server.getBaseUrl())
+          new HttpApacheSolrClient.Builder(server.getBaseUrl())
               .withDefaultCollection(server.getCore())
               .withHttpClient(httpClient)
               .withResponseParser(parser)
@@ -218,7 +219,7 @@ public static class Builder extends SolrClientBuilder<Builder> {
 
     public static final int CHECK_INTERVAL = 60 * 1000; // 1 minute between checks
     protected final List<Endpoint> solrEndpoints;
-    protected HttpSolrClient.Builder httpSolrClientBuilder;
+    protected HttpApacheSolrClient.Builder httpSolrClientBuilder;
     private int aliveCheckInterval = CHECK_INTERVAL;
 
     public Builder() {
@@ -226,7 +227,7 @@ public Builder() {
       this.responseParser = new JavaBinResponseParser();
     }
 
-    public HttpSolrClient.Builder getHttpSolrClientBuilder() {
+    public HttpApacheSolrClient.Builder getHttpSolrClientBuilder() {
       return httpSolrClientBuilder;
     }
 
@@ -321,10 +322,10 @@ public Builder setAliveCheckInterval(int aliveCheckInterval) {
     }
 
     /**
-     * Provides a {@link HttpSolrClient.Builder} to be used for building the internally used
+     * Provides a {@link HttpApacheSolrClient.Builder} to be used for building the internally used
      * clients.
      */
-    public Builder withHttpSolrClientBuilder(HttpSolrClient.Builder builder) {
+    public Builder withHttpSolrClientBuilder(HttpApacheSolrClient.Builder builder) {
       this.httpSolrClientBuilder = builder;
       return this;
     }
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java
index 8e3ccc373117..176c416692ef 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java
@@ -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.apache.HttpSolrClient.Builder;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient.Builder;
 import org.apache.solr.client.solrj.request.RequestWriter;
 
 /**
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 1dae465d5157..bf063d6deadf 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
@@ -41,11 +41,12 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.lucene.util.IOUtils;
 import org.apache.solr.JSONTestUtil;
+import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.InputStreamResponseParser;
 import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@@ -1280,7 +1281,7 @@ private void testNumberOfCommitsWithCommitAfterAdd() throws SolrServerException,
   private Long getNumCommits(HttpSolrClient sourceClient) throws SolrServerException, IOException {
     String collection = sourceClient.getDefaultCollection();
     try (SolrClient client =
-        new HttpSolrClient.Builder(sourceClient.getBaseURL())
+        new HttpApacheSolrClient.Builder(sourceClient.getBaseURL())
             .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
             .withSocketTimeout(60000, TimeUnit.MILLISECONDS)
             .build()) {
@@ -1389,7 +1390,7 @@ private void testANewCollectionInOneInstanceWithManualShardAssignement() throws
 
     // now test that unloading a core gets us a new leader
     try (SolrClient unloadClient =
-        new HttpSolrClient.Builder(jettys.get(0).getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(jettys.get(0).getBaseUrl().toString())
             .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
             .withSocketTimeout(60000, TimeUnit.MILLISECONDS)
             .build()) {
@@ -1701,7 +1702,7 @@ protected SolrClient createNewSolrClient(
       String collection, String baseUrl, int connectionTimeoutMillis, int socketTimeoutMillis) {
 
     SolrClient client =
-        new HttpSolrClient.Builder(baseUrl)
+        new HttpApacheSolrClient.Builder(baseUrl)
             .withDefaultCollection(collection)
             .withConnectionTimeout(connectionTimeoutMillis, TimeUnit.MILLISECONDS)
             .withSocketTimeout(socketTimeoutMillis, TimeUnit.MILLISECONDS)
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 1d7c0361c89d..3ef5b7bcaa69 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
@@ -46,13 +46,14 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
+import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.cloud.SocketProxy;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@@ -357,7 +358,7 @@ protected void createServers(int numServers) throws Exception {
     }
 
     controlClient =
-        new HttpSolrClient.Builder(controlJetty.getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(controlJetty.getBaseUrl().toString())
             .withDefaultCollection("control_collection")
             .build();
     if (sliceCount <= 0) {
@@ -2185,7 +2186,7 @@ protected SolrClient createNewSolrClient(int port) {
 
   protected SolrClient createNewSolrClient(String coreName, int port) {
     String baseUrl = buildUrl(port);
-    return new HttpSolrClient.Builder(baseUrl)
+    return new HttpApacheSolrClient.Builder(baseUrl)
         .withDefaultCollection(coreName)
         .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
         .withSocketTimeout(60000, TimeUnit.MILLISECONDS)
@@ -2727,7 +2728,7 @@ protected void waitForAllWarmingSearchers() throws InterruptedException {
 
   protected long getIndexVersion(Replica replica) throws IOException {
     try (SolrClient client =
-        new HttpSolrClient.Builder(replica.getBaseUrl())
+        new HttpApacheSolrClient.Builder(replica.getBaseUrl())
             .withDefaultCollection(replica.getCoreName())
             .build()) {
       ModifiableSolrParams params = new ModifiableSolrParams();
@@ -2777,7 +2778,7 @@ protected static boolean attemptCollectionDelete(CloudSolrClient client, String
 
   protected void logReplicationDetails(Replica replica, StringBuilder builder) throws IOException {
     try (SolrClient client =
-        new HttpSolrClient.Builder(replica.getBaseUrl())
+        new HttpApacheSolrClient.Builder(replica.getBaseUrl())
             .withDefaultCollection(replica.getCoreName())
             .build()) {
       ModifiableSolrParams params = new ModifiableSolrParams();
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 1e7aa064edda..1319532d8046 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
@@ -23,7 +23,7 @@
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.common.cloud.DocCollection;
@@ -139,7 +139,7 @@ private void assertShardConsistency(Slice shard, boolean expectDocs) throws Exce
     int i = 0;
     for (Replica replica : replicas) {
       try (var client =
-          new HttpSolrClient.Builder(replica.getBaseUrl())
+          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
               .withDefaultCollection(replica.getCoreName())
               .withHttpClient(((CloudLegacySolrClient) cluster.getSolrClient()).getHttpClient())
               .build()) {
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 b3f254bbedc9..60c90064c298 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.common.SolrInputDocument;
@@ -107,7 +107,7 @@ public void test() throws Exception {
 
     // we only set the connect timeout, not so timeout
     try (SolrClient baseClient =
-        new HttpSolrClient.Builder(baseUrl)
+        new HttpApacheSolrClient.Builder(baseUrl)
             .withConnectionTimeout(30000, TimeUnit.MILLISECONDS)
             .build()) {
       baseClient.request(request);
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 2ad56bdd2c62..adcccff7c8f6 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;
 import org.apache.solr.common.SolrInputDocument;
@@ -85,7 +85,7 @@ public void test() throws Exception {
    * @param url a Solr node base URL. Should <em>not</em> contain a core or collection name.
    */
   private SolrClient newSolrClient(String url) {
-    return new HttpSolrClient.Builder(url)
+    return new HttpApacheSolrClient.Builder(url)
         .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
         .withSocketTimeout(30000, TimeUnit.MILLISECONDS)
         .build();
@@ -275,7 +275,7 @@ private void testCoreUnloadAndLeaders() throws Exception {
     TestInjection.skipIndexWriterCommitOnClose = true;
 
     try (SolrClient addClient =
-        new HttpSolrClient.Builder(jettys.get(2).getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(jettys.get(2).getBaseUrl().toString())
             .withDefaultCollection("unloadcollection_shard1_replica3")
             .withConnectionTimeout(30000, TimeUnit.MILLISECONDS)
             .build()) {
@@ -316,7 +316,7 @@ private void testCoreUnloadAndLeaders() throws Exception {
     zkStateReader.getLeaderRetry("unloadcollection", "shard1", 15000);
 
     try (SolrClient addClient =
-        new HttpSolrClient.Builder(jettys.get(1).getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(jettys.get(1).getBaseUrl().toString())
             .withDefaultCollection("unloadcollection_shard1_replica2")
             .withConnectionTimeout(30000, TimeUnit.MILLISECONDS)
             .withSocketTimeout(90000, TimeUnit.MILLISECONDS)
@@ -381,7 +381,7 @@ private void testCoreUnloadAndLeaders() throws Exception {
     }
 
     try (SolrClient adminClient =
-        new HttpSolrClient.Builder(jettys.get(2).getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(jettys.get(2).getBaseUrl().toString())
             .withDefaultCollection("unloadcollection_shard1_replica3")
             .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
             .withSocketTimeout(30000, TimeUnit.MILLISECONDS)
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 dab85c10a8dc..b74305dcc293 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
@@ -25,9 +25,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.http.client.HttpClient;
 import org.apache.lucene.tests.util.LuceneTestCase;
+import org.apache.solr.client.solrj.HttpSolrClient;
 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.common.SolrInputDocument;
 import org.slf4j.Logger;
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 c7d51040b4be..0fba9ccacab8 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
@@ -44,7 +44,7 @@
 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.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.common.cloud.CollectionStatePredicate;
 import org.apache.solr.common.cloud.DocCollection;
@@ -374,7 +374,7 @@ protected static CoreStatusResponse.SingleCoreData getCoreStatus(Replica replica
       throws IOException, SolrServerException {
     JettySolrRunner jetty = cluster.getReplicaJetty(replica);
     try (SolrClient client =
-        new HttpSolrClient.Builder(jetty.getBaseUrl().toString())
+        new HttpApacheSolrClient.Builder(jetty.getBaseUrl().toString())
             .withHttpClient(((CloudLegacySolrClient) cluster.getSolrClient()).getHttpClient())
             .build()) {
       return CoreAdminRequest.getCoreStatus(replica.getCoreName(), client);
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 cb622bb42e84..0eb2d29d5141 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
@@ -32,7 +32,7 @@
 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest.ClusterProp;
@@ -496,7 +496,7 @@ public static Map<String, Integer> getShardToDocCountMap(
     for (Slice slice : docCollection.getActiveSlices()) {
       String shardName = slice.getName();
       try (var leaderClient =
-          new HttpSolrClient.Builder(slice.getLeader().getBaseUrl())
+          new HttpApacheSolrClient.Builder(slice.getLeader().getBaseUrl())
               .withDefaultCollection(slice.getLeader().getCoreName())
               .withHttpClient(((CloudLegacySolrClient) client).getHttpClient())
               .build()) {
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 8bc00fec3468..75d12ad2d87e 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,7 +53,7 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.cloud.SocketProxy;
 import org.apache.solr.client.solrj.embedded.SSLConfig;
 import org.apache.solr.client.solrj.request.CoresApi;
@@ -799,11 +799,11 @@ public URL getProxyBaseUrl() {
   }
 
   public SolrClient newClient() {
-    return new HttpSolrClient.Builder(getBaseUrl().toString()).build();
+    return new HttpApacheSolrClient.Builder(getBaseUrl().toString()).build();
   }
 
   public SolrClient newClient(int connectionTimeoutMillis, int socketTimeoutMillis) {
-    return new HttpSolrClient.Builder(getBaseUrl().toString())
+    return new HttpApacheSolrClient.Builder(getBaseUrl().toString())
         .withConnectionTimeout(connectionTimeoutMillis, TimeUnit.MILLISECONDS)
         .withSocketTimeout(socketTimeoutMillis, TimeUnit.MILLISECONDS)
         .build();
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 061bdaa0d5fd..3fd4dfd2fe12 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.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.common.util.IOUtils;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.embedded.JettyConfig;
@@ -112,7 +112,7 @@ public SolrClient getSolrClient(String collection) {
   }
 
   protected SolrClient newSolrClient(String collection) {
-    return new HttpSolrClient.Builder(getBaseUrl())
+    return new HttpApacheSolrClient.Builder(getBaseUrl())
         .withDefaultCollection(collection) // Properly handles when collection is 'null'
         .build();
   }
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 a5bbf93a0b2c..4a8d5cb452ed 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
@@ -92,7 +92,7 @@ private SolrClient buildClient(CloseableHttpClient httpClient, URL url) {
             .withThreadCount(1)
             .build();
       case 1:
-        return new HttpSolrClient.Builder(url.toString())
+        return new HttpApacheSolrClient.Builder(url.toString())
             .withDefaultCollection(COLLECTION)
             .withHttpClient(httpClient)
             .build();
@@ -166,7 +166,7 @@ && random().nextInt(10) > 8) {
       route =
           new HttpRoute(new HttpHost(url.getHost(), url.getPort(), isSSLMode() ? "https" : "http"));
 
-      mConn = cm.requestConnection(route, HttpSolrClient.cacheKey);
+      mConn = cm.requestConnection(route, HttpApacheSolrClient.cacheKey);
 
       HttpClientConnection conn2 = getConn(mConn);
 
@@ -233,6 +233,6 @@ public void headerRequest(
 
   public ConnectionRequest getClientConnectionRequest(
       HttpClient httpClient, HttpRoute route, PoolingHttpClientConnectionManager cm) {
-    return cm.requestConnection(route, HttpSolrClient.cacheKey);
+    return cm.requestConnection(route, HttpApacheSolrClient.cacheKey);
   }
 }
diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.java
index fea60566e42a..20f1911e2468 100644
--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.java
+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.java
@@ -21,9 +21,10 @@
 import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.solr.SolrTestCase;
+import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.ResponseParser;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.HttpSolrClient.Builder;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient.Builder;
 import org.apache.solr.client.solrj.impl.InputStreamResponseParser;
 import org.apache.solr.client.solrj.impl.JavaBinResponseParser;
 import org.apache.solr.common.params.ModifiableSolrParams;
@@ -42,14 +43,15 @@ public void testBaseSolrUrlIsRequired() {
 
   @Test
   public void testProvidesBaseSolrUrlToClient() throws IOException {
-    try (HttpSolrClient createdClient = new HttpSolrClient.Builder(ANY_BASE_SOLR_URL).build()) {
+    try (HttpSolrClient createdClient =
+        new HttpApacheSolrClient.Builder(ANY_BASE_SOLR_URL).build()) {
       assertEquals(ANY_BASE_SOLR_URL, createdClient.getBaseURL());
     }
   }
 
   @Test
   public void testProvidesHttpClientToClient() throws IOException {
-    try (HttpSolrClient createdClient =
+    try (var createdClient =
         new Builder(ANY_BASE_SOLR_URL).withHttpClient(ANY_HTTP_CLIENT).build()) {
       assertEquals(createdClient.getHttpClient(), ANY_HTTP_CLIENT);
     }
@@ -62,8 +64,7 @@ public void testUsesTimeoutProvidedByHttpClient() throws IOException {
     clientParams.set(HttpClientUtil.PROP_SO_TIMEOUT, 12345);
     clientParams.set(HttpClientUtil.PROP_CONNECTION_TIMEOUT, 67890);
     HttpClient httpClient = HttpClientUtil.createClient(clientParams);
-    try (HttpSolrClient createdClient =
-        new Builder(ANY_BASE_SOLR_URL).withHttpClient(httpClient).build()) {
+    try (var createdClient = new Builder(ANY_BASE_SOLR_URL).withHttpClient(httpClient).build()) {
       assertEquals(createdClient.getHttpClient(), httpClient);
       assertEquals(67890, createdClient.getConnectionTimeout());
       assertEquals(12345, createdClient.getSocketTimeout());
@@ -73,7 +74,7 @@ public void testUsesTimeoutProvidedByHttpClient() throws IOException {
 
   @Test
   public void testProvidesResponseParserToClient() throws IOException {
-    try (HttpSolrClient createdClient =
+    try (var createdClient =
         new Builder(ANY_BASE_SOLR_URL).withResponseParser(ANY_RESPONSE_PARSER).build()) {
       assertEquals(createdClient.getParser(), ANY_RESPONSE_PARSER);
     }
@@ -81,7 +82,7 @@ public void testProvidesResponseParserToClient() throws IOException {
 
   @Test
   public void testDefaultsToBinaryResponseParserWhenNoneProvided() throws IOException {
-    try (HttpSolrClient createdClient = new Builder(ANY_BASE_SOLR_URL).build()) {
+    try (var createdClient = new Builder(ANY_BASE_SOLR_URL).build()) {
       final ResponseParser usedParser = createdClient.getParser();
       assertTrue(usedParser instanceof JavaBinResponseParser);
     }
diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.java
index 6022040eb3ca..c69e3f4d3b1e 100644
--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.java
+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.java
@@ -60,13 +60,13 @@ public void testPoolSize() throws SolrServerException, IOException {
     CloseableHttpClient httpClient =
         HttpClientUtil.createClient(
             new ModifiableSolrParams(), pool, false /* let client shutdown it*/);
-    final HttpSolrClient clientFoo =
-        new HttpSolrClient.Builder(fooUrl)
+    final var clientFoo =
+        new HttpApacheSolrClient.Builder(fooUrl)
             .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)
             .withHttpClient(httpClient)
             .build();
-    final HttpSolrClient clientBar =
-        new HttpSolrClient.Builder(barUrl)
+    final var clientBar =
+        new HttpApacheSolrClient.Builder(barUrl)
             .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)
             .withHttpClient(httpClient)
             .build();
@@ -103,7 +103,7 @@ public void testPoolSize() throws SolrServerException, IOException {
       PoolStats stats = pool.getTotalStats();
       assertEquals("oh " + stats, 2, stats.getAvailable());
     } finally {
-      for (HttpSolrClient c : new HttpSolrClient[] {clientFoo, clientBar}) {
+      for (var c : new HttpApacheSolrClient[] {clientFoo, clientBar}) {
         HttpClientUtil.close(c.getHttpClient());
         c.close();
       }
diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.java
index ba97c548bb2b..617cf5b9d7db 100644
--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.java
+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.java
@@ -42,7 +42,7 @@ public void testLBHttpSolrClientHttpClientResponseParserStringArray() throws IOE
                 .withHttpClient(httpClient)
                 .withResponseParser(null)
                 .build();
-        HttpSolrClient httpSolrClient =
+        var httpSolrClient =
             testClient.makeSolrClient(new LBSolrClient.Endpoint("http://127.0.0.1:8080"))) {
       assertNull("Generated server should have null parser.", httpSolrClient.getParser());
     } finally {
@@ -57,7 +57,7 @@ public void testLBHttpSolrClientHttpClientResponseParserStringArray() throws IOE
                   .withHttpClient(httpClient)
                   .withResponseParser(parser)
                   .build();
-          HttpSolrClient httpSolrClient =
+          var httpSolrClient =
               testClient.makeSolrClient(new LBSolrClient.Endpoint("http://127.0.0.1:8080"))) {
         assertEquals(
             "Invalid parser passed to generated server.", parser, httpSolrClient.getParser());

From 129504154c3bad4c86a1225315c4a9ee77df0ab2 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Fri, 31 Oct 2025 22:54:29 -0400
Subject: [PATCH 04/27] ref guide sample code

---
 .../modules/indexing-guide/pages/indexing-with-tika.adoc      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-tika.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-tika.adoc
index 04b982a8f2a7..62342c816a5d 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-tika.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-tika.adoc
@@ -673,11 +673,11 @@ First, let's use SolrJ to create a new SolrClient, then we'll construct a reques
 ----
 public class SolrCellRequestDemo {
   public static void main (String[] args) throws IOException, SolrServerException {
-    SolrClient client = new HttpSolrClient.Builder("http://localhost:8983/solr/my_collection").build();
+    SolrClient client = new Http2SolrClient.Builder("http://localhost:8983/solr/").build();
     ContentStreamUpdateRequest req = new ContentStreamUpdateRequest("/update/extract");
     req.addFile(new File("my-file.pdf"));
     req.setParam(ExtractingParams.EXTRACT_ONLY, "true");
-    NamedList<Object> result = client.request(req);
+    NamedList<Object> result = client.request(req, "my_collection");
     System.out.println("Result: " + result);
   }
 }

From 93ae2a47bae7a59bc9e5024d1b52c14283cbcb10 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Mon, 3 Nov 2025 09:12:30 -0500
Subject: [PATCH 05/27] deprecations

---
 .../solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.java | 1 +
 .../java/org/apache/solr/client/solrj/apache/package-info.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.java
index 64af36f273f1..aadcf2ad9ac3 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.java
@@ -31,6 +31,7 @@
 import org.apache.http.protocol.HttpContext;
 
 @SuppressWarnings("deprecation")
+@Deprecated
 public class SolrPortAwareCookieSpecFactory implements CookieSpecFactory, CookieSpecProvider {
   public static final String POLICY_NAME = "solr-portaware";
   private final CookieSpec cookieSpec;
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java
index bfdeeef2287c..31cd26e17ead 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java
@@ -16,4 +16,5 @@
  */
 
 /** Apache HttpClient based {@link org.apache.solr.client.solrj.SolrClient} implementations */
+@Deprecated
 package org.apache.solr.client.solrj.apache;

From 829e69c2f823c4703394e63c14b58b808921fbad Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Mon, 3 Nov 2025 09:13:07 -0500
Subject: [PATCH 06/27] Don't override getBaseURL

---
 .../solr/client/solrj/apache/HttpApacheSolrClient.java       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
index d35905e9901b..29cd454d0243 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
@@ -783,11 +783,6 @@ public ModifiableSolrParams getInvariantParams() {
     return invariantParams;
   }
 
-  /** Typically looks like {@code http://localhost:8983/solr} (no core or collection) */
-  public String getBaseURL() {
-    return baseUrl;
-  }
-
   public ResponseParser getParser() {
     return parser;
   }

From 22b070ab0795641addf4749ecf698ca1742c67a3 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Mon, 3 Nov 2025 09:13:42 -0500
Subject: [PATCH 07/27] Change some HttpSolrClient references to
 HttpApacheSolrClient

---
 .../solrj/impl/BasicHttpSolrClientTest.java   | 38 +++++++++----------
 .../client/solrj/apache/LBHttpSolrClient.java |  4 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

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 529263c10732..0073fb28701a 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
@@ -290,14 +290,14 @@ public void testQuery() throws Exception {
       assertEquals("get", DebugServlet.lastMethod);
       // agent
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       // default wt
       assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
       assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
       // agent
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       // keepalive
       assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
@@ -314,14 +314,14 @@ public void testQuery() throws Exception {
 
       assertEquals("post", DebugServlet.lastMethod);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
       assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
       assertEquals(1, DebugServlet.parameters.get("a").length);
       assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
       assertEquals(
@@ -335,14 +335,14 @@ public void testQuery() throws Exception {
 
       assertEquals("put", DebugServlet.lastMethod);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
       assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
       assertEquals(1, DebugServlet.parameters.get("a").length);
       assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
       assertEquals(
@@ -362,14 +362,14 @@ public void testQuery() throws Exception {
 
       assertEquals("get", DebugServlet.lastMethod);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
       assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
       assertEquals(1, DebugServlet.parameters.get("a").length);
       assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
 
@@ -380,14 +380,14 @@ public void testQuery() throws Exception {
 
       assertEquals("post", DebugServlet.lastMethod);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
       assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
       assertEquals(1, DebugServlet.parameters.get("a").length);
       assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
       assertEquals(
@@ -400,14 +400,14 @@ public void testQuery() throws Exception {
 
       assertEquals("put", DebugServlet.lastMethod);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
       assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
       assertEquals(1, DebugServlet.parameters.get("a").length);
       assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
       assertEquals(
@@ -431,14 +431,14 @@ public void testDelete() throws Exception {
       assertEquals("post", DebugServlet.lastMethod);
       // agent
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       // default wt
       assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
       assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
       // agent
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       // keepalive
       assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
@@ -458,12 +458,12 @@ public void testDelete() throws Exception {
 
       assertEquals("post", DebugServlet.lastMethod);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
       assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
     }
@@ -497,7 +497,7 @@ public void testUpdate() throws Exception {
       assertEquals("post", DebugServlet.lastMethod);
       // agent
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       // default wt
       assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
@@ -524,7 +524,7 @@ public void testUpdate() throws Exception {
 
       assertEquals("post", DebugServlet.lastMethod);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
       assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
@@ -548,7 +548,7 @@ public void testUpdate() throws Exception {
 
       assertEquals("post", DebugServlet.lastMethod);
       assertEquals(
-          "Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
+          "Solr[" + HttpApacheSolrClient.class.getName() + "] " + UA_VERSION,
           DebugServlet.headers.get("User-Agent"));
       assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
       assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
index 11321c151b4a..abbb6dea2879 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
@@ -33,8 +33,8 @@
 
 /**
  * LBHttpSolrClient or "LoadBalanced HttpSolrClient" is a load balancing wrapper around {@link
- * HttpSolrClient}. This is useful when you have multiple Solr servers (also called endpoints) and
- * requests need to be Load Balanced among them.
+ * HttpApacheSolrClient}. This is useful when you have multiple Solr servers (also called endpoints)
+ * and requests need to be Load Balanced among them.
  *
  * <p>Do <b>NOT</b> use this class for indexing in leader/follower scenarios since documents must be
  * sent to the correct leader; no inter-node routing is done.

From 561a6d6dd153cabdf5afdcc2af7ad8245bb26196 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Mon, 3 Nov 2025 09:35:51 -0500
Subject: [PATCH 08/27] changelog

---
 .../SOLR-17962-MoveDeprecatedToTestFramework.yml          | 2 +-
 changelog/unreleased/SOLR-17968-HttpSolrClient.yml        | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 changelog/unreleased/SOLR-17968-HttpSolrClient.yml

diff --git a/changelog/unreleased/SOLR-17962-MoveDeprecatedToTestFramework.yml b/changelog/unreleased/SOLR-17962-MoveDeprecatedToTestFramework.yml
index 9a928512005b..c51b022c2c16 100644
--- a/changelog/unreleased/SOLR-17962-MoveDeprecatedToTestFramework.yml
+++ b/changelog/unreleased/SOLR-17962-MoveDeprecatedToTestFramework.yml
@@ -1,7 +1,7 @@
 # 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.
+  They temporarily live on in the test framework in different packages & names.
 type: other # added, changed, fixed, deprecated, removed, dependency_update, security, other
 authors:
   - name: David Smiley
diff --git a/changelog/unreleased/SOLR-17968-HttpSolrClient.yml b/changelog/unreleased/SOLR-17968-HttpSolrClient.yml
new file mode 100644
index 000000000000..8b36252fbe9f
--- /dev/null
+++ b/changelog/unreleased/SOLR-17968-HttpSolrClient.yml
@@ -0,0 +1,8 @@
+
+title: Introduce org.apache.solr.client.solrj.HttpSolrClient, implemented by the Jetty & JDK HttpClient based SolrClients.
+type: other
+authors:
+  - name: David Smiley
+links:
+  - name: SOLR-17968
+    url: https://issues.apache.org/jira/browse/SOLR-17968

From 2a435c030a61924933ee523c3cfbb34c262ceaff Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Fri, 26 Dec 2025 23:02:07 -0500
Subject: [PATCH 09/27] HttpApacheSolrClient no longer implements HttpClient

---
 .../solr/cloud/BasicDistributedZkTest.java    | 18 +++----
 .../solr/cloud/TestStressInPlaceUpdates.java  |  4 +-
 .../solr/update/SolrCmdDistributorTest.java   | 30 ++++++------
 .../update/TestInPlaceUpdatesDistrib.java     | 49 +++++++++----------
 .../solr/client/solrj/SolrExampleTests.java   |  5 +-
 .../java/org/apache/solr/SolrTestCaseJ4.java  |  7 ++-
 .../solrj/apache/HttpApacheSolrClient.java    | 26 +++++-----
 .../client/solrj/apache/LBHttpSolrClient.java |  4 +-
 .../cloud/AbstractFullDistribZkTestBase.java  |  5 +-
 .../FullThrottleStoppableIndexingThread.java  |  6 +--
 .../solrj/apache/BasicHttpSolrClientTest.java | 22 ++++-----
 11 files changed, 85 insertions(+), 91 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
index 9868875285ac..b1b98f9939a3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
@@ -42,7 +42,6 @@
 import org.apache.lucene.util.IOUtils;
 import org.apache.solr.JSONTestUtil;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
-import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -704,7 +703,7 @@ public void test() throws Exception {
     for (SolrClient client : clients) {
       assertEquals(
           "unexpected pre-commitWithin document count on node: "
-              + ((HttpSolrClient) client).getBaseURL(),
+              + ((HttpApacheSolrClient) client).getBaseURL(),
           before,
           client.query(new SolrQuery("*:*")).getResults().getNumFound());
     }
@@ -1046,7 +1045,7 @@ private void testShardParamVariations() throws Exception {
 
   private void testStopAndStartCoresInOneInstance() throws Exception {
     JettySolrRunner jetty = jettys.get(0);
-    try (final SolrClient httpSolrClient = (HttpSolrClient) jetty.newClient(15000, 60000)) {
+    try (final SolrClient httpSolrClient = (HttpApacheSolrClient) jetty.newClient(15000, 60000)) {
       ThreadPoolExecutor executor = null;
       try {
         executor =
@@ -1155,7 +1154,7 @@ protected CollectionAdminResponse createCollection(
 
     CollectionAdminResponse res = new CollectionAdminResponse();
     if (client == null) {
-      final String baseUrl = ((HttpSolrClient) clients.get(clientIndex)).getBaseURL();
+      final String baseUrl = ((HttpApacheSolrClient) clients.get(clientIndex)).getBaseURL();
 
       try (SolrClient aClient = createNewSolrClient("", baseUrl)) {
         res.setResponse(aClient.request(request));
@@ -1265,7 +1264,7 @@ private void doOptimisticLockingAndUpdating() throws Exception {
 
   private void testNumberOfCommitsWithCommitAfterAdd() throws SolrServerException, IOException {
     log.info("### STARTING testNumberOfCommitsWithCommitAfterAdd");
-    long startCommits = getNumCommits((HttpSolrClient) clients.get(0));
+    long startCommits = getNumCommits((HttpApacheSolrClient) clients.get(0));
 
     NamedList<Object> result =
         clients
@@ -1276,11 +1275,12 @@ private void testNumberOfCommitsWithCommitAfterAdd() throws SolrServerException,
                     .setCommitWithin(900000)
                     .setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true));
 
-    long endCommits = getNumCommits((HttpSolrClient) clients.get(0));
+    long endCommits = getNumCommits((HttpApacheSolrClient) clients.get(0));
     assertEquals(startCommits + 1L, endCommits);
   }
 
-  private Long getNumCommits(HttpSolrClient sourceClient) throws SolrServerException, IOException {
+  private Long getNumCommits(HttpApacheSolrClient sourceClient)
+      throws SolrServerException, IOException {
     String collection = sourceClient.getDefaultCollection();
     try (SolrClient client =
         new HttpApacheSolrClient.Builder(sourceClient.getBaseURL())
@@ -1444,7 +1444,7 @@ public void run() {
   private void testSearchByCollectionName() throws SolrServerException, IOException {
     log.info("### STARTING testSearchByCollectionName");
     SolrClient client = clients.get(0);
-    final String baseUrl = ((HttpSolrClient) client).getBaseURL();
+    final String baseUrl = ((HttpApacheSolrClient) client).getBaseURL();
 
     // the cores each have different names, but if we add the collection name to the url
     // we should get mapped to the right core
@@ -1458,7 +1458,7 @@ private void testSearchByCollectionName() throws SolrServerException, IOExceptio
   private void testUpdateByCollectionName() throws SolrServerException, IOException {
     log.info("### STARTING testUpdateByCollectionName");
     SolrClient client = clients.get(0);
-    final String baseUrl = ((HttpSolrClient) client).getBaseURL();
+    final String baseUrl = ((HttpApacheSolrClient) client).getBaseURL();
 
     // the cores each have different names, but if we add the collection name to the url
     // we should get mapped to the right core
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 2e3921429c3b..3101aafd010e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
@@ -29,8 +29,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.commons.math3.primes.Primes;
-import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.UpdateResponse;
@@ -681,7 +681,7 @@ public SolrClient getClientForLeader() throws KeeperException, InterruptedExcept
 
     for (SolrClient client : clients) {
       String leaderBaseUrl = zkStateReader.getBaseUrlForNodeName(leader.getNodeName());
-      if (((HttpSolrClient) client).getBaseURL().startsWith(leaderBaseUrl)) {
+      if (((HttpApacheSolrClient) client).getBaseURL().startsWith(leaderBaseUrl)) {
         return client;
       }
     }
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 945c4d1528b9..2180c7e7a4ee 100644
--- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
@@ -27,9 +27,9 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.solr.BaseDistributedSearchTestCase;
-import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.LukeRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -159,7 +159,7 @@ public void test() throws Exception {
     List<SolrError> errors;
     CommitUpdateCommand ccmd = new CommitUpdateCommand(null, false);
     long numFound;
-    HttpSolrClient client;
+    HttpApacheSolrClient client;
     ZkNodeProps nodeProps;
 
     try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(updateShardHandler)) {
@@ -167,7 +167,7 @@ public void test() throws Exception {
       nodeProps =
           new ZkNodeProps(
               ZkStateReader.BASE_URL_PROP,
-              ((HttpSolrClient) controlClient).getBaseURL(),
+              ((HttpApacheSolrClient) controlClient).getBaseURL(),
               ZkStateReader.CORE_NAME_PROP,
               controlClient.getDefaultCollection());
       nodes.add(new StdNode(new ZkCoreNodeProps(nodeProps)));
@@ -190,7 +190,7 @@ public void test() throws Exception {
       numFound = controlClient.query(new SolrQuery("*:*")).getResults().getNumFound();
       assertEquals(1, numFound);
 
-      client = (HttpSolrClient) clients.get(0);
+      client = (HttpApacheSolrClient) clients.get(0);
       nodeProps =
           new ZkNodeProps(
               ZkStateReader.BASE_URL_PROP,
@@ -281,7 +281,7 @@ public void test() throws Exception {
           if (random().nextBoolean()) {
             continue;
           }
-          HttpSolrClient httpClient = (HttpSolrClient) c;
+          var httpClient = (HttpApacheSolrClient) c;
           nodeProps =
               new ZkNodeProps(
                   ZkStateReader.BASE_URL_PROP,
@@ -301,7 +301,7 @@ public void test() throws Exception {
       nodes.clear();
 
       for (SolrClient c : clients) {
-        HttpSolrClient httpClient = (HttpSolrClient) c;
+        var httpClient = (HttpApacheSolrClient) c;
         nodeProps =
             new ZkNodeProps(
                 ZkStateReader.BASE_URL_PROP,
@@ -377,7 +377,7 @@ public void newSearcher(
   }
 
   private void testDeletes(boolean dbq, boolean withFailures) throws Exception {
-    final HttpSolrClient solrclient = (HttpSolrClient) clients.get(0);
+    final var solrclient = (HttpApacheSolrClient) clients.get(0);
     solrclient.commit(true, true);
     long numFoundBefore = solrclient.query(new SolrQuery("*:*")).getResults().getNumFound();
     final MockStreamingSolrClients streamingClients =
@@ -445,7 +445,7 @@ public boolean checkRetry(SolrError err) {
   }
 
   private void testMinRfOnRetries(NodeType nodeType) throws Exception {
-    final HttpSolrClient solrclient = (HttpSolrClient) clients.get(0);
+    final var solrclient = (HttpApacheSolrClient) clients.get(0);
     final MockStreamingSolrClients streamingClients =
         new MockStreamingSolrClients(updateShardHandler);
     try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(streamingClients, 0)) {
@@ -507,7 +507,7 @@ private void testMaxRetries(NodeType nodeType) throws IOException {
     try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(streamingClients, 0)) {
       streamingClients.setExp(Exp.CONNECT_EXCEPTION);
       ArrayList<Node> nodes = new ArrayList<>();
-      final HttpSolrClient solrClient1 = (HttpSolrClient) clients.get(0);
+      final var solrClient1 = (HttpApacheSolrClient) clients.get(0);
 
       final AtomicInteger retries = new AtomicInteger();
       ZkNodeProps nodeProps =
@@ -625,7 +625,7 @@ private SolrError getError(Exception e) {
   }
 
   private void testOneRetry(NodeType nodeType) throws Exception {
-    final HttpSolrClient solrclient = (HttpSolrClient) clients.get(0);
+    final var solrclient = (HttpApacheSolrClient) clients.get(0);
     long numFoundBefore = solrclient.query(new SolrQuery("*:*")).getResults().getNumFound();
     final MockStreamingSolrClients streamingClients =
         new MockStreamingSolrClients(updateShardHandler);
@@ -686,7 +686,7 @@ public boolean checkRetry(SolrError err) {
 
   private void testNodeWontRetryBadRequest(NodeType nodeType) throws Exception {
     ignoreException("Bad Request");
-    final HttpSolrClient solrclient = (HttpSolrClient) clients.get(0);
+    final var solrclient = (HttpApacheSolrClient) clients.get(0);
     long numFoundBefore = solrclient.query(new SolrQuery("*:*")).getResults().getNumFound();
     final MockStreamingSolrClients streamingClients =
         new MockStreamingSolrClients(updateShardHandler);
@@ -747,7 +747,7 @@ public boolean checkRetry(SolrError err) {
   }
 
   private void testForwardNodeWontRetrySocketError() throws Exception {
-    final HttpSolrClient solrclient = (HttpSolrClient) clients.get(0);
+    final var solrclient = (HttpApacheSolrClient) clients.get(0);
     long numFoundBefore = solrclient.query(new SolrQuery("*:*")).getResults().getNumFound();
     final MockStreamingSolrClients streamingClients =
         new MockStreamingSolrClients(updateShardHandler);
@@ -796,7 +796,7 @@ public boolean checkRetry(SolrError err) {
   }
 
   private void testStdNodeRetriesSocketError() throws Exception {
-    final HttpSolrClient solrclient = (HttpSolrClient) clients.get(0);
+    final var solrclient = (HttpApacheSolrClient) clients.get(0);
     final MockStreamingSolrClients streamingClients =
         new MockStreamingSolrClients(updateShardHandler);
     try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(streamingClients, 0)) {
@@ -836,7 +836,7 @@ public boolean checkRetry(SolrError err) {
   private void testRetryNodeAgainstBadAddress() throws SolrServerException, IOException {
     // Test RetryNode
     try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(updateShardHandler)) {
-      final HttpSolrClient solrclient = (HttpSolrClient) clients.get(0);
+      final var solrclient = (HttpApacheSolrClient) clients.get(0);
       long numFoundBefore = solrclient.query(new SolrQuery("*:*")).getResults().getNumFound();
 
       ArrayList<Node> nodes = new ArrayList<>();
@@ -926,7 +926,7 @@ private void testStuckUpdates() {
           if (random().nextBoolean()) {
             continue;
           }
-          HttpSolrClient httpClient = (HttpSolrClient) c;
+          var httpClient = (HttpApacheSolrClient) c;
           ZkNodeProps nodeProps =
               new ZkNodeProps(
                   ZkStateReader.BASE_URL_PROP,
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 e2801e6de0dd..d40f332c719e 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
@@ -35,9 +35,9 @@
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.NoMergePolicy;
 import org.apache.lucene.tests.util.TestUtil;
-import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 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;
@@ -117,7 +117,7 @@ public TestInPlaceUpdatesDistrib() {
   }
 
   private SolrClient LEADER = null;
-  private List<SolrClient> NONLEADERS = null;
+  private List<HttpApacheSolrClient> NONLEADERS = null;
 
   @Test
   @ShardsFixed(num = 3)
@@ -218,7 +218,7 @@ private void mapReplicasToClients() throws KeeperException, InterruptedException
 
     String leaderBaseUrl = zkStateReader.getBaseUrlForNodeName(leader.getNodeName());
     for (SolrClient solrClient : clients) {
-      if (((HttpSolrClient) solrClient).getBaseURL().startsWith(leaderBaseUrl)) {
+      if (((HttpApacheSolrClient) solrClient).getBaseURL().startsWith(leaderBaseUrl)) {
         LEADER = solrClient;
       }
     }
@@ -230,8 +230,8 @@ private void mapReplicasToClients() throws KeeperException, InterruptedException
       }
       String baseUrl = zkStateReader.getBaseUrlForNodeName(rep.getNodeName());
       for (SolrClient client : clients) {
-        if (((HttpSolrClient) client).getBaseURL().startsWith(baseUrl)) {
-          NONLEADERS.add(client);
+        if (((HttpApacheSolrClient) client).getBaseURL().startsWith(baseUrl)) {
+          NONLEADERS.add((HttpApacheSolrClient) client);
         }
       }
     }
@@ -953,7 +953,7 @@ private void outOfOrderUpdatesIndividualReplicaTest() throws Exception {
     // assert both replicas have same effect
     for (SolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
       if (log.isInfoEnabled()) {
-        log.info("Testing client: {}", ((HttpSolrClient) client).getBaseURL());
+        log.info("Testing client: {}", ((HttpApacheSolrClient) client).getBaseURL());
       }
       assertReplicaValue(
           client,
@@ -961,13 +961,14 @@ private void outOfOrderUpdatesIndividualReplicaTest() throws Exception {
           "inplace_updatable_float",
           (newinplace_updatable_float + (float) (updates.size() - 1)),
           "inplace_updatable_float didn't match for replica at client: "
-              + ((HttpSolrClient) client).getBaseURL());
+              + ((HttpApacheSolrClient) client).getBaseURL());
       assertReplicaValue(
           client,
           0,
           "title_s",
           "title0_new",
-          "Title didn't match for replica at client: " + ((HttpSolrClient) client).getBaseURL());
+          "Title didn't match for replica at client: "
+              + ((HttpApacheSolrClient) client).getBaseURL());
       assertEquals(version0 + updates.size(), getReplicaValue(client, 0, "_version_"));
     }
 
@@ -1145,9 +1146,7 @@ private void reorderedDBQsResurrectionTest() throws Exception {
       // the resurrection can happen from there (instead of the leader)
       update.setParam(
           DistributedUpdateProcessor.DISTRIB_FROM,
-          ((HttpSolrClient) NONLEADERS.get(1)).getBaseURL()
-              + "/"
-              + NONLEADERS.get(1).getDefaultCollection());
+          (NONLEADERS.get(1)).getBaseURL() + "/" + NONLEADERS.get(1).getDefaultCollection());
       AsyncUpdateWithRandomCommit task =
           new AsyncUpdateWithRandomCommit(update, NONLEADERS.get(0), random().nextLong());
       updateResponses.add(threadpool.submit(task));
@@ -1187,8 +1186,8 @@ private void reorderedDBQsResurrectionTest() throws Exception {
     assertEquals(updateResponses.size(), successful);
 
     if (log.isInfoEnabled()) {
-      log.info("Non leader 0: {}", ((HttpSolrClient) NONLEADERS.get(0)).getBaseURL());
-      log.info("Non leader 1: {}", ((HttpSolrClient) NONLEADERS.get(1)).getBaseURL()); // nowarn
+      log.info("Non leader 0: {}", NONLEADERS.get(0).getBaseURL());
+      log.info("Non leader 1: {}", NONLEADERS.get(1).getBaseURL()); // nowarn
     }
 
     SolrDocument doc0 = NONLEADERS.get(0).getById(String.valueOf(0), params("distrib", "false"));
@@ -1199,9 +1198,9 @@ private void reorderedDBQsResurrectionTest() throws Exception {
     // assert both replicas have same effect
     for (SolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
       SolrDocument doc = client.getById(String.valueOf(0), params("distrib", "false"));
-      assertNotNull("Client: " + ((HttpSolrClient) client).getBaseURL(), doc);
+      assertNotNull("Client: " + ((HttpApacheSolrClient) client).getBaseURL(), doc);
       assertEquals(
-          "Client: " + ((HttpSolrClient) client).getBaseURL(), 5, doc.getFieldValue(field));
+          "Client: " + ((HttpApacheSolrClient) client).getBaseURL(), 5, doc.getFieldValue(field));
     }
 
     log.info("reorderedDBQsResurrectionTest: This test passed fine...");
@@ -1296,26 +1295,24 @@ private void delayedReorderingFetchesMissingUpdateFromLeaderTest() throws Except
     }
 
     for (SolrClient client : clients) {
+      String baseURL = ((HttpApacheSolrClient) client).getBaseURL();
       if (log.isInfoEnabled()) {
-        log.info("Testing client (Fetch missing test): {}", ((HttpSolrClient) client).getBaseURL());
+        log.info("Testing client (Fetch missing test): {}", baseURL);
         log.info(
-            "Version at {} is: {}",
-            ((HttpSolrClient) client).getBaseURL(),
-            getReplicaValue(client, 1, "_version_")); // nowarn
+            "Version at {} is: {}", baseURL, getReplicaValue(client, 1, "_version_")); // nowarn
       }
       assertReplicaValue(
           client,
           1,
           "inplace_updatable_float",
           (newinplace_updatable_float + 2.0f),
-          "inplace_updatable_float didn't match for replica at client: "
-              + ((HttpSolrClient) client).getBaseURL());
+          "inplace_updatable_float didn't match for replica at client: " + baseURL);
       assertReplicaValue(
           client,
           1,
           "title_s",
           "title1_new",
-          "Title didn't match for replica at client: " + ((HttpSolrClient) client).getBaseURL());
+          "Title didn't match for replica at client: " + baseURL);
     }
 
     // Try another round of these updates, this time with a delete request at the end.
@@ -1474,7 +1471,7 @@ UpdateRequest simulatedDeleteRequest(int id, long version) throws IOException {
   }
 
   UpdateRequest simulatedDeleteRequest(String query, long version) {
-    String baseUrl = getBaseUrl((HttpSolrClient) LEADER);
+    String baseUrl = getBaseUrl((HttpApacheSolrClient) LEADER);
 
     UpdateRequest ur = new UpdateRequest();
     ur.deleteByQuery(query);
@@ -1490,7 +1487,7 @@ private String getBaseUrl(String id) {
     return slice.getLeader().getCoreUrl();
   }
 
-  protected String getBaseUrl(HttpSolrClient client) {
+  protected String getBaseUrl(HttpApacheSolrClient client) {
     // take a complete Solr url that ends with /collection1 and truncates it to the root url
     // that is used for admin api calls.
     return client
@@ -1678,10 +1675,10 @@ private void reorderedDBQsUsingUpdatedValueFromADroppedUpdate() throws Exception
       if (log.isInfoEnabled()) {
         log.info(
             "Testing client (testDBQUsingUpdatedFieldFromDroppedUpdate): {}",
-            ((HttpSolrClient) client).getBaseURL());
+            ((HttpApacheSolrClient) client).getBaseURL());
         log.info(
             "Version at {} is: {}",
-            ((HttpSolrClient) client).getBaseURL(),
+            ((HttpApacheSolrClient) client).getBaseURL(),
             getReplicaValue(client, 1, "_version_")); // nowarn
       }
       assertNull(client.getById("1", params("distrib", "false")));
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 6c2732b57ba0..87044a52f229 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,6 +41,7 @@
 import java.util.Random;
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 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;
@@ -739,7 +740,7 @@ public void testErrorHandling() throws Exception {
     doc.addField("id", "DOCID2");
     doc.addField("name", "hello");
 
-    if (client instanceof HttpSolrClient) {
+    if (client instanceof HttpApacheSolrClient) {
       ex = expectThrows(SolrException.class, () -> client.add(doc));
       assertEquals(400, ex.code());
       assertTrue(ex.getMessage().indexOf("contains multiple values for uniqueKey") > 0);
@@ -2428,7 +2429,7 @@ public void testUpdateField() throws Exception {
     doc.addField(field, oper);
     try {
       client.add(doc);
-      if (client instanceof HttpSolrClient) {
+      if (client instanceof HttpApacheSolrClient) {
         // XXX concurrent client reports exceptions differently
         fail("Operation should throw an exception!");
       } else if (client instanceof ErrorTrackingConcurrentUpdateSolrClient concurrentClient) {
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 f74220e3240c..c46b88a1d269 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -81,7 +81,6 @@
 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.HttpSolrClient;
 import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
 import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.apache.HttpClientUtil;
@@ -2634,12 +2633,12 @@ public static HttpClient getHttpClient(String url) {
    *
    * @param url the base URL for a Solr node. Should not contain a core or collection name.
    */
-  public static HttpSolrClient getHttpSolrClient(String url) {
+  public static HttpApacheSolrClient getHttpSolrClient(String url) {
     return new HttpApacheSolrClient.Builder(url).build();
   }
 
   /** Create a basic HttpSolrClient pointed at the specified replica */
-  public static HttpSolrClient getHttpSolrClient(Replica replica) {
+  public static HttpApacheSolrClient getHttpSolrClient(Replica replica) {
     return getHttpSolrClient(replica.getBaseUrl(), replica.getCoreName());
   }
 
@@ -2652,7 +2651,7 @@ public static HttpSolrClient getHttpSolrClient(Replica replica) {
    * @param defaultCoreName the name of a core that the created client should default to when making
    *     core-aware requests
    */
-  public static HttpSolrClient getHttpSolrClient(String url, String defaultCoreName) {
+  public static HttpApacheSolrClient getHttpSolrClient(String url, String defaultCoreName) {
     return new HttpApacheSolrClient.Builder(url).withDefaultCollection(defaultCoreName).build();
   }
 
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
index 351e06fbd39c..76c4a4b0b590 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java
@@ -70,8 +70,8 @@
 import org.apache.http.message.BasicHeader;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.solr.client.api.util.SolrVersion;
-import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.RemoteSolrException;
+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.HttpJdkSolrClient;
@@ -98,7 +98,7 @@
  * @deprecated Please use {@link HttpJettySolrClient} or {@link HttpJdkSolrClient}
  */
 @Deprecated(since = "9.0")
-public class HttpApacheSolrClient extends HttpSolrClient {
+public class HttpApacheSolrClient extends SolrClient {
 
   private static final Charset FALLBACK_CHARSET = StandardCharsets.UTF_8;
   private static final long serialVersionUID = -946812319974801896L;
@@ -110,6 +110,9 @@ public class HttpApacheSolrClient extends HttpSolrClient {
 
   static final Class<HttpApacheSolrClient> cacheKey = HttpApacheSolrClient.class;
 
+  /** The URL of the Solr server. */
+  protected volatile String baseUrl;
+
   /**
    * Default value: null / empty.
    *
@@ -146,9 +149,11 @@ public class HttpApacheSolrClient extends HttpSolrClient {
   private final int connectionTimeout;
   private final int soTimeout;
 
-  /** Use the builder to create this client */
   protected HttpApacheSolrClient(Builder builder) {
-    super(extractBaseUrl(builder));
+    this.baseUrl = builder.baseSolrUrl;
+    if (baseUrl.endsWith("/")) {
+      baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
+    }
 
     if (baseUrl.indexOf('?') >= 0) {
       throw new RuntimeException(
@@ -183,14 +188,6 @@ protected HttpApacheSolrClient(Builder builder) {
     this.defaultCollection = builder.defaultCollection;
   }
 
-  private static String extractBaseUrl(Builder builder) {
-    String baseUrl = builder.baseSolrUrl;
-    if (baseUrl.endsWith("/")) {
-      baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
-    }
-    return baseUrl;
-  }
-
   public Set<String> getUrlParamNames() {
     return urlParamNames;
   }
@@ -749,6 +746,11 @@ public ModifiableSolrParams getInvariantParams() {
     return invariantParams;
   }
 
+  /** Typically looks like {@code http://localhost:8983/solr} (no core or collection) */
+  public String getBaseURL() {
+    return baseUrl;
+  }
+
   public ResponseParser getParser() {
     return parser;
   }
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
index df922af342ec..3014d8019981 100644
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
@@ -23,7 +23,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import org.apache.http.client.HttpClient;
-import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.LBSolrClient;
@@ -102,7 +101,8 @@ public class LBHttpSolrClient extends LBSolrClient {
 
   private final HttpClient httpClient;
   private final boolean clientIsInternal;
-  private final ConcurrentHashMap<String, HttpSolrClient> urlToClient = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<String, HttpApacheSolrClient> urlToClient =
+      new ConcurrentHashMap<>();
   private final HttpApacheSolrClient.Builder httpSolrClientBuilder;
   private volatile Set<String> urlParamNames = new HashSet<>();
 
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 eadad4eea3d7..131d86f01050 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,7 +52,6 @@
 import org.apache.solr.cli.DefaultToolRuntime;
 import org.apache.solr.cli.SolrCLI;
 import org.apache.solr.cli.ToolRuntime;
-import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrRequest.METHOD;
@@ -977,7 +976,7 @@ protected void updateMappingsFromZk(
       // we find out state by simply matching ports...
       for (Slice slice : coll.getSlices()) {
         for (Replica replica : slice.getReplicas()) {
-          int port = new URI(((HttpSolrClient) client).getBaseURL()).getPort();
+          int port = new URI(((HttpApacheSolrClient) client).getBaseURL()).getPort();
 
           if (replica.getBaseUrl().contains(":" + port)) {
             CloudSolrServerClient csc = new CloudSolrServerClient();
@@ -2060,7 +2059,7 @@ protected void assertDocCounts(boolean verbose) throws Exception {
         Map<String, Replica> theShards = slice.getValue().getReplicasMap();
         for (Map.Entry<String, Replica> shard : theShards.entrySet()) {
           String shardName =
-              new URI(((HttpSolrClient) client.solrClient).getBaseURL()).getPort() + "_solr_";
+              new URI(((HttpApacheSolrClient) client.solrClient).getBaseURL()).getPort() + "_solr_";
           if (verbose && shard.getKey().endsWith(shardName)) {
             System.err.println("shard:" + slice.getKey());
             System.err.println(shard.getValue());
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 b74305dcc293..ac4cb0199188 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
@@ -25,9 +25,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.http.client.HttpClient;
 import org.apache.lucene.tests.util.LuceneTestCase;
-import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.common.SolrInputDocument;
 import org.slf4j.Logger;
@@ -62,7 +62,7 @@ public FullThrottleStoppableIndexingThread(
 
     cusc =
         new ErrorLoggingConcurrentUpdateSolrClient.Builder(
-                ((HttpSolrClient) clients.get(0)).getBaseURL())
+                ((HttpApacheSolrClient) clients.get(0)).getBaseURL())
             .withDefaultCollection(clients.get(0).getDefaultCollection())
             .withHttpClient(httpClient)
             .withQueueSize(8)
@@ -127,7 +127,7 @@ private void changeUrlOnError(Exception e) {
       cusc.shutdownNow();
       cusc =
           new ErrorLoggingConcurrentUpdateSolrClient.Builder(
-                  ((HttpSolrClient) clients.get(clientIndex)).getBaseURL())
+                  ((HttpApacheSolrClient) clients.get(clientIndex)).getBaseURL())
               .withDefaultCollection(clients.get(clientIndex).getDefaultCollection())
               .withHttpClient(httpClient)
               .withQueueSize(30)
diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java
index f5914652cdcb..1f4aa3a92440 100644
--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java
+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java
@@ -48,7 +48,6 @@
 import org.apache.solr.SolrJettyTestBase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.api.util.SolrVersion;
-import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.RemoteSolrException;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
@@ -144,7 +143,7 @@ public void testQuery() throws Exception {
     q.setParam("a", "\u1234");
     final var queryRequest = new QueryRequest(q);
     queryRequest.setPath(debugPath);
-    try (HttpSolrClient client = getHttpSolrClient(getBaseUrl())) {
+    try (var client = getHttpSolrClient(getBaseUrl())) {
 
       expectThrows(RemoteSolrException.class, () -> queryRequest.process(client));
 
@@ -283,7 +282,7 @@ public void testDelete() throws Exception {
     DebugServlet.clear();
     final String debugPath = "/debug/foo";
 
-    try (HttpSolrClient client = getHttpSolrClient(getBaseUrl())) {
+    try (var client = getHttpSolrClient(getBaseUrl())) {
       final UpdateRequest deleteById = new UpdateRequest();
       deleteById.deleteById("id");
       deleteById.setPath(debugPath + deleteById.getPath());
@@ -347,7 +346,7 @@ public void testUpdate() throws Exception {
     DebugServlet.clear();
     final String debugPath = "/debug/foo";
 
-    try (HttpSolrClient client = getHttpSolrClient(getBaseUrl())) {
+    try (var client = getHttpSolrClient(getBaseUrl())) {
       UpdateRequest req = new UpdateRequest();
       req.add(new SolrInputDocument());
       req.setPath(debugPath + req.getPath());
@@ -652,7 +651,7 @@ private void setReqParamsOf(UpdateRequest req, String... keys) {
     }
   }
 
-  private void verifyServletState(HttpSolrClient client, SolrRequest<?> request) {
+  private void verifyServletState(HttpApacheSolrClient client, SolrRequest<?> request) {
     // check query String
     Iterator<String> paramNames = request.getParams().getParameterNamesIterator();
     while (paramNames.hasNext()) {
@@ -661,7 +660,7 @@ private void verifyServletState(HttpSolrClient client, SolrRequest<?> request) {
       if (values != null) {
         for (String value : values) {
           boolean shouldBeInQueryString =
-              ((HttpApacheSolrClient) client).getUrlParamNames().contains(name)
+              client.getUrlParamNames().contains(name)
                   || (request.getQueryParams() != null && request.getQueryParams().contains(name));
           assertEquals(
               shouldBeInQueryString, DebugServlet.queryString.contains(name + "=" + value));
@@ -678,8 +677,7 @@ private void verifyServletState(HttpSolrClient client, SolrRequest<?> request) {
   public void testQueryString() throws Exception {
     final String debugPath = "/debug/foo";
     HttpApacheSolrClient.Builder builder = new HttpApacheSolrClient.Builder(getBaseUrl());
-    try (HttpSolrClient client =
-        builder.withTheseParamNamesInTheUrl(Set.of("serverOnly")).build()) {
+    try (var client = builder.withTheseParamNamesInTheUrl(Set.of("serverOnly")).build()) {
       // test without request query params
       DebugServlet.clear();
       UpdateRequest req = new UpdateRequest();
@@ -688,7 +686,7 @@ public void testQueryString() throws Exception {
       expectThrows(RemoteSolrException.class, () -> client.request(req));
       verifyServletState(client, req);
     }
-    try (HttpSolrClient client = builder.withTheseParamNamesInTheUrl(Set.of()).build()) {
+    try (var client = builder.withTheseParamNamesInTheUrl(Set.of()).build()) {
       // test without server query params
       DebugServlet.clear();
       UpdateRequest req2 = new UpdateRequest();
@@ -698,8 +696,7 @@ public void testQueryString() throws Exception {
       expectThrows(RemoteSolrException.class, () -> client.request(req2));
       verifyServletState(client, req2);
     }
-    try (HttpSolrClient client =
-        builder.withTheseParamNamesInTheUrl(Set.of("serverOnly", "both")).build()) {
+    try (var client = builder.withTheseParamNamesInTheUrl(Set.of("serverOnly", "both")).build()) {
       // test with both request and server query params
       DebugServlet.clear();
       UpdateRequest req3 = new UpdateRequest();
@@ -709,8 +706,7 @@ public void testQueryString() throws Exception {
       expectThrows(RemoteSolrException.class, () -> client.request(req3));
       verifyServletState(client, req3);
     }
-    try (HttpSolrClient client =
-        builder.withTheseParamNamesInTheUrl(Set.of("serverOnly", "both")).build()) {
+    try (var client = builder.withTheseParamNamesInTheUrl(Set.of("serverOnly", "both")).build()) {
       // test with both request and server query params with single stream
       DebugServlet.clear();
       UpdateRequest req4 = new UpdateRequest();

From 096a5e5fa1f372cc62044c971d3f9c34b4ff1e44 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Fri, 26 Dec 2025 23:07:43 -0500
Subject: [PATCH 10/27] Rename HttpSolrClientBase to HttpSolrClient. Rename
 HttpSolrClientBuilderBase.java to HttpSolrClient.BuilderBase (inner class)

---
 gradle/libs.versions.toml                     |   1 -
 .../org/apache/solr/core/CoreContainer.java   |   6 +-
 .../solr/client/solrj/io/SolrClientCache.java |  13 +-
 .../impl/SolrClientNodeStateProvider.java     |   2 +-
 .../solr/client/solrj/HttpSolrClient.java     |  31 --
 .../apache/solr/client/solrj/SolrRequest.java |   4 +-
 .../solrj/impl/CloudHttp2SolrClient.java      |   8 +-
 .../client/solrj/impl/CloudSolrClient.java    |  26 +-
 .../impl/ConcurrentUpdateBaseSolrClient.java  |  10 +-
 .../solrj/impl/HttpClusterStateProvider.java  |   4 +-
 .../client/solrj/impl/HttpJdkSolrClient.java  |   7 +-
 ...olrClientBase.java => HttpSolrClient.java} | 291 +++++++++++++++++-
 .../solrj/impl/HttpSolrClientBuilderBase.java | 281 -----------------
 .../client/solrj/impl/LBAsyncSolrClient.java  |   4 +-
 .../solr/client/solrj/impl/LBSolrClient.java  |   6 +-
 .../ConcurrentUpdateJettySolrClient.java      |   6 +-
 .../solrj/jetty/HttpJettySolrClient.java      |  21 +-
 .../solrj/impl/ClusterStateProviderTest.java  |   7 +-
 .../solrj/impl/HttpJdkSolrClientTest.java     |   4 +-
 .../impl/HttpSolrClientBadInputTest.java      |   1 -
 .../solrj/impl/HttpSolrClientTestBase.java    |  44 +--
 .../jetty/HttpJettySolrClientProxyTest.java   |   4 +-
 .../solrj/jetty/HttpJettySolrClientTest.java  |   6 +-
 23 files changed, 363 insertions(+), 424 deletions(-)
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/HttpSolrClient.java
 rename solr/solrj/src/java/org/apache/solr/client/solrj/impl/{HttpSolrClientBase.java => HttpSolrClient.java} (58%)
 delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderBase.java

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4a0531410bcd..be0189934373 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -182,7 +182,6 @@ openjdk-jmh = "1.37"
 opentelemetry = "1.56.0"
 opentelemetry-prometheus = "1.56.0-alpha"
 opentelemetry-runtime-telemetry = "2.22.0-alpha"
-osgi-annotation = "8.1.0"
 oshai-logging = "7.0.13"
 # @keep for version alignment
 ow2-asm = "9.8"
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 01e40d9f0fba..6876c6ff923f 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -69,7 +69,7 @@
 import org.apache.solr.api.ContainerPluginsRegistry;
 import org.apache.solr.api.JerseyResource;
 import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.impl.HttpSolrClientBase;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.io.SolrClientCache;
 import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.util.SolrIdentifierValidator;
@@ -705,7 +705,7 @@ public FileStore getFileStore() {
    *
    * @see #getDefaultHttpSolrClient()
    * @see ZkController#getSolrClient()
-   * @see HttpSolrClientBase#requestWithBaseUrl(String, SolrRequest, String)
+   * @see HttpSolrClient#requestWithBaseUrl(String, SolrRequest, String)
    * @deprecated likely to simply be moved to the ObjectCache so as to not be used
    */
   @Deprecated
@@ -2440,7 +2440,7 @@ public PlacementPluginFactory<? extends PlacementPluginConfig> getPlacementPlugi
    * <p>The caller does not need to close the client.
    *
    * @return the existing {@link HttpJettySolrClient}
-   * @see HttpSolrClientBase#requestWithBaseUrl(String, SolrRequest, String)
+   * @see HttpSolrClient#requestWithBaseUrl(String, SolrRequest, String)
    */
   public HttpJettySolrClient getDefaultHttpSolrClient() {
     return solrClientProvider.getSolrClient();
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
index 3f5013fe664c..b06c022b6a0b 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
@@ -27,8 +27,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.client.solrj.impl.HttpSolrClientBase;
-import org.apache.solr.client.solrj.impl.HttpSolrClientBuilderBase;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.common.AlreadyClosedException;
@@ -50,7 +49,7 @@ public class SolrClientCache implements Closeable {
   protected String basicAuthCredentials = null; // Only support with the httpJettySolrClient
 
   private final Map<String, SolrClient> solrClients = new HashMap<>();
-  private final HttpSolrClientBase httpSolrClient;
+  private final HttpSolrClient httpSolrClient;
   private final AtomicBoolean isClosed = new AtomicBoolean(false);
   private final AtomicReference<String> defaultZkHost = new AtomicReference<>();
 
@@ -58,7 +57,7 @@ public SolrClientCache() {
     this.httpSolrClient = null;
   }
 
-  public SolrClientCache(HttpSolrClientBase httpSolrClient) {
+  public SolrClientCache(HttpSolrClient httpSolrClient) {
     this.httpSolrClient = httpSolrClient;
   }
 
@@ -97,7 +96,7 @@ public synchronized CloudSolrClient getCloudSolrClient(String zkHost) {
   }
 
   protected CloudSolrClient newCloudSolrClient(
-      String zkHost, HttpSolrClientBase httpSolrClient, boolean canUseACLs) {
+      String zkHost, HttpSolrClient httpSolrClient, boolean canUseACLs) {
     final List<String> hosts = List.of(zkHost);
     var builder = new CloudSolrClient.Builder(hosts, Optional.empty());
     builder.canUseZkACLs(canUseACLs);
@@ -132,8 +131,8 @@ public synchronized SolrClient getHttpSolrClient(String baseUrl) {
     return client;
   }
 
-  protected HttpSolrClientBuilderBase<?, ?> newHttpSolrClientBuilder(
-      String url, HttpSolrClientBase httpSolrClient) {
+  protected HttpSolrClient.BuilderBase<?, ?> newHttpSolrClientBuilder(
+      String url, HttpSolrClient httpSolrClient) {
     final var builder =
         (url == null || URLUtil.isBaseUrl(url)) // URL may be null here and set by caller
             ? new HttpJettySolrClient.Builder(url)
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
index cc8365067ae4..0854530f1d40 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
@@ -264,7 +264,7 @@ public RemoteCallCtx(String node, CloudHttp2SolrClient cloudSolrClient) {
           (ZkClientClusterStateProvider) cloudSolrClient.getClusterStateProvider();
     }
 
-    protected HttpSolrClientBase httpSolrClient() {
+    protected HttpSolrClient httpSolrClient() {
       return cloudSolrClient.getHttpClient();
     }
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/HttpSolrClient.java
deleted file mode 100644
index 4bb0b409fb72..000000000000
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/HttpSolrClient.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj;
-
-/** A {@link SolrClient} based on HTTP. */
-public abstract class HttpSolrClient extends SolrClient {
-  protected final String baseUrl;
-
-  protected HttpSolrClient(String baseUrl) {
-    this.baseUrl = baseUrl;
-  }
-
-  /** Typically looks like {@code http://localhost:8983/solr} (no core or collection) */
-  public String getBaseURL() {
-    return baseUrl;
-  }
-}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java
index af83beb70fde..e43134fc89c9 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java
@@ -27,7 +27,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.client.solrj.impl.HttpSolrClientBase;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.RequestWriter;
 import org.apache.solr.client.solrj.response.ResponseParser;
 import org.apache.solr.client.solrj.response.StreamingResponseCallback;
@@ -305,7 +305,7 @@ public final T process(SolrClient client, String collection)
    * @throws IOException if there is a communication error
    * @lucene.experimental
    */
-  public final T processWithBaseUrl(HttpSolrClientBase client, String baseUrl, String collection)
+  public final T processWithBaseUrl(HttpSolrClient client, String baseUrl, String collection)
       throws SolrServerException, IOException {
     // duplicative with process(), except for requestWithBaseUrl
     long startNanos = System.nanoTime();
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java
index 72cfd2d042e1..0118b6804280 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java
@@ -21,8 +21,8 @@
 import org.apache.solr.common.util.IOUtils;
 
 /**
- * This {@link CloudSolrClient} is a base implementation using a {@link HttpSolrClientBase}. The '2'
- * in the name has no differentiating significance anymore.
+ * This {@link CloudSolrClient} is a base implementation using a {@link HttpSolrClient}. The '2' in
+ * the name has no differentiating significance anymore.
  *
  * @since solr 8.0
  * @lucene.internal
@@ -32,7 +32,7 @@ public class CloudHttp2SolrClient extends CloudSolrClient {
 
   private final ClusterStateProvider stateProvider;
   private final LBSolrClient lbClient;
-  private final HttpSolrClientBase myClient;
+  private final HttpSolrClient myClient;
   private final boolean clientIsInternal;
 
   /**
@@ -102,7 +102,7 @@ public ClusterStateProvider getClusterStateProvider() {
     return stateProvider;
   }
 
-  public HttpSolrClientBase getHttpClient() {
+  public HttpSolrClient getHttpClient() {
     return myClient;
   }
 }
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 c9199fdafff2..6278bdede639 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
@@ -142,15 +142,15 @@ public static class Builder {
 
     // If the Jetty-based HttpJettySolrClient builder is on the classpath, this will be its no-arg
     // constructor; otherwise it will be null and we will fall back to the JDK HTTP client.
-    private static final Constructor<? extends HttpSolrClientBuilderBase<?, ?>>
+    private static final Constructor<? extends HttpSolrClient.BuilderBase<?, ?>>
         HTTP_JETTY_SOLR_CLIENT_BUILDER_CTOR;
 
     static {
-      Constructor<? extends HttpSolrClientBuilderBase<?, ?>> ctor = null;
+      Constructor<? extends HttpSolrClient.BuilderBase<?, ?>> ctor = null;
       try {
         @SuppressWarnings("unchecked")
-        Class<? extends HttpSolrClientBuilderBase<?, ?>> builderClass =
-            (Class<? extends HttpSolrClientBuilderBase<?, ?>>)
+        Class<? extends HttpSolrClient.BuilderBase<?, ?>> builderClass =
+            (Class<? extends HttpSolrClient.BuilderBase<?, ?>>)
                 Class.forName("org.apache.solr.client.solrj.jetty.HttpJettySolrClient$Builder");
         ctor = builderClass.getDeclaredConstructor();
         ctor.newInstance(); // perhaps fails because Jetty libs aren't on the classpath
@@ -168,12 +168,12 @@ public static class Builder {
     protected Collection<String> zkHosts = new ArrayList<>();
     protected List<String> solrUrls = new ArrayList<>();
     protected String zkChroot;
-    protected HttpSolrClientBase httpClient;
+    protected HttpSolrClient httpClient;
     protected boolean shardLeadersOnly = true;
     protected boolean directUpdatesToLeadersOnly = false;
     protected boolean parallelUpdates = true;
     protected ClusterStateProvider stateProvider;
-    protected HttpSolrClientBuilderBase<?, ?> internalClientBuilder;
+    protected HttpSolrClient.BuilderBase<?, ?> internalClientBuilder;
     protected RequestWriter requestWriter;
     protected ResponseParser responseParser;
     protected long retryExpiryTimeNano =
@@ -371,7 +371,7 @@ public Builder withCollectionCacheTtl(long timeToLive, TimeUnit unit) {
      *
      * @return this
      */
-    public Builder withHttpClient(HttpSolrClientBase httpSolrClient) {
+    public Builder withHttpClient(HttpSolrClient httpSolrClient) {
       if (this.internalClientBuilder != null) {
         throw new IllegalStateException(
             "The builder can't accept an httpClient AND an internalClientBuilder, only one of those can be provided");
@@ -388,7 +388,7 @@ public Builder withHttpClient(HttpSolrClientBase httpSolrClient) {
      * @param internalClientBuilder the builder to use for creating the internal http client.
      * @return this
      */
-    public Builder withHttpClientBuilder(HttpSolrClientBuilderBase<?, ?> internalClientBuilder) {
+    public Builder withHttpClientBuilder(HttpSolrClient.BuilderBase<?, ?> internalClientBuilder) {
       if (this.httpClient != null) {
         throw new IllegalStateException(
             "The builder can't accept an httpClient AND an internalClientBuilder, only one of those can be provided");
@@ -399,7 +399,7 @@ public Builder withHttpClientBuilder(HttpSolrClientBuilderBase<?, ?> internalCli
 
     @Deprecated(since = "9.10")
     public Builder withInternalClientBuilder(
-        HttpSolrClientBuilderBase<?, ?> internalClientBuilder) {
+        HttpSolrClient.BuilderBase<?, ?> internalClientBuilder) {
       return withHttpClientBuilder(internalClientBuilder);
     }
 
@@ -443,14 +443,14 @@ public CloudHttp2SolrClient build() {
       return new CloudHttp2SolrClient(this);
     }
 
-    protected HttpSolrClientBase createOrGetHttpClient() {
+    protected HttpSolrClient createOrGetHttpClient() {
       if (httpClient != null) {
         return httpClient;
       } else if (internalClientBuilder != null) {
         return internalClientBuilder.build();
       }
 
-      HttpSolrClientBuilderBase<?, ?> builder;
+      HttpSolrClient.BuilderBase<?, ?> builder;
       if (HTTP_JETTY_SOLR_CLIENT_BUILDER_CTOR != null) {
         try {
           log.debug("Using HttpJettySolrClient as the delegate http client");
@@ -467,7 +467,7 @@ protected HttpSolrClientBase createOrGetHttpClient() {
       return builder.build();
     }
 
-    protected LBSolrClient createOrGetLbClient(HttpSolrClientBase myClient) {
+    protected LBSolrClient createOrGetLbClient(HttpSolrClient myClient) {
       return myClient.createLBSolrClient();
     }
 
@@ -481,7 +481,7 @@ protected ClusterStateProvider createZkClusterStateProvider() {
       return stateProvider;
     }
 
-    protected ClusterStateProvider createHttpClusterStateProvider(HttpSolrClientBase httpClient) {
+    protected ClusterStateProvider createHttpClusterStateProvider(HttpSolrClient httpClient) {
       try {
         return new HttpClusterStateProvider<>(solrUrls, httpClient);
       } catch (Exception e) {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateBaseSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateBaseSolrClient.java
index 16bac6648919..15d1cba6e440 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateBaseSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateBaseSolrClient.java
@@ -56,7 +56,7 @@ public abstract class ConcurrentUpdateBaseSolrClient extends SolrClient {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static final Update END_UPDATE = new Update(null, null);
 
-  private HttpSolrClientBase client;
+  private HttpSolrClient client;
   protected final String basePath;
   protected final CustomBlockingQueue<Update> queue;
   private final ExecutorService scheduler;
@@ -619,7 +619,7 @@ public void shutdownNow() {
   /** Constructs {@link ConcurrentUpdateBaseSolrClient} instances from provided configuration. */
   public abstract static class Builder {
     protected long idleTimeoutMillis;
-    protected HttpSolrClientBase client;
+    protected HttpSolrClient client;
     protected String baseSolrUrl;
     protected String defaultCollection;
     protected int queueSize = 10;
@@ -647,7 +647,7 @@ public abstract static class Builder {
      *     internally. Callers are responsible for closing the provided client (after closing any
      *     clients created by this builder)
      */
-    public Builder(String baseSolrUrl, HttpSolrClientBase client) {
+    public Builder(String baseSolrUrl, HttpSolrClient client) {
       this(baseSolrUrl, client, false);
     }
 
@@ -671,7 +671,7 @@ public Builder(String baseSolrUrl, HttpSolrClientBase client) {
      *     ConcurrentUpdateBaseSolrClient should assume responsibility for closing the provided
      *     'client'
      */
-    public Builder(String baseSolrUrl, HttpSolrClientBase client, boolean closeHttpClient) {
+    public Builder(String baseSolrUrl, HttpSolrClient client, boolean closeHttpClient) {
       this.baseSolrUrl = baseSolrUrl;
       this.client = client;
       this.closeHttpClient = closeHttpClient;
@@ -769,7 +769,7 @@ public Builder setPollQueueTime(long pollQueueTime, TimeUnit unit) {
      */
     public abstract ConcurrentUpdateBaseSolrClient build();
 
-    public HttpSolrClientBase getClient() {
+    public HttpSolrClient getClient() {
       return client;
     }
   }
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java
index 17b41e951a09..595a58ac7a44 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java
@@ -21,7 +21,7 @@
 import java.util.List;
 
 /** A CSP that uses Solr HTTP APIs. */
-public class HttpClusterStateProvider<C extends HttpSolrClientBase>
+public class HttpClusterStateProvider<C extends HttpSolrClient>
     extends BaseHttpClusterStateProvider {
   // formerly known as Http2ClusterStateProvider
 
@@ -32,7 +32,7 @@ public class HttpClusterStateProvider<C extends HttpSolrClientBase>
    * caller's responsibility to close the client.
    *
    * @param solrUrls root path solr urls
-   * @param httpClient an instance of HttpSolrClientBase
+   * @param httpClient an instance of HttpSolrClient
    * @throws Exception if a problem with initialization occurs
    */
   public HttpClusterStateProvider(List<String> solrUrls, C httpClient) throws Exception {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java
index 2fa11c81b7ee..fa877f6de9ab 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java
@@ -71,7 +71,7 @@
  * This client will connect to solr using Http/2 but can seamlessly downgrade to Http/1.1 when
  * connecting to Solr hosts running on older versions.
  */
-public class HttpJdkSolrClient extends HttpSolrClientBase {
+public class HttpJdkSolrClient extends HttpSolrClient {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private static final String USER_AGENT =
@@ -551,7 +551,7 @@ protected String allProcessorSupportedContentTypesCommaDelimited(
   }
 
   @Override
-  public HttpSolrClientBuilderBase<?, ?> builder() {
+  public BuilderBase<?, ?> builder() {
     return new HttpJdkSolrClient.Builder().withHttpClient(this);
   }
 
@@ -560,8 +560,7 @@ protected LBSolrClient createLBSolrClient() {
     return new LBSolrClient.Builder<>(this).build();
   }
 
-  public static class Builder
-      extends HttpSolrClientBuilderBase<HttpJdkSolrClient.Builder, HttpJdkSolrClient> {
+  public static class Builder extends BuilderBase<Builder, HttpJdkSolrClient> {
 
     private SSLContext sslContext;
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
similarity index 58%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
rename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
index 96d4cc114865..43453823b2f4 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
@@ -23,16 +23,16 @@
 import java.net.MalformedURLException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collection;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
-import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.RemoteSolrException;
+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.request.JavaBinRequestWriter;
@@ -48,16 +48,16 @@
 import org.apache.solr.common.util.NamedList;
 
 /**
- * Utility/base functionality for direct HTTP client implementations.
+ * A simple/direct {@link SolrClient} using HTTP.
  *
- * @lucene.internal
+ * @see org.apache.solr.client.solrj.jetty.HttpJettySolrClient
+ * @see org.apache.solr.client.solrj.impl.HttpJdkSolrClient
  */
-public abstract class HttpSolrClientBase extends HttpSolrClient {
-
-  protected static final String DEFAULT_PATH = ClientUtils.DEFAULT_PATH;
+public abstract class HttpSolrClient extends SolrClient {
   protected static final Charset FALLBACK_CHARSET = StandardCharsets.UTF_8;
-  private static final List<String> errPath = Arrays.asList("metadata", "error-class");
 
+  protected final String baseUrl;
+  protected final String defaultCollection;
   protected final long requestTimeoutMillis;
 
   protected final Set<String> urlParamNames;
@@ -71,8 +71,8 @@ public abstract class HttpSolrClientBase extends HttpSolrClient {
 
   protected final String basicAuthAuthorizationStr;
 
-  protected HttpSolrClientBase(String serverBaseUrl, HttpSolrClientBuilderBase<?, ?> builder) {
-    super(extractBaseUrl(serverBaseUrl));
+  protected HttpSolrClient(String serverBaseUrl, BuilderBase<?, ?> builder) {
+    this.baseUrl = extractBaseUrl(serverBaseUrl);
     this.requestTimeoutMillis = builder.getRequestTimeoutMillis();
     this.basicAuthAuthorizationStr = builder.basicAuthAuthorizationStr;
     if (builder.requestWriter != null) {
@@ -103,7 +103,15 @@ private static String extractBaseUrl(String serverBaseUrl) {
     return serverBaseUrl;
   }
 
-  public abstract HttpSolrClientBuilderBase<?, ?> builder();
+  /** Typically looks like {@code http://localhost:8983/solr} (no core or collection) */
+  public String getBaseURL() {
+    return baseUrl;
+  }
+
+  /**
+   * @lucene.internal
+   */
+  public abstract BuilderBase<?, ?> builder();
 
   /**
    * @lucene.internal
@@ -327,7 +335,7 @@ protected void setParser(ResponseParser parser) {
    * @param collection an optional collection or core name used to override the client's "default
    *     collection". May be 'null' for any requests that don't require a collection or wish to rely
    *     on the client's default
-   * @see SolrRequest#processWithBaseUrl(HttpSolrClientBase, String, String)
+   * @see SolrRequest#processWithBaseUrl(HttpSolrClient, String, String)
    */
   public abstract NamedList<Object> requestWithBaseUrl(
       String baseUrl, SolrRequest<?> solrRequest, String collection)
@@ -359,7 +367,7 @@ public CompletableFuture<NamedList<Object>> requestAsync(final SolrRequest<?> re
     return requestAsync(request, null);
   }
 
-  public boolean isV2ApiRequest(final SolrRequest<?> request) {
+  protected boolean isV2ApiRequest(final SolrRequest<?> request) {
     return request.getApiVersion() == SolrRequest.ApiVersion.V2;
   }
 
@@ -370,4 +378,259 @@ public ResponseParser getParser() {
   public Set<String> getUrlParamNames() {
     return urlParamNames;
   }
+
+  public abstract static class BuilderBase<B extends BuilderBase<?, ?>, C extends HttpSolrClient> {
+
+    protected Long idleTimeoutMillis;
+    protected Long connectionTimeoutMillis;
+    protected Long requestTimeoutMillis;
+    protected String basicAuthAuthorizationStr;
+    protected Boolean followRedirects;
+    protected String baseSolrUrl;
+    protected RequestWriter requestWriter;
+    protected ResponseParser responseParser;
+    protected String defaultCollection;
+    protected Set<String> urlParamNames;
+    protected Integer maxConnectionsPerHost;
+    protected ExecutorService executor;
+    protected final boolean defaultUseHttp1_1 = Boolean.getBoolean("solr.http1");
+    protected Boolean useHttp1_1;
+    protected String proxyHost;
+    protected int proxyPort;
+    protected boolean proxyIsSocks4;
+    protected boolean proxyIsSecure;
+
+    public abstract C build();
+
+    /**
+     * Provide a seed HttpSolrClient for the builder values, values can still be overridden by using
+     * builder methods
+     */
+    @SuppressWarnings("unchecked")
+    public B withHttpClient(C httpSolrClient) {
+      if (this.basicAuthAuthorizationStr == null) {
+        this.basicAuthAuthorizationStr = httpSolrClient.basicAuthAuthorizationStr;
+      }
+      if (this.requestTimeoutMillis == null) {
+        this.requestTimeoutMillis = httpSolrClient.requestTimeoutMillis;
+      }
+      if (this.requestWriter == null) {
+        this.requestWriter = httpSolrClient.requestWriter;
+      }
+      if (this.responseParser == null) {
+        this.responseParser = httpSolrClient.parser;
+      }
+      if (this.urlParamNames == null) {
+        this.urlParamNames = httpSolrClient.urlParamNames;
+      }
+      return (B) (this);
+    }
+
+    /** Provides the Base Solr Url. */
+    @SuppressWarnings("unchecked")
+    public B withBaseSolrUrl(String baseSolrUrl) {
+      this.baseSolrUrl = baseSolrUrl;
+      return (B) this;
+    }
+
+    /** Provides a {@link RequestWriter} for created clients to use when handing requests. */
+    @SuppressWarnings("unchecked")
+    public B withRequestWriter(RequestWriter requestWriter) {
+      this.requestWriter = requestWriter;
+      return (B) this;
+    }
+
+    /** Provides a {@link ResponseParser} for created clients to use when handling requests. */
+    @SuppressWarnings("unchecked")
+    public B withResponseParser(ResponseParser responseParser) {
+      this.responseParser = responseParser;
+      return (B) this;
+    }
+
+    /** Sets a default for core or collection based requests. */
+    @SuppressWarnings("unchecked")
+    public B withDefaultCollection(String defaultCoreOrCollection) {
+      this.defaultCollection = defaultCoreOrCollection;
+      return (B) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public B withFollowRedirects(boolean followRedirects) {
+      this.followRedirects = followRedirects;
+      return (B) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public B withExecutor(ExecutorService executor) {
+      this.executor = executor;
+      return (B) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public B withBasicAuthCredentials(String user, String pass) {
+      if (user != null || pass != null) {
+        if (user == null || pass == null) {
+          throw new IllegalStateException(
+              "Invalid Authentication credentials. Either both username and password or none must be provided");
+        }
+      }
+      this.basicAuthAuthorizationStr = basicAuthCredentialsToAuthorizationString(user, pass);
+      return (B) this;
+    }
+
+    /**
+     * Expert Method
+     *
+     * @param urlParamNames set of param keys that are only sent via the query string. Note that the
+     *     param will be sent as a query string if the key is part of this Set or the SolrRequest's
+     *     query params.
+     * @see SolrRequest#getQueryParams
+     */
+    @SuppressWarnings("unchecked")
+    public B withTheseParamNamesInTheUrl(Set<String> urlParamNames) {
+      this.urlParamNames = urlParamNames;
+      return (B) this;
+    }
+
+    /**
+     * Set maxConnectionsPerHost for http1 connections, maximum number http2 connections is limited
+     * to 4
+     */
+    @SuppressWarnings("unchecked")
+    public B withMaxConnectionsPerHost(int max) {
+      this.maxConnectionsPerHost = max;
+      return (B) this;
+    }
+
+    /**
+     * The max time a connection can be idle (that is, without traffic of bytes in either
+     * direction). Sometimes called a "socket timeout". Note: not applicable to the JDK HttpClient.
+     */
+    @SuppressWarnings("unchecked")
+    public B withIdleTimeout(long idleConnectionTimeout, TimeUnit unit) {
+      this.idleTimeoutMillis = TimeUnit.MILLISECONDS.convert(idleConnectionTimeout, unit);
+      return (B) this;
+    }
+
+    public long getIdleTimeoutMillis() {
+      return idleTimeoutMillis != null && idleTimeoutMillis > 0
+          ? idleTimeoutMillis
+          : SolrHttpConstants.DEFAULT_SO_TIMEOUT;
+    }
+
+    /** The max time a connection can take to connect to destinations. */
+    @SuppressWarnings("unchecked")
+    public B withConnectionTimeout(long connectionTimeout, TimeUnit unit) {
+      this.connectionTimeoutMillis = TimeUnit.MILLISECONDS.convert(connectionTimeout, unit);
+      return (B) this;
+    }
+
+    public long getConnectionTimeoutMillis() {
+      return connectionTimeoutMillis != null && connectionTimeoutMillis > 0
+          ? connectionTimeoutMillis
+          : SolrHttpConstants.DEFAULT_CONNECT_TIMEOUT;
+    }
+
+    /** Set a timeout for requests to receive a response. */
+    @SuppressWarnings("unchecked")
+    public B withRequestTimeout(long requestTimeout, TimeUnit unit) {
+      this.requestTimeoutMillis = TimeUnit.MILLISECONDS.convert(requestTimeout, unit);
+      return (B) this;
+    }
+
+    public long getRequestTimeoutMillis() {
+      return requestTimeoutMillis != null && requestTimeoutMillis > 0
+          ? requestTimeoutMillis
+          : getIdleTimeoutMillis();
+    }
+
+    /**
+     * If true, prefer http1.1 over http2. If not set, the default is determined by system property
+     * 'solr.http1'. Otherwise, false.
+     *
+     * @param useHttp1_1 prefer http1.1?
+     * @return this Builder
+     */
+    @SuppressWarnings("unchecked")
+    public B useHttp1_1(boolean useHttp1_1) {
+      this.useHttp1_1 = useHttp1_1;
+      return (B) this;
+    }
+
+    /**
+     * Return whether the HttpSolrClient built will prefer http1.1 over http2.
+     *
+     * @return whether to prefer http1.1
+     */
+    public boolean shouldUseHttp1_1() {
+      return useHttp1_1 != null ? useHttp1_1 : defaultUseHttp1_1;
+    }
+
+    /**
+     * Setup a proxy
+     *
+     * @param host The proxy host
+     * @param port The proxy port
+     * @param isSocks4 If true creates an SOCKS 4 proxy, otherwise creates an HTTP proxy
+     * @param isSecure If true enables the secure flag on the proxy
+     * @return this Builder
+     */
+    @SuppressWarnings("unchecked")
+    public B withProxyConfiguration(String host, int port, boolean isSocks4, boolean isSecure) {
+      this.proxyHost = host;
+      this.proxyPort = port;
+      this.proxyIsSocks4 = isSocks4;
+      this.proxyIsSecure = isSecure;
+      return (B) this;
+    }
+
+    /**
+     * Setup basic authentication from a string formatted as username:password. If the string is
+     * Null then it doesn't do anything.
+     *
+     * @param credentials The username and password formatted as username:password
+     * @return this Builder
+     */
+    @SuppressWarnings("unchecked")
+    public B withOptionalBasicAuthCredentials(String credentials) {
+      if (credentials != null) {
+        if (credentials.indexOf(':') == -1) {
+          throw new IllegalStateException(
+              "Invalid Authentication credential formatting. Provide username and password in the 'username:password' format.");
+        }
+        String username = credentials.substring(0, credentials.indexOf(':'));
+        String password = credentials.substring(credentials.indexOf(':') + 1, credentials.length());
+        withBasicAuthCredentials(username, password);
+      }
+      return (B) this;
+    }
+
+    public Integer getMaxConnectionsPerHost() {
+      return maxConnectionsPerHost;
+    }
+
+    public Boolean getFollowRedirects() {
+      return followRedirects;
+    }
+
+    public String getProxyHost() {
+      return proxyHost;
+    }
+
+    public int getProxyPort() {
+      return proxyPort;
+    }
+
+    public boolean isProxyIsSocks4() {
+      return proxyIsSocks4;
+    }
+
+    public boolean isProxyIsSecure() {
+      return proxyIsSecure;
+    }
+
+    public ExecutorService getExecutor() {
+      return executor;
+    }
+  }
 }
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderBase.java
deleted file mode 100644
index 50ab6f883d9b..000000000000
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderBase.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.solr.client.solrj.impl;
-
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import org.apache.solr.client.solrj.request.RequestWriter;
-import org.apache.solr.client.solrj.response.ResponseParser;
-
-public abstract class HttpSolrClientBuilderBase<
-    B extends HttpSolrClientBuilderBase<?, ?>, C extends HttpSolrClientBase> {
-
-  protected Long idleTimeoutMillis;
-  protected Long connectionTimeoutMillis;
-  protected Long requestTimeoutMillis;
-  protected String basicAuthAuthorizationStr;
-  protected Boolean followRedirects;
-  protected String baseSolrUrl;
-  protected RequestWriter requestWriter;
-  protected ResponseParser responseParser;
-  protected String defaultCollection;
-  protected Set<String> urlParamNames;
-  protected Integer maxConnectionsPerHost;
-  protected ExecutorService executor;
-  protected final boolean defaultUseHttp1_1 = Boolean.getBoolean("solr.http1");
-  protected Boolean useHttp1_1;
-  protected String proxyHost;
-  protected int proxyPort;
-  protected boolean proxyIsSocks4;
-  protected boolean proxyIsSecure;
-
-  public abstract C build();
-
-  /**
-   * Provide a seed HttpSolrClient for the builder values, values can still be overridden by using
-   * builder methods
-   */
-  @SuppressWarnings("unchecked")
-  public B withHttpClient(C httpSolrClient) {
-    if (this.basicAuthAuthorizationStr == null) {
-      this.basicAuthAuthorizationStr = httpSolrClient.basicAuthAuthorizationStr;
-    }
-    if (this.requestTimeoutMillis == null) {
-      this.requestTimeoutMillis = httpSolrClient.requestTimeoutMillis;
-    }
-    if (this.requestWriter == null) {
-      this.requestWriter = httpSolrClient.requestWriter;
-    }
-    if (this.responseParser == null) {
-      this.responseParser = httpSolrClient.parser;
-    }
-    if (this.urlParamNames == null) {
-      this.urlParamNames = httpSolrClient.urlParamNames;
-    }
-    return (B) (this);
-  }
-
-  /** Provides the Base Solr Url. */
-  @SuppressWarnings("unchecked")
-  public B withBaseSolrUrl(String baseSolrUrl) {
-    this.baseSolrUrl = baseSolrUrl;
-    return (B) this;
-  }
-
-  /** Provides a {@link RequestWriter} for created clients to use when handing requests. */
-  @SuppressWarnings("unchecked")
-  public B withRequestWriter(RequestWriter requestWriter) {
-    this.requestWriter = requestWriter;
-    return (B) this;
-  }
-
-  /** Provides a {@link ResponseParser} for created clients to use when handling requests. */
-  @SuppressWarnings("unchecked")
-  public B withResponseParser(ResponseParser responseParser) {
-    this.responseParser = responseParser;
-    return (B) this;
-  }
-
-  /** Sets a default for core or collection based requests. */
-  @SuppressWarnings("unchecked")
-  public B withDefaultCollection(String defaultCoreOrCollection) {
-    this.defaultCollection = defaultCoreOrCollection;
-    return (B) this;
-  }
-
-  @SuppressWarnings("unchecked")
-  public B withFollowRedirects(boolean followRedirects) {
-    this.followRedirects = followRedirects;
-    return (B) this;
-  }
-
-  @SuppressWarnings("unchecked")
-  public B withExecutor(ExecutorService executor) {
-    this.executor = executor;
-    return (B) this;
-  }
-
-  @SuppressWarnings("unchecked")
-  public B withBasicAuthCredentials(String user, String pass) {
-    if (user != null || pass != null) {
-      if (user == null || pass == null) {
-        throw new IllegalStateException(
-            "Invalid Authentication credentials. Either both username and password or none must be provided");
-      }
-    }
-    this.basicAuthAuthorizationStr =
-        HttpSolrClientBase.basicAuthCredentialsToAuthorizationString(user, pass);
-    return (B) this;
-  }
-
-  /**
-   * Expert Method
-   *
-   * @param urlParamNames set of param keys that are only sent via the query string. Note that the
-   *     param will be sent as a query string if the key is part of this Set or the SolrRequest's
-   *     query params.
-   * @see org.apache.solr.client.solrj.SolrRequest#getQueryParams
-   */
-  @SuppressWarnings("unchecked")
-  public B withTheseParamNamesInTheUrl(Set<String> urlParamNames) {
-    this.urlParamNames = urlParamNames;
-    return (B) this;
-  }
-
-  /**
-   * Set maxConnectionsPerHost for http1 connections, maximum number http2 connections is limited to
-   * 4
-   */
-  @SuppressWarnings("unchecked")
-  public B withMaxConnectionsPerHost(int max) {
-    this.maxConnectionsPerHost = max;
-    return (B) this;
-  }
-
-  /**
-   * The max time a connection can be idle (that is, without traffic of bytes in either direction).
-   * Sometimes called a "socket timeout". Note: not applicable to the JDK HttpClient.
-   */
-  @SuppressWarnings("unchecked")
-  public B withIdleTimeout(long idleConnectionTimeout, TimeUnit unit) {
-    this.idleTimeoutMillis = TimeUnit.MILLISECONDS.convert(idleConnectionTimeout, unit);
-    return (B) this;
-  }
-
-  public long getIdleTimeoutMillis() {
-    return idleTimeoutMillis != null && idleTimeoutMillis > 0
-        ? idleTimeoutMillis
-        : SolrHttpConstants.DEFAULT_SO_TIMEOUT;
-  }
-
-  /** The max time a connection can take to connect to destinations. */
-  @SuppressWarnings("unchecked")
-  public B withConnectionTimeout(long connectionTimeout, TimeUnit unit) {
-    this.connectionTimeoutMillis = TimeUnit.MILLISECONDS.convert(connectionTimeout, unit);
-    return (B) this;
-  }
-
-  public long getConnectionTimeoutMillis() {
-    return connectionTimeoutMillis != null && connectionTimeoutMillis > 0
-        ? connectionTimeoutMillis
-        : SolrHttpConstants.DEFAULT_CONNECT_TIMEOUT;
-  }
-
-  /** Set a timeout for requests to receive a response. */
-  @SuppressWarnings("unchecked")
-  public B withRequestTimeout(long requestTimeout, TimeUnit unit) {
-    this.requestTimeoutMillis = TimeUnit.MILLISECONDS.convert(requestTimeout, unit);
-    return (B) this;
-  }
-
-  public long getRequestTimeoutMillis() {
-    return requestTimeoutMillis != null && requestTimeoutMillis > 0
-        ? requestTimeoutMillis
-        : getIdleTimeoutMillis();
-  }
-
-  /**
-   * If true, prefer http1.1 over http2. If not set, the default is determined by system property
-   * 'solr.http1'. Otherwise, false.
-   *
-   * @param useHttp1_1 prefer http1.1?
-   * @return this Builder
-   */
-  @SuppressWarnings("unchecked")
-  public B useHttp1_1(boolean useHttp1_1) {
-    this.useHttp1_1 = useHttp1_1;
-    return (B) this;
-  }
-
-  /**
-   * Return whether the HttpSolrClient built will prefer http1.1 over http2.
-   *
-   * @return whether to prefer http1.1
-   */
-  public boolean shouldUseHttp1_1() {
-    return useHttp1_1 != null ? useHttp1_1 : defaultUseHttp1_1;
-  }
-
-  /**
-   * Setup a proxy
-   *
-   * @param host The proxy host
-   * @param port The proxy port
-   * @param isSocks4 If true creates an SOCKS 4 proxy, otherwise creates an HTTP proxy
-   * @param isSecure If true enables the secure flag on the proxy
-   * @return this Builder
-   */
-  @SuppressWarnings("unchecked")
-  public B withProxyConfiguration(String host, int port, boolean isSocks4, boolean isSecure) {
-    this.proxyHost = host;
-    this.proxyPort = port;
-    this.proxyIsSocks4 = isSocks4;
-    this.proxyIsSecure = isSecure;
-    return (B) this;
-  }
-
-  /**
-   * Setup basic authentication from a string formatted as username:password. If the string is Null
-   * then it doesn't do anything.
-   *
-   * @param credentials The username and password formatted as username:password
-   * @return this Builder
-   */
-  @SuppressWarnings("unchecked")
-  public B withOptionalBasicAuthCredentials(String credentials) {
-    if (credentials != null) {
-      if (credentials.indexOf(':') == -1) {
-        throw new IllegalStateException(
-            "Invalid Authentication credential formatting. Provide username and password in the 'username:password' format.");
-      }
-      String username = credentials.substring(0, credentials.indexOf(':'));
-      String password = credentials.substring(credentials.indexOf(':') + 1, credentials.length());
-      withBasicAuthCredentials(username, password);
-    }
-    return (B) this;
-  }
-
-  public Integer getMaxConnectionsPerHost() {
-    return maxConnectionsPerHost;
-  }
-
-  public Boolean getFollowRedirects() {
-    return followRedirects;
-  }
-
-  public String getProxyHost() {
-    return proxyHost;
-  }
-
-  public int getProxyPort() {
-    return proxyPort;
-  }
-
-  public boolean isProxyIsSocks4() {
-    return proxyIsSocks4;
-  }
-
-  public boolean isProxyIsSecure() {
-    return proxyIsSecure;
-  }
-
-  public ExecutorService getExecutor() {
-    return executor;
-  }
-}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBAsyncSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBAsyncSolrClient.java
index c02197c2d4dd..6a6000aed6d1 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBAsyncSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBAsyncSolrClient.java
@@ -35,7 +35,7 @@
 public abstract class LBAsyncSolrClient extends LBSolrClient {
   // formerly known as LBHttp2SolrClient, using Http2SolrClient (jetty)
 
-  protected final HttpSolrClientBase solrClient;
+  protected final HttpSolrClient solrClient;
 
   protected LBAsyncSolrClient(Builder<?> builder) {
     super(builder);
@@ -43,7 +43,7 @@ protected LBAsyncSolrClient(Builder<?> builder) {
   }
 
   @Override
-  protected HttpSolrClientBase getClient(Endpoint endpoint) {
+  protected HttpSolrClient getClient(Endpoint endpoint) {
     return solrClient;
   }
 
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 fc0d06c7f291..18a3e5a1e52c 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
@@ -166,7 +166,7 @@ public abstract class LBSolrClient extends SolrClient {
     solrQuery.setDistrib(false);
   }
 
-  public static class Builder<C extends HttpSolrClientBase> {
+  public static class Builder<C extends HttpSolrClient> {
 
     private final C solrClient;
     private final Endpoint[] solrEndpoints;
@@ -615,10 +615,10 @@ private NamedList<Object> doRequest(Endpoint endpoint, SolrRequest<?> solrReques
   private NamedList<Object> doRequest(
       SolrClient solrClient, String baseUrl, String collection, SolrRequest<?> solrRequest)
       throws SolrServerException, IOException {
-    // Some implementations of LBSolrClient.getClient(...) return a HttpSolrClientBase that may not
+    // Some implementations of LBSolrClient.getClient(...) return a HttpSolrClient that may not
     // be pointed at the desired URL (or any URL for that matter).  We special-case that here to
     // ensure the appropriate URL is provided.
-    if (solrClient instanceof HttpSolrClientBase hasReqWithUrl) {
+    if (solrClient instanceof HttpSolrClient hasReqWithUrl) {
       return hasReqWithUrl.requestWithBaseUrl(baseUrl, solrRequest, collection);
     }
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClient.java
index 2ac6577d8b27..bffd4509e99d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClient.java
@@ -26,7 +26,7 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.impl.ConcurrentUpdateBaseSolrClient;
-import org.apache.solr.client.solrj.impl.HttpSolrClientBase;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.client.solrj.util.ClientUtils;
 import org.apache.solr.common.params.ModifiableSolrParams;
@@ -46,7 +46,7 @@ public class ConcurrentUpdateJettySolrClient extends ConcurrentUpdateBaseSolrCli
   public static class Builder extends ConcurrentUpdateBaseSolrClient.Builder {
     /**
      * @see org.apache.solr.client.solrj.impl.ConcurrentUpdateBaseSolrClient.Builder#Builder(String,
-     *     HttpSolrClientBase)
+     *     HttpSolrClient)
      */
     public Builder(String baseUrl, HttpJettySolrClient client) {
       this(baseUrl, client, false);
@@ -54,7 +54,7 @@ public Builder(String baseUrl, HttpJettySolrClient client) {
 
     /**
      * @see org.apache.solr.client.solrj.impl.ConcurrentUpdateBaseSolrClient.Builder#Builder(String,
-     *     HttpSolrClientBase, boolean)
+     *     HttpSolrClient, boolean)
      */
     public Builder(String baseSolrUrl, HttpJettySolrClient client, boolean closeHttpClient) {
       super(baseSolrUrl, client, closeHttpClient);
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java
index 072a2add953c..738822509642 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java
@@ -41,8 +41,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.HttpSolrClientBase;
-import org.apache.solr.client.solrj.impl.HttpSolrClientBuilderBase;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.impl.LBSolrClient;
 import org.apache.solr.client.solrj.impl.SolrClientCustomizer;
 import org.apache.solr.client.solrj.impl.SolrHttpConstants;
@@ -94,12 +93,8 @@
 /**
  * An HTTP {@link SolrClient} using Jetty {@link HttpClient}. This is Solr's most mature client for
  * direct HTTP.
- *
- * <p>Despite the name, this client supports HTTP 1.1 and 2 -- toggle with {@link
- * HttpSolrClientBuilderBase#useHttp1_1(boolean)}. In retrospect, the name should have been {@code
- * HttpJettySolrClient}.
  */
-public class HttpJettySolrClient extends HttpSolrClientBase {
+public class HttpJettySolrClient extends HttpSolrClient {
   // formerly known at Http2SolrClient
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -544,7 +539,7 @@ protected LBSolrClient createLBSolrClient() {
   }
 
   @Override
-  public HttpSolrClientBuilderBase<?, ?> builder() {
+  public BuilderBase<?, ?> builder() {
     return new HttpJettySolrClient.Builder().withHttpClient(this);
   }
 
@@ -568,7 +563,7 @@ String basicAuthAuthorizationStr() {
 
   // merely exposing for superclass's method visibility to this package
   protected static String basicAuthCredentialsToAuthorizationString(String user, String pass) {
-    return HttpSolrClientBase.basicAuthCredentialsToAuthorizationString(user, pass);
+    return HttpSolrClient.basicAuthCredentialsToAuthorizationString(user, pass);
   }
 
   private NamedList<Object> processErrorsAndResponse(
@@ -878,8 +873,7 @@ public void waitForComplete() {
     }
   }
 
-  public static class Builder
-      extends HttpSolrClientBuilderBase<HttpJettySolrClient.Builder, HttpJettySolrClient> {
+  public static class Builder extends BuilderBase<Builder, HttpJettySolrClient> {
 
     private HttpClient httpClient;
 
@@ -941,8 +935,7 @@ public HttpJettySolrClient.Builder withListenerFactories(
       return this;
     }
 
-    public HttpSolrClientBuilderBase<HttpJettySolrClient.Builder, HttpJettySolrClient>
-        withSSLConfig(SSLConfig sslConfig) {
+    public BuilderBase<Builder, HttpJettySolrClient> withSSLConfig(SSLConfig sslConfig) {
       this.sslConfig = sslConfig;
       return this;
     }
@@ -978,7 +971,7 @@ private HttpCookieStore getCookieStore() {
       return null;
     }
 
-    protected <B extends HttpSolrClientBase> B build(Class<B> type) {
+    protected <B extends HttpSolrClient> B build(Class<B> type) {
       return type.cast(build());
     }
 
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ClusterStateProviderTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ClusterStateProviderTest.java
index 80f7b5e625bf..becebbe2e161 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ClusterStateProviderTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ClusterStateProviderTest.java
@@ -102,9 +102,8 @@ public static Iterable<String[]> parameters() throws NoSuchMethodException {
         new String[] {"http2ClusterStateProvider"}, new String[] {"zkClientClusterStateProvider"});
   }
 
-  static class ClosingHttpClusterStateProvider
-      extends HttpClusterStateProvider<HttpSolrClientBase> {
-    public ClosingHttpClusterStateProvider(List<String> solrUrls, HttpSolrClientBase httpClient)
+  static class ClosingHttpClusterStateProvider extends HttpClusterStateProvider<HttpSolrClient> {
+    public ClosingHttpClusterStateProvider(List<String> solrUrls, HttpSolrClient httpClient)
         throws Exception {
       super(solrUrls, httpClient);
     }
@@ -123,7 +122,7 @@ public void close() throws IOException {
   private static HttpClusterStateProvider<?> http2ClusterStateProvider(String userAgent) {
     try {
       var useJdkProvider = random().nextBoolean();
-      HttpSolrClientBase client;
+      HttpSolrClient client;
 
       if (userAgent != null) {
         if (useJdkProvider) {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java
index 4e2bf500e659..4497548514a5 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java
@@ -190,7 +190,7 @@ public void testGetById() throws Exception {
   public void testAsyncGet() throws Exception {
     String url = getBaseUrl() + DEBUG_SERVLET_PATH;
     ResponseParser rp = new XMLResponseParser();
-    HttpSolrClientBuilderBase<?, ?> b =
+    HttpSolrClient.BuilderBase<?, ?> b =
         builder(url, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT).withResponseParser(rp);
     super.testQueryAsync(b);
   }
@@ -552,7 +552,7 @@ protected String expectedUserAgent() {
 
   @Override
   @SuppressWarnings(value = "unchecked")
-  protected <B extends HttpSolrClientBuilderBase<?, ?>> B builder(
+  protected <B extends HttpSolrClient.BuilderBase<?, ?>> B builder(
       String url, int connectionTimeout, int socketTimeout) {
     HttpJdkSolrClient.Builder b =
         new HttpJdkSolrClient.Builder(url)
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 bdc9c5086a54..1b064ef16ae5 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
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.solr.SolrJettyTestBase;
-import org.apache.solr.client.solrj.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.embedded.JettyConfig;
 import org.junit.BeforeClass;
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 c77df8c803f1..1f565fcafe6b 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
@@ -97,7 +97,7 @@ public void tearDown() throws Exception {
     super.tearDown();
   }
 
-  protected abstract <B extends HttpSolrClientBuilderBase<?, ?>> B builder(
+  protected abstract <B extends HttpSolrClient.BuilderBase<?, ?>> B builder(
       String url, int connectionTimeout, int socketTimeout);
 
   protected abstract String expectedUserAgent();
@@ -226,7 +226,7 @@ protected void validateDelete() {
     assertEquals(expectedUserAgent(), DebugServlet.headers.get("user-agent"));
   }
 
-  public void testGetById(HttpSolrClientBase client) throws Exception {
+  public void testGetById(HttpSolrClient client) throws Exception {
     DebugServlet.clear();
     Collection<String> ids = Collections.singletonList("a");
     try {
@@ -254,7 +254,7 @@ public void testGetById(HttpSolrClientBase client) throws Exception {
    * test that SolrExceptions thrown by HttpSolrClient can correctly encapsulate http status codes
    * even when not on the list of ErrorCodes solr may return.
    */
-  public void testSolrExceptionCodeNotFromSolr(HttpSolrClientBase client)
+  public void testSolrExceptionCodeNotFromSolr(HttpSolrClient client)
       throws IOException, SolrServerException {
     final int status = 527;
     assertEquals(
@@ -278,7 +278,7 @@ protected enum WT {
     XML
   };
 
-  protected void testUpdate(HttpSolrClientBase client, WT wt, String contentType, String docIdValue)
+  protected void testUpdate(HttpSolrClient client, WT wt, String contentType, String docIdValue)
       throws Exception {
     DebugServlet.clear();
     UpdateRequest req = new UpdateRequest();
@@ -318,7 +318,7 @@ protected void testUpdate(HttpSolrClientBase client, WT wt, String contentType,
   }
 
   protected void testCollectionParameters(
-      HttpSolrClientBase baseUrlClient, HttpSolrClientBase collection1UrlClient)
+      HttpSolrClient baseUrlClient, HttpSolrClient collection1UrlClient)
       throws IOException, SolrServerException {
     try {
       SolrInputDocument doc = new SolrInputDocument();
@@ -350,7 +350,7 @@ protected void setReqParamsOf(UpdateRequest req, String... keys) {
     }
   }
 
-  protected void verifyServletState(HttpSolrClientBase client, SolrRequest<?> request)
+  protected void verifyServletState(HttpSolrClient client, SolrRequest<?> request)
       throws Exception {
     // check query String
     Iterator<String> paramNames = request.getParams().getParameterNamesIterator();
@@ -379,7 +379,7 @@ protected void testQueryString() throws Exception {
     final String clientUrl = getBaseUrl() + DEBUG_SERVLET_PATH;
     UpdateRequest req = new UpdateRequest();
 
-    try (HttpSolrClientBase client =
+    try (HttpSolrClient client =
         builder(clientUrl, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT)
             .withDefaultCollection(DEFAULT_CORE)
             .withTheseParamNamesInTheUrl(Set.of("serverOnly"))
@@ -397,7 +397,7 @@ protected void testQueryString() throws Exception {
       // test without server query params
       DebugServlet.clear();
     }
-    try (HttpSolrClientBase client =
+    try (HttpSolrClient client =
         builder(clientUrl, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT)
             .withTheseParamNamesInTheUrl(Set.of())
             .build()) {
@@ -413,7 +413,7 @@ protected void testQueryString() throws Exception {
       // test with both request and server query params
       DebugServlet.clear();
     }
-    try (HttpSolrClientBase client =
+    try (HttpSolrClient client =
         builder(clientUrl, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT)
             .withTheseParamNamesInTheUrl(Set.of("serverOnly", "both"))
             .build()) {
@@ -426,7 +426,7 @@ protected void testQueryString() throws Exception {
       }
       verifyServletState(client, req);
     }
-    try (HttpSolrClientBase client =
+    try (HttpSolrClient client =
         builder(clientUrl, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT)
             .withTheseParamNamesInTheUrl(Set.of("serverOnly", "both"))
             .build()) {
@@ -449,7 +449,7 @@ protected void testQueryString() throws Exception {
     }
   }
 
-  protected void testGetRawStream(HttpSolrClientBase client) throws Exception {
+  protected void testGetRawStream(HttpSolrClient client) throws Exception {
     DebugServlet.clear();
     final var req = new QueryRequest(params("q", "*:*"));
     req.setResponseParser(new InputStreamResponseParser("xml"));
@@ -462,7 +462,7 @@ protected void testGetRawStream(HttpSolrClientBase client) throws Exception {
     org.apache.solr.common.util.IOUtils.closeQuietly((InputStream) stream);
   }
 
-  protected void testSetCredentialsExplicitly(HttpSolrClientBase client) {
+  protected void testSetCredentialsExplicitly(HttpSolrClient client) {
     QueryRequest r = new QueryRequest(new SolrQuery("quick brown fox"));
     try {
       ignoreException("Error from server");
@@ -482,7 +482,7 @@ protected void testSetCredentialsExplicitly(HttpSolrClientBase client) {
         authorizationHeader);
   }
 
-  protected void testPerRequestCredentials(HttpSolrClientBase client) {
+  protected void testPerRequestCredentials(HttpSolrClient client) {
     QueryRequest r = new QueryRequest(new SolrQuery("quick brown fox"));
     r.setBasicAuthCredentials("foo3", "per-request");
     try {
@@ -504,7 +504,7 @@ protected void testPerRequestCredentials(HttpSolrClientBase client) {
         authorizationHeader);
   }
 
-  protected void testNoCredentials(HttpSolrClientBase client) {
+  protected void testNoCredentials(HttpSolrClient client) {
     QueryRequest r = new QueryRequest(new SolrQuery("quick brown fox"));
     try {
       ignoreException("Error from server");
@@ -518,7 +518,7 @@ protected void testNoCredentials(HttpSolrClientBase client) {
         DebugServlet.headers.containsKey("authorization"));
   }
 
-  protected void testUseOptionalCredentials(HttpSolrClientBase client) {
+  protected void testUseOptionalCredentials(HttpSolrClient client) {
     QueryRequest r = new QueryRequest(new SolrQuery("quick brown fox"));
     try {
       ignoreException("Error from server");
@@ -538,7 +538,7 @@ protected void testUseOptionalCredentials(HttpSolrClientBase client) {
         authorizationHeader);
   }
 
-  protected void testUseOptionalCredentialsWithNull(HttpSolrClientBase client) {
+  protected void testUseOptionalCredentialsWithNull(HttpSolrClient client) {
     // username foo, password with embedded colon separator is "expli:cit".
     QueryRequest r = new QueryRequest(new SolrQuery("quick brown fox"));
     try {
@@ -557,12 +557,12 @@ protected void testUseOptionalCredentialsWithNull(HttpSolrClientBase client) {
   protected void testUpdateAsync() throws Exception {
     ResponseParser rp = new XMLResponseParser();
     String url = getBaseUrl();
-    HttpSolrClientBuilderBase<?, ?> b =
+    HttpSolrClient.BuilderBase<?, ?> b =
         builder(url, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT).withResponseParser(rp);
     int limit = 10;
     CountDownLatch latch = new CountDownLatch(limit);
 
-    try (HttpSolrClientBase client = b.build()) {
+    try (HttpSolrClient client = b.build()) {
 
       // ensure the collection is empty to start
       client.deleteByQuery(COLLECTION_1, "*:*");
@@ -598,14 +598,14 @@ protected void testUpdateAsync() throws Exception {
     }
   }
 
-  protected void testQueryAsync(HttpSolrClientBuilderBase<?, ?> builder) throws Exception {
+  protected void testQueryAsync(HttpSolrClient.BuilderBase<?, ?> builder) throws Exception {
     DebugServlet.clear();
     DebugServlet.addResponseHeader("Content-Type", "application/xml; charset=UTF-8");
     int limit = 10;
 
     List<CompletableFuture<NamedList<Object>>> futures = new ArrayList<>();
 
-    try (HttpSolrClientBase client = builder.build()) {
+    try (HttpSolrClient client = builder.build()) {
       for (int i = 0; i < limit; i++) {
         DebugServlet.responseBodyByQueryFragment.put(
             ("id=KEY-" + i),
@@ -637,10 +637,10 @@ protected void testAsyncExceptionBase() throws Exception {
     DebugServlet.clear();
     DebugServlet.addResponseHeader("Content-Type", "Wrong Content Type!");
     String url = getBaseUrl() + DEBUG_SERVLET_PATH;
-    HttpSolrClientBuilderBase<?, ?> b =
+    HttpSolrClient.BuilderBase<?, ?> b =
         builder(url, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT).withResponseParser(rp);
 
-    try (HttpSolrClientBase client = b.build()) {
+    try (HttpSolrClient client = b.build()) {
       QueryRequest query = new QueryRequest(new MapSolrParams(Collections.singletonMap("id", "1")));
       CompletableFuture<NamedList<Object>> future = client.requestAsync(query, COLLECTION_1);
       ExecutionException ee = null;
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientProxyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientProxyTest.java
index ec887fe4f26e..b5ccb651918f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientProxyTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientProxyTest.java
@@ -24,7 +24,7 @@
 import java.util.stream.Collectors;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.impl.HttpJdkSolrClient;
-import org.apache.solr.client.solrj.impl.HttpSolrClientBase;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.embedded.JettyConfig;
@@ -106,7 +106,7 @@ public void testProxyWithHttpSolrClientJdkImpl() throws Exception {
   }
 
   /** Set up a simple http proxy and verify a request works */
-  public void testProxy(HttpSolrClientBase client) throws Exception {
+  public void testProxy(HttpSolrClient client) throws Exception {
     String id = "1234";
     SolrInputDocument doc = new SolrInputDocument();
     doc.addField("id", id);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientTest.java
index 4e927ac7e912..cf0cddf082a4 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientTest.java
@@ -34,7 +34,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.HttpSolrClientBuilderBase;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClientTestBase;
 import org.apache.solr.client.solrj.request.JavaBinRequestWriter;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -67,7 +67,7 @@ protected String expectedUserAgent() {
 
   @Override
   @SuppressWarnings(value = "unchecked")
-  protected <B extends HttpSolrClientBuilderBase<?, ?>> B builder(
+  protected <B extends HttpSolrClient.BuilderBase<?, ?>> B builder(
       String url, int connectionTimeout, int socketTimeout) {
     var b =
         new HttpJettySolrClient.Builder(url)
@@ -330,7 +330,7 @@ public void testUpdateJavabin() throws Exception {
   public void testAsyncGet() throws Exception {
     String url = getBaseUrl() + DEBUG_SERVLET_PATH;
     ResponseParser rp = new XMLResponseParser();
-    HttpSolrClientBuilderBase<?, ?> b =
+    HttpSolrClient.BuilderBase<?, ?> b =
         builder(url, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT).withResponseParser(rp);
     super.testQueryAsync(b);
   }

From 3705b879a30beec22ed79db468df7f4b6f5ff25c Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Sat, 27 Dec 2025 00:06:32 -0500
Subject: [PATCH 11/27] Add HttpSolrClient.builder(baseUrl) static method

---
 .../client/solrj/impl/CloudSolrClient.java    | 43 +-----------
 .../solrj/impl/HttpClusterStateProvider.java  |  2 +-
 .../client/solrj/impl/HttpJdkSolrClient.java  |  4 +-
 .../client/solrj/impl/HttpSolrClient.java     | 67 +++++++++++++++++--
 .../solrj/jetty/HttpJettySolrClient.java      |  4 +-
 5 files changed, 68 insertions(+), 52 deletions(-)

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 6278bdede639..7869b28cdfeb 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
@@ -21,7 +21,6 @@
 
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Constructor;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -138,32 +137,6 @@ public abstract class CloudSolrClient extends SolrClient {
    * based {@code HttpClient} if available, or will otherwise use the JDK.
    */
   public static class Builder {
-    private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-    // If the Jetty-based HttpJettySolrClient builder is on the classpath, this will be its no-arg
-    // constructor; otherwise it will be null and we will fall back to the JDK HTTP client.
-    private static final Constructor<? extends HttpSolrClient.BuilderBase<?, ?>>
-        HTTP_JETTY_SOLR_CLIENT_BUILDER_CTOR;
-
-    static {
-      Constructor<? extends HttpSolrClient.BuilderBase<?, ?>> ctor = null;
-      try {
-        @SuppressWarnings("unchecked")
-        Class<? extends HttpSolrClient.BuilderBase<?, ?>> builderClass =
-            (Class<? extends HttpSolrClient.BuilderBase<?, ?>>)
-                Class.forName("org.apache.solr.client.solrj.jetty.HttpJettySolrClient$Builder");
-        ctor = builderClass.getDeclaredConstructor();
-        ctor.newInstance(); // perhaps fails because Jetty libs aren't on the classpath
-      } catch (Throwable t) {
-        // Class not present or incompatible; leave ctor as null to indicate unavailability
-        if (log.isTraceEnabled()) {
-          log.trace(
-              "HttpJettySolrClient$Builder not available on classpath; will use HttpJdkSolrClient",
-              t);
-        }
-      }
-      HTTP_JETTY_SOLR_CLIENT_BUILDER_CTOR = ctor;
-    }
 
     protected Collection<String> zkHosts = new ArrayList<>();
     protected List<String> solrUrls = new ArrayList<>();
@@ -448,23 +421,9 @@ protected HttpSolrClient createOrGetHttpClient() {
         return httpClient;
       } else if (internalClientBuilder != null) {
         return internalClientBuilder.build();
-      }
-
-      HttpSolrClient.BuilderBase<?, ?> builder;
-      if (HTTP_JETTY_SOLR_CLIENT_BUILDER_CTOR != null) {
-        try {
-          log.debug("Using HttpJettySolrClient as the delegate http client");
-          builder = HTTP_JETTY_SOLR_CLIENT_BUILDER_CTOR.newInstance();
-        } catch (RuntimeException e) {
-          throw e;
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
       } else {
-        log.debug("Using HttpJdkSolrClient as the delegate http client");
-        builder = new HttpJdkSolrClient.Builder();
+        return HttpSolrClient.builder(null).build();
       }
-      return builder.build();
     }
 
     protected LBSolrClient createOrGetLbClient(HttpSolrClient myClient) {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java
index 595a58ac7a44..f6b60dc25431 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClusterStateProvider.java
@@ -51,7 +51,7 @@ public void close() throws IOException {
   @Override
   @SuppressWarnings("unchecked")
   protected C getSolrClient(String baseUrl) {
-    return (C) httpClient.builder().withBaseSolrUrl(baseUrl).build();
+    return (C) httpClient.toBuilder(baseUrl).build();
   }
 
   public C getHttpClient() {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java
index fa877f6de9ab..9b9bf42676f4 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java
@@ -551,8 +551,8 @@ protected String allProcessorSupportedContentTypesCommaDelimited(
   }
 
   @Override
-  public BuilderBase<?, ?> builder() {
-    return new HttpJdkSolrClient.Builder().withHttpClient(this);
+  protected BuilderBase<?, ?> toBuilder(String baseUrl) {
+    return new HttpJdkSolrClient.Builder(baseUrl).withHttpClient(this);
   }
 
   @Override
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
index 43453823b2f4..d44022e9b98f 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
@@ -20,6 +20,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -46,14 +48,20 @@
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.ContentStream;
 import org.apache.solr.common.util.NamedList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simple/direct {@link SolrClient} using HTTP.
  *
+ * <p>The protected methods can be considered as internal / unstable APIs.
+ *
+ * @see #builder(String)
  * @see org.apache.solr.client.solrj.jetty.HttpJettySolrClient
  * @see org.apache.solr.client.solrj.impl.HttpJdkSolrClient
  */
 public abstract class HttpSolrClient extends SolrClient {
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   protected static final Charset FALLBACK_CHARSET = StandardCharsets.UTF_8;
 
   protected final String baseUrl;
@@ -108,11 +116,6 @@ public String getBaseURL() {
     return baseUrl;
   }
 
-  /**
-   * @lucene.internal
-   */
-  public abstract BuilderBase<?, ?> builder();
-
   /**
    * @lucene.internal
    */
@@ -379,6 +382,60 @@ public Set<String> getUrlParamNames() {
     return urlParamNames;
   }
 
+  /**
+   * @lucene.internal
+   */
+  protected abstract BuilderBase<?, ?> toBuilder(String baseUrl);
+
+  // If the Jetty-based HttpJettySolrClient builder is on the classpath, this will be its no-arg
+  // constructor; otherwise it will be null and we will fall back to the JDK HTTP client.
+  private static final Constructor<? extends BuilderBase<?, ?>> HTTP_JETTY_SOLR_CLIENT_BUILDER_CTOR;
+
+  static {
+    Constructor<? extends HttpSolrClient.BuilderBase<?, ?>> ctor = null;
+    try {
+      @SuppressWarnings("unchecked")
+      Class<? extends HttpSolrClient.BuilderBase<?, ?>> builderClass =
+          (Class<? extends HttpSolrClient.BuilderBase<?, ?>>)
+              Class.forName("org.apache.solr.client.solrj.jetty.HttpJettySolrClient$Builder");
+      ctor = builderClass.getDeclaredConstructor();
+      ctor.newInstance(); // perhaps fails because Jetty libs aren't on the classpath
+    } catch (Throwable t) {
+      // Class not present or incompatible; leave ctor as null to indicate unavailability
+      if (log.isTraceEnabled()) {
+        log.trace(
+            "HttpJettySolrClient$Builder not available on classpath; will use HttpJdkSolrClient",
+            t);
+      }
+    }
+    HTTP_JETTY_SOLR_CLIENT_BUILDER_CTOR = ctor;
+  }
+
+  /**
+   * Provides a new builder of an {@link HttpSolrClient}. The implementation will try to create a
+   * {@link org.apache.solr.client.solrj.jetty.HttpJettySolrClient} if available, otherwise will
+   * fall back on {@link HttpJdkSolrClient}.
+   *
+   * @param baseUrl for {@link BuilderBase#withBaseSolrUrl(String)}.
+   */
+  public static BuilderBase<?, ?> builder(String baseUrl) {
+    HttpSolrClient.BuilderBase<?, ?> builder;
+    if (HTTP_JETTY_SOLR_CLIENT_BUILDER_CTOR != null) {
+      try {
+        log.debug("Using HttpJettySolrClient as the delegate http client");
+        builder = HTTP_JETTY_SOLR_CLIENT_BUILDER_CTOR.newInstance();
+      } catch (RuntimeException e) {
+        throw e;
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    } else {
+      log.debug("Using HttpJdkSolrClient as the delegate http client");
+      builder = new HttpJdkSolrClient.Builder();
+    }
+    return builder.withBaseSolrUrl(baseUrl);
+  }
+
   public abstract static class BuilderBase<B extends BuilderBase<?, ?>, C extends HttpSolrClient> {
 
     protected Long idleTimeoutMillis;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java
index 738822509642..a627d2596922 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java
@@ -539,8 +539,8 @@ protected LBSolrClient createLBSolrClient() {
   }
 
   @Override
-  public BuilderBase<?, ?> builder() {
-    return new HttpJettySolrClient.Builder().withHttpClient(this);
+  protected BuilderBase<?, ?> toBuilder(String baseUrl) {
+    return new HttpJettySolrClient.Builder(baseUrl).withHttpClient(this);
   }
 
   // merely exposing for superclass's method visibility to this package

From 43589c296c53e0e94e3563d7ec6481fc1fb236dc Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Sat, 27 Dec 2025 00:27:07 -0500
Subject: [PATCH 12/27] fix from merge

---
 .../component/DistributedCombinedQueryComponentTest.java      | 4 ++--
 .../org/apache/solr/client/solrj/impl/HttpSolrClient.java     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedCombinedQueryComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedCombinedQueryComponentTest.java
index 46441382c300..28a1207328f2 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedCombinedQueryComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedCombinedQueryComponentTest.java
@@ -22,7 +22,7 @@
 import java.util.Arrays;
 import java.util.List;
 import org.apache.solr.BaseDistributedSearchTestCase;
-import org.apache.solr.client.solrj.apache.HttpSolrClient;
+import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrInputDocument;
@@ -96,7 +96,7 @@ private synchronized void prepareIndexDocs() throws Exception {
         (client1, client2) -> {
           try {
             if (client2 instanceof HttpJettySolrClient httpClient2
-                && client1 instanceof HttpSolrClient httpClient1)
+                && client1 instanceof HttpApacheSolrClient httpClient1)
               return new URI(httpClient1.getBaseURL()).getPort()
                   - new URI(httpClient2.getBaseURL()).getPort();
           } catch (URISyntaxException e) {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
index d44022e9b98f..f165afb244e8 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
@@ -65,7 +65,6 @@ public abstract class HttpSolrClient extends SolrClient {
   protected static final Charset FALLBACK_CHARSET = StandardCharsets.UTF_8;
 
   protected final String baseUrl;
-  protected final String defaultCollection;
   protected final long requestTimeoutMillis;
 
   protected final Set<String> urlParamNames;

From 6b3f53efd137f7427a035daf09e572368afa7500 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Sun, 18 Jan 2026 22:21:00 -0500
Subject: [PATCH 13/27] solrj-streaming need not depend on jetty

---
 solr/solrj-streaming/build.gradle             |  1 -
 solr/solrj-streaming/gradle.lockfile          | 20 +++++++++----------
 .../solr/client/solrj/io/SolrClientCache.java | 10 ++++++----
 .../solrj/io/sql/DatabaseMetaDataImpl.java    |  4 ++--
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/solr/solrj-streaming/build.gradle b/solr/solrj-streaming/build.gradle
index ee33ad8041a2..4ea3110e2030 100644
--- a/solr/solrj-streaming/build.gradle
+++ b/solr/solrj-streaming/build.gradle
@@ -21,7 +21,6 @@ description = 'Solrj-Streaming - SolrJ requiring Streaming Expressions'
 
 dependencies {
   implementation project(':solr:solrj')
-  implementation project(':solr:solrj-jetty')
 
   // declare dependencies we use even though already declared by solrj-core
   implementation libs.slf4j.api
diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile
index fc80ed6687e3..1988acd34f12 100644
--- a/solr/solrj-streaming/gradle.lockfile
+++ b/solr/solrj-streaming/gradle.lockfile
@@ -137,23 +137,23 @@ org.codehaus.janino:commons-compiler:3.1.11=jarValidation,testRuntimeClasspath
 org.codehaus.janino:janino:3.1.11=jarValidation,testRuntimeClasspath
 org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath
 org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.27=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:jetty-http2-client:12.0.27=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:jetty-http2-common:12.0.27=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.27=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.27=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty.http2:jetty-http2-server:12.0.27=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:12.0.27=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:12.0.27=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.27=jarValidation,testRuntimeClasspath
 org.eclipse.jetty:jetty-alpn-java-server:12.0.27=jarValidation,testRuntimeClasspath
 org.eclipse.jetty:jetty-alpn-server:12.0.27=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:12.0.27=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:12.0.27=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:12.0.27=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.27=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-rewrite:12.0.27=jarValidation,testRuntimeClasspath
 org.eclipse.jetty:jetty-security:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-server:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-session:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:12.0.27=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,testRuntimeClasspath
 org.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspath
 org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspath
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
index b06c022b6a0b..3c4db9ed8516 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
@@ -29,7 +29,6 @@
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.impl.SolrHttpConstants;
-import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.common.AlreadyClosedException;
 import org.apache.solr.common.util.IOUtils;
 import org.apache.solr.common.util.URLUtil;
@@ -131,15 +130,18 @@ public synchronized SolrClient getHttpSolrClient(String baseUrl) {
     return client;
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   protected HttpSolrClient.BuilderBase<?, ?> newHttpSolrClientBuilder(
       String url, HttpSolrClient httpSolrClient) {
     final var builder =
         (url == null || URLUtil.isBaseUrl(url)) // URL may be null here and set by caller
-            ? new HttpJettySolrClient.Builder(url)
-            : new HttpJettySolrClient.Builder(URLUtil.extractBaseUrl(url))
+            ? HttpSolrClient.builder(url)
+            : HttpSolrClient.builder(URLUtil.extractBaseUrl(url))
                 .withDefaultCollection(URLUtil.extractCoreFromCoreUrl(url));
     if (httpSolrClient != null) {
-      builder.withHttpClient((HttpJettySolrClient) httpSolrClient); // TODO support JDK
+      // this generics hack works around the fact that we can't guarantee that the new client and
+      // the existing passed-in client are compatible  Oh well; tough luck, best-effort.
+      ((HttpSolrClient.BuilderBase) builder).withHttpClient(httpSolrClient);
       // cannot set connection timeout
     } else {
       builder.withConnectionTimeout(minConnTimeout, TimeUnit.MILLISECONDS);
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 cde6a04b0681..99d85080bf6c 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
@@ -27,7 +27,7 @@
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.SystemInfoRequest;
 import org.apache.solr.client.solrj.response.SystemInfoResponse;
 import org.apache.solr.common.cloud.ClusterState;
@@ -121,7 +121,7 @@ public String getDatabaseProductVersion() throws SQLException {
     for (String node : liveNodes) {
       try {
         String nodeURL = Utils.getBaseUrlForNodeName(node, urlScheme);
-        solrClient = new HttpJettySolrClient.Builder(nodeURL).build();
+        solrClient = HttpSolrClient.builder(nodeURL).build();
 
         SystemInfoRequest req = new SystemInfoRequest();
         SystemInfoResponse resp = req.process(solrClient);

From 71472f5c71b051950419de1faca6eedf7eed7d20 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Sun, 10 May 2026 20:06:53 -0400
Subject: [PATCH 14/27] Tests...

---
 .../solr/cloud/BasicDistributedZk2Test.java   |  2 +-
 .../solr/cloud/BasicDistributedZkTest.java    | 59 ++++--------------
 .../cloud/ChaosMonkeyNothingIsSafeTest.java   |  9 +--
 ...nkeyNothingIsSafeWithPullReplicasTest.java |  9 +--
 .../solr/cloud/ShardRoutingCustomTest.java    |  4 +-
 .../org/apache/solr/cloud/SyncSliceTest.java  |  4 +-
 .../cloud/TestMiniSolrCloudClusterSSL.java    |  6 +-
 .../solr/cloud/TestStressInPlaceUpdates.java  |  5 +-
 .../solr/cloud/UnloadDistributedZkTest.java   | 32 +++++-----
 ...DistributedCombinedQueryComponentTest.java |  9 +--
 ...utedFacetSimpleRefinementLongTailTest.java |  2 +-
 .../solr/update/SolrCmdDistributorTest.java   | 43 +++++++------
 .../update/TestInPlaceUpdatesDistrib.java     | 60 +++++++++----------
 .../solr/BaseDistributedSearchTestCase.java   |  7 ++-
 .../cloud/AbstractFullDistribZkTestBase.java  | 42 +++++++------
 .../FullThrottleStoppableIndexingThread.java  | 40 ++++++-------
 16 files changed, 137 insertions(+), 196 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
index 203d035318eb..88b991f9dd2b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
@@ -285,7 +285,7 @@ private void bringDownShardIndexSomeDocsAndRecover() throws Exception {
 
     // ensure shard is dead
     expectThrows(
-        SolrServerException.class,
+        Exception.class,
         "This server should be down and this update should have failed",
         () -> index_specific(deadShard.client.solrClient, id, 999, i1, 107, t1, "specific doc!"));
 
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
index 7db8ec765cd6..417969992a0b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
@@ -44,7 +44,7 @@
 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.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest.Create;
@@ -695,10 +695,9 @@ public void test() throws Exception {
 
     // try add commitWithin
     long before = cloudClient.query(new SolrQuery("*:*")).getResults().getNumFound();
-    for (SolrClient client : clients) {
+    for (var client : clients) {
       assertEquals(
-          "unexpected pre-commitWithin document count on node: "
-              + ((HttpApacheSolrClient) client).getBaseURL(),
+          "unexpected pre-commitWithin document count on node: " + client.getBaseURL(),
           before,
           client.query(new SolrQuery("*:*")).getResults().getNumFound());
     }
@@ -1040,7 +1039,7 @@ private void testShardParamVariations() throws Exception {
 
   private void testStopAndStartCoresInOneInstance() throws Exception {
     JettySolrRunner jetty = jettys.get(0);
-    try (final SolrClient httpSolrClient = (HttpApacheSolrClient) jetty.newClient(15000, 60000)) {
+    try (final var httpSolrClient = jetty.newClient(15000, 60000)) {
       ThreadPoolExecutor executor = null;
       try {
         executor =
@@ -1149,7 +1148,7 @@ protected CollectionAdminResponse createCollection(
 
     CollectionAdminResponse res = new CollectionAdminResponse();
     if (client == null) {
-      final String baseUrl = ((HttpApacheSolrClient) clients.get(clientIndex)).getBaseURL();
+      final String baseUrl = clients.get(clientIndex).getBaseURL();
 
       try (SolrClient aClient = createNewSolrClient("", baseUrl)) {
         res.setResponse(aClient.request(request));
@@ -1259,7 +1258,7 @@ private void doOptimisticLockingAndUpdating() throws Exception {
 
   private void testNumberOfCommitsWithCommitAfterAdd() throws SolrServerException, IOException {
     log.info("### STARTING testNumberOfCommitsWithCommitAfterAdd");
-    long startCommits = getNumCommits((HttpApacheSolrClient) clients.get(0));
+    long startCommits = getNumCommits(clients.getFirst());
 
     NamedList<Object> result =
         clients
@@ -1270,18 +1269,13 @@ private void testNumberOfCommitsWithCommitAfterAdd() throws SolrServerException,
                     .setCommitWithin(900000)
                     .setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true));
 
-    long endCommits = getNumCommits((HttpApacheSolrClient) clients.get(0));
+    long endCommits = getNumCommits(clients.getFirst());
     assertEquals(startCommits + 1L, endCommits);
   }
 
-  private Long getNumCommits(HttpApacheSolrClient sourceClient)
-      throws SolrServerException, IOException {
-    String collection = sourceClient.getDefaultCollection();
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(sourceClient.getBaseURL())
-            .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(60000, TimeUnit.MILLISECONDS)
-            .build()) {
+  private Long getNumCommits(HttpSolrClient client) throws SolrServerException, IOException {
+    String collection = client.getDefaultCollection();
+    {
       var req = new MetricsRequest(SolrParams.of("wt", "prometheus"));
 
       NamedList<Object> resp = client.request(req);
@@ -1380,11 +1374,7 @@ private void testANewCollectionInOneInstanceWithManualShardAssignement() throws
             .getLeader("shard1");
 
     // now test that unloading a core gets us a new leader
-    try (SolrClient unloadClient =
-        new HttpApacheSolrClient.Builder(jettys.get(0).getBaseUrl().toString())
-            .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(60000, TimeUnit.MILLISECONDS)
-            .build()) {
+    try (SolrClient unloadClient = jettys.getFirst().newClient(15000, 60000)) {
       Unload unloadCmd = new Unload(true);
       unloadCmd.setCoreName(leader.getCoreName());
 
@@ -1432,8 +1422,7 @@ public void run() {
 
   private void testSearchByCollectionName() throws SolrServerException, IOException {
     log.info("### STARTING testSearchByCollectionName");
-    SolrClient client = clients.get(0);
-    final String baseUrl = ((HttpApacheSolrClient) client).getBaseURL();
+    final String baseUrl = clients.getFirst().getBaseURL();
 
     // the cores each have different names, but if we add the collection name to the url
     // we should get mapped to the right core
@@ -1446,8 +1435,7 @@ private void testSearchByCollectionName() throws SolrServerException, IOExceptio
 
   private void testUpdateByCollectionName() throws SolrServerException, IOException {
     log.info("### STARTING testUpdateByCollectionName");
-    SolrClient client = clients.get(0);
-    final String baseUrl = ((HttpApacheSolrClient) client).getBaseURL();
+    final String baseUrl = clients.getFirst().getBaseURL();
 
     // the cores each have different names, but if we add the collection name to the url
     // we should get mapped to the right core
@@ -1681,27 +1669,6 @@ protected SolrClient createNewSolrClient(String collection, String baseUrl) {
     return client;
   }
 
-  /**
-   * @param collection the name of a collection or core to set as the "default" on the created
-   *     client.
-   * @param baseUrl the "base" URL of a Solr node. Should <em>not</em> contain a collection or core
-   *     name.
-   * @param connectionTimeoutMillis the HTTP connection timeout in milliseconds
-   * @param socketTimeoutMillis the HTTP socket-read timeout in milliseconds
-   */
-  protected SolrClient createNewSolrClient(
-      String collection, String baseUrl, int connectionTimeoutMillis, int socketTimeoutMillis) {
-
-    SolrClient client =
-        new HttpApacheSolrClient.Builder(baseUrl)
-            .withDefaultCollection(collection)
-            .withConnectionTimeout(connectionTimeoutMillis, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(socketTimeoutMillis, TimeUnit.MILLISECONDS)
-            .build();
-
-    return client;
-  }
-
   @Override
   protected QueryResponse queryRandomShard(ModifiableSolrParams params)
       throws SolrServerException, IOException {
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
index b8640c9a3d49..8e91990844b1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
@@ -23,7 +23,6 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
-import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.common.SolrInputDocument;
@@ -183,13 +182,7 @@ public void test() throws Exception {
       if (runFullThrottle) {
         ftIndexThread =
             new FullThrottleStoppableIndexingThread(
-                ((CloudLegacySolrClient) cloudClient).getHttpClient(),
-                controlClient,
-                cloudClient,
-                clients,
-                "ft1",
-                true,
-                this.clientSoTimeout);
+                controlClient, cloudClient, clients, "ft1", true, this.clientSoTimeout);
         ftIndexThread.start();
       }
 
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 b70939ced427..16e800a93bed 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java
@@ -25,7 +25,6 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
-import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.common.SolrInputDocument;
@@ -217,13 +216,7 @@ public void test() throws Exception {
       if (runFullThrottle) {
         ftIndexThread =
             new FullThrottleStoppableIndexingThread(
-                ((CloudLegacySolrClient) cloudClient).getHttpClient(),
-                controlClient,
-                cloudClient,
-                clients,
-                "ft1",
-                true,
-                this.clientSoTimeout);
+                controlClient, cloudClient, clients, "ft1", true, this.clientSoTimeout);
         ftIndexThread.start();
       }
 
diff --git a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.java b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.java
index 004d7cc06e80..c101e5331397 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.java
@@ -18,7 +18,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.embedded.JettySolrRunner;
@@ -76,8 +75,7 @@ private void doCustomSharding() throws Exception {
             .process(cloudClient)
             .isSuccess());
     jettys.add(j);
-    SolrClient client = createNewSolrClient(j.getLocalPort());
-    clients.add(client);
+    clients.add(createNewSolrClient(j.getLocalPort()));
 
     waitForActiveReplicaCount(cloudClient, DEFAULT_COLLECTION, 1);
 
diff --git a/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java b/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
index c29b5aa88c76..65f2959dd96e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
@@ -29,7 +29,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.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -107,7 +107,7 @@ public void test() throws Exception {
 
     // we only set the connect timeout, not so timeout
     try (SolrClient baseClient =
-        new HttpApacheSolrClient.Builder(baseUrl)
+        new HttpJettySolrClient.Builder(baseUrl)
             .withConnectionTimeout(30000, TimeUnit.MILLISECONDS)
             .build()) {
       baseClient.request(request);
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 bfddb9196025..698afd65897a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
@@ -25,9 +25,9 @@
 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.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.apache.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@@ -176,6 +176,7 @@ private void checkClusterWithNodeReplacement(SSLTestConfig sslConfig) throws Exc
           Boolean.toString(sslConfig.getCheckPeerName()));
       HttpClientUtil.resetHttpClientBuilder();
       HttpJettySolrClient.resetSslContextFactory();
+      HttpJettySolrClient.setDefaultSSLConfig(sslConfig.buildClientSSLConfig());
 
       // recheck that we can communicate with all the jetty instances in our cluster
       checkClusterJettys(cluster, sslConfig);
@@ -425,9 +426,8 @@ public static SolrClient getRandomizedHttpSolrClient(String url) {
     // ... so we are hopefully future proofing against possible changes to
     // SolrTestCaseJ4.getHttpSolrClient that "optimize" the test client construction in a way that
     // would prevent us from finding bugs with regular HttpSolrClient instantiation.
-    // This test fails if you return a HttpJettySolrClient
     if (random().nextBoolean()) {
-      return (new HttpApacheSolrClient.Builder(url)).build();
+      return HttpSolrClient.builder(url).build();
     } // else...
     return getHttpSolrClient(url);
   }
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 3101aafd010e..9239f4720b54 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,6 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.UpdateResponse;
@@ -679,9 +678,9 @@ public SolrClient getClientForLeader() throws KeeperException, InterruptedExcept
     Slice shard1 = clusterState.getCollection(DEFAULT_COLLECTION).getSlice(SHARD1);
     leader = shard1.getLeader();
 
-    for (SolrClient client : clients) {
+    for (var client : clients) {
       String leaderBaseUrl = zkStateReader.getBaseUrlForNodeName(leader.getNodeName());
-      if (((HttpApacheSolrClient) client).getBaseURL().startsWith(leaderBaseUrl)) {
+      if (client.getBaseURL().startsWith(leaderBaseUrl)) {
         return client;
       }
     }
diff --git a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
index 4e2fa894663c..0766e3412a25 100644
--- a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
@@ -30,7 +30,7 @@
 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.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.impl.CollectionScopedSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;
 import org.apache.solr.client.solrj.request.SolrQuery;
@@ -247,21 +247,21 @@ private void testCoreUnloadAndLeaders() throws Exception {
 
     Random random = random();
     if (random.nextBoolean()) {
-      try (SolrClient collectionClient =
-          getHttpSolrClient(leader.getBaseUrl(), leader.getCoreName())) {
-        // lets try and use the solrj client to index and retrieve a couple
-        // documents
-        SolrInputDocument doc1 =
-            getDoc(id, 6, i1, -600, tlong, 600, t1, "humpty dumpy sat on a wall");
-        SolrInputDocument doc2 =
-            getDoc(id, 7, i1, -600, tlong, 600, t1, "humpty dumpy3 sat on a walls");
-        SolrInputDocument doc3 =
-            getDoc(id, 8, i1, -600, tlong, 600, t1, "humpty dumpy2 sat on a walled");
-        collectionClient.add(doc1);
-        collectionClient.add(doc2);
-        collectionClient.add(doc3);
-        collectionClient.commit();
-      }
+      SolrClient collectionClient =
+          new CollectionScopedSolrClient(getReplicaNodeClient(leader), leader.getCoreName());
+
+      // lets try and use the solrj client to index and retrieve a couple
+      // documents
+      SolrInputDocument doc1 =
+          getDoc(id, 6, i1, -600, tlong, 600, t1, "humpty dumpy sat on a wall");
+      SolrInputDocument doc2 =
+          getDoc(id, 7, i1, -600, tlong, 600, t1, "humpty dumpy3 sat on a walls");
+      SolrInputDocument doc3 =
+          getDoc(id, 8, i1, -600, tlong, 600, t1, "humpty dumpy2 sat on a walled");
+      collectionClient.add(doc1);
+      collectionClient.add(doc2);
+      collectionClient.add(doc3);
+      collectionClient.commit();
     }
 
     assertTrue(
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedCombinedQueryComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedCombinedQueryComponentTest.java
index c5215e039d65..44235189cc97 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedCombinedQueryComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedCombinedQueryComponentTest.java
@@ -22,8 +22,6 @@
 import java.util.Arrays;
 import java.util.List;
 import org.apache.solr.BaseDistributedSearchTestCase;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
-import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.params.CommonParams;
@@ -95,14 +93,11 @@ private synchronized void prepareIndexDocs() throws Exception {
     clients.sort(
         (client1, client2) -> {
           try {
-            if (client2 instanceof HttpJettySolrClient httpClient2
-                && client1 instanceof HttpApacheSolrClient httpClient1)
-              return new URI(httpClient1.getBaseURL()).getPort()
-                  - new URI(httpClient2.getBaseURL()).getPort();
+            return new URI(client1.getBaseURL()).getPort()
+                - new URI(client2.getBaseURL()).getPort();
           } catch (URISyntaxException e) {
             throw new RuntimeException("Unable to get URI from SolrClient", e);
           }
-          return 0;
         });
     for (SolrInputDocument doc : docs) {
       indexDoc(doc);
diff --git a/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java b/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java
index 8c8193281be4..34e4d6461204 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java
@@ -87,7 +87,7 @@ public void test() throws Exception {
     checkSubFacetStats();
   }
 
-  public static void buildIndexes(final List<SolrClient> clients, final String statField)
+  public static void buildIndexes(final List<? extends SolrClient> clients, final String statField)
       throws Exception {
 
     assertEquals("This indexing code assumes exactly 3 shards/clients", 3, clients.size());
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 eb8f1eb85497..003c3b401517 100644
--- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
@@ -28,7 +28,7 @@
 import org.apache.solr.BaseDistributedSearchTestCase;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.LukeRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -151,7 +151,7 @@ public void test() throws Exception {
     List<SolrError> errors;
     CommitUpdateCommand ccmd = new CommitUpdateCommand(null, false);
     long numFound;
-    HttpApacheSolrClient client;
+    HttpSolrClient client;
     ZkNodeProps nodeProps;
 
     try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(updateShardHandler)) {
@@ -159,7 +159,7 @@ public void test() throws Exception {
       nodeProps =
           new ZkNodeProps(
               ZkStateReader.BASE_URL_PROP,
-              ((HttpApacheSolrClient) controlClient).getBaseURL(),
+              controlClient.getBaseURL(),
               ZkStateReader.CORE_NAME_PROP,
               controlClient.getDefaultCollection());
       nodes.add(new StdNode(new ZkCoreNodeProps(nodeProps)));
@@ -182,7 +182,7 @@ public void test() throws Exception {
       numFound = controlClient.query(new SolrQuery("*:*")).getResults().getNumFound();
       assertEquals(1, numFound);
 
-      client = (HttpApacheSolrClient) clients.get(0);
+      client = clients.getFirst();
       nodeProps =
           new ZkNodeProps(
               ZkStateReader.BASE_URL_PROP,
@@ -269,17 +269,16 @@ public void test() throws Exception {
       int cnt = atLeast(303);
       for (int i = 0; i < cnt; i++) {
         nodes.clear();
-        for (SolrClient c : clients) {
+        for (HttpSolrClient c : clients) {
           if (random().nextBoolean()) {
             continue;
           }
-          var httpClient = (HttpApacheSolrClient) c;
           nodeProps =
               new ZkNodeProps(
                   ZkStateReader.BASE_URL_PROP,
-                  httpClient.getBaseURL(),
+                  c.getBaseURL(),
                   ZkStateReader.CORE_NAME_PROP,
-                  httpClient.getDefaultCollection());
+                  c.getDefaultCollection());
           nodes.add(new StdNode(new ZkCoreNodeProps(nodeProps)));
         }
         AddUpdateCommand c = new AddUpdateCommand(null);
@@ -292,14 +291,13 @@ public void test() throws Exception {
 
       nodes.clear();
 
-      for (SolrClient c : clients) {
-        var httpClient = (HttpApacheSolrClient) c;
+      for (HttpSolrClient c : clients) {
         nodeProps =
             new ZkNodeProps(
                 ZkStateReader.BASE_URL_PROP,
-                httpClient.getBaseURL(),
+                c.getBaseURL(),
                 ZkStateReader.CORE_NAME_PROP,
-                httpClient.getDefaultCollection());
+                c.getDefaultCollection());
 
         nodes.add(new StdNode(new ZkCoreNodeProps(nodeProps)));
       }
@@ -369,7 +367,7 @@ public void newSearcher(
   }
 
   private void testDeletes(boolean dbq, boolean withFailures) throws Exception {
-    final var solrclient = (HttpApacheSolrClient) clients.get(0);
+    final var solrclient = clients.getFirst();
     solrclient.commit(true, true);
     long numFoundBefore = solrclient.query(new SolrQuery("*:*")).getResults().getNumFound();
     final MockStreamingSolrClients streamingClients =
@@ -437,7 +435,7 @@ public boolean checkRetry(SolrError err) {
   }
 
   private void testMinRfOnRetries(NodeType nodeType) throws Exception {
-    final var solrclient = (HttpApacheSolrClient) clients.get(0);
+    final var solrclient = clients.getFirst();
     final MockStreamingSolrClients streamingClients =
         new MockStreamingSolrClients(updateShardHandler);
     try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(streamingClients, 0)) {
@@ -499,7 +497,7 @@ private void testMaxRetries(NodeType nodeType) throws IOException {
     try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(streamingClients, 0)) {
       streamingClients.setExp(Exp.CONNECT_EXCEPTION);
       ArrayList<Node> nodes = new ArrayList<>();
-      final var solrClient1 = (HttpApacheSolrClient) clients.get(0);
+      final var solrClient1 = clients.getFirst();
 
       final AtomicInteger retries = new AtomicInteger();
       ZkNodeProps nodeProps =
@@ -617,7 +615,7 @@ private SolrError getError(Exception e) {
   }
 
   private void testOneRetry(NodeType nodeType) throws Exception {
-    final var solrclient = (HttpApacheSolrClient) clients.get(0);
+    final var solrclient = clients.getFirst();
     long numFoundBefore = solrclient.query(new SolrQuery("*:*")).getResults().getNumFound();
     final MockStreamingSolrClients streamingClients =
         new MockStreamingSolrClients(updateShardHandler);
@@ -678,7 +676,7 @@ public boolean checkRetry(SolrError err) {
 
   private void testNodeWontRetryBadRequest(NodeType nodeType) throws Exception {
     ignoreException("Bad Request");
-    final var solrclient = (HttpApacheSolrClient) clients.get(0);
+    final var solrclient = clients.getFirst();
     long numFoundBefore = solrclient.query(new SolrQuery("*:*")).getResults().getNumFound();
     final MockStreamingSolrClients streamingClients =
         new MockStreamingSolrClients(updateShardHandler);
@@ -739,7 +737,7 @@ public boolean checkRetry(SolrError err) {
   }
 
   private void testForwardNodeWontRetrySocketError() throws Exception {
-    final var solrclient = (HttpApacheSolrClient) clients.get(0);
+    final var solrclient = clients.getFirst();
     long numFoundBefore = solrclient.query(new SolrQuery("*:*")).getResults().getNumFound();
     final MockStreamingSolrClients streamingClients =
         new MockStreamingSolrClients(updateShardHandler);
@@ -788,7 +786,7 @@ public boolean checkRetry(SolrError err) {
   }
 
   private void testStdNodeRetriesSocketError() throws Exception {
-    final var solrclient = (HttpApacheSolrClient) clients.get(0);
+    final var solrclient = clients.getFirst();
     final MockStreamingSolrClients streamingClients =
         new MockStreamingSolrClients(updateShardHandler);
     try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(streamingClients, 0)) {
@@ -828,7 +826,7 @@ public boolean checkRetry(SolrError err) {
   private void testRetryNodeAgainstBadAddress() throws SolrServerException, IOException {
     // Test RetryNode
     try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(updateShardHandler)) {
-      final var solrclient = (HttpApacheSolrClient) clients.get(0);
+      final var solrclient = clients.getFirst();
       long numFoundBefore = solrclient.query(new SolrQuery("*:*")).getResults().getNumFound();
 
       ArrayList<Node> nodes = new ArrayList<>();
@@ -914,15 +912,14 @@ private void testStuckUpdates() {
     try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(updateShardHandler)) {
       for (int i = 0; i < 3; i++) {
         nodes.clear();
-        for (SolrClient c : clients) {
+        for (HttpSolrClient c : clients) {
           if (random().nextBoolean()) {
             continue;
           }
-          var httpClient = (HttpApacheSolrClient) c;
           ZkNodeProps nodeProps =
               new ZkNodeProps(
                   ZkStateReader.BASE_URL_PROP,
-                  httpClient.getBaseURL(),
+                  c.getBaseURL(),
                   ZkStateReader.CORE_NAME_PROP,
                   "");
           StdNode node = new StdNode(new ZkCoreNodeProps(nodeProps));
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 fae670e224ec..ab988dcd8909 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
@@ -40,7 +40,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.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.client.solrj.request.schema.SchemaRequest.Field;
 import org.apache.solr.client.solrj.response.UpdateResponse;
@@ -120,8 +120,8 @@ public TestInPlaceUpdatesDistrib() {
     fixShardCount(3);
   }
 
-  private SolrClient LEADER = null;
-  private List<HttpApacheSolrClient> NONLEADERS = null;
+  private HttpSolrClient LEADER = null;
+  private List<HttpSolrClient> NONLEADERS = null;
 
   @Test
   @ShardsFixed(num = 3)
@@ -226,8 +226,8 @@ private void mapReplicasToClients() throws KeeperException, InterruptedException
     leader = shard1.getLeader();
 
     String leaderBaseUrl = zkStateReader.getBaseUrlForNodeName(leader.getNodeName());
-    for (SolrClient solrClient : clients) {
-      if (((HttpApacheSolrClient) solrClient).getBaseURL().startsWith(leaderBaseUrl)) {
+    for (HttpSolrClient solrClient : clients) {
+      if (solrClient.getBaseURL().startsWith(leaderBaseUrl)) {
         LEADER = solrClient;
       }
     }
@@ -238,9 +238,9 @@ private void mapReplicasToClients() throws KeeperException, InterruptedException
         continue;
       }
       String baseUrl = zkStateReader.getBaseUrlForNodeName(rep.getNodeName());
-      for (SolrClient client : clients) {
-        if (((HttpApacheSolrClient) client).getBaseURL().startsWith(baseUrl)) {
-          NONLEADERS.add((HttpApacheSolrClient) client);
+      for (HttpSolrClient client : clients) {
+        if (client.getBaseURL().startsWith(baseUrl)) {
+          NONLEADERS.add(client);
         }
       }
     }
@@ -267,7 +267,7 @@ private void setNullForDVEnabledField() throws Exception {
     assertEquals("title0", sdoc.get("title_s"));
     long version0 = (long) sdoc.get("_version_");
 
-    for (SolrClient client : NONLEADERS) {
+    for (HttpSolrClient client : NONLEADERS) {
       SolrDocument doc = client.getById(String.valueOf(0), params("distrib", "false"));
       assertEquals(inplace_updatable_float, doc.get("inplace_updatable_float"));
       assertEquals(version0, doc.get("_version_"));
@@ -281,7 +281,7 @@ private void setNullForDVEnabledField() throws Exception {
     assertEquals("title0", sdoc.get("title_s"));
     long version1 = (long) sdoc.get("_version_");
 
-    for (SolrClient client : NONLEADERS) {
+    for (HttpSolrClient client : NONLEADERS) {
       SolrDocument doc = client.getById(String.valueOf(0), params("distrib", "false"));
       assertNull(doc.get("inplace_updatable_float"));
       assertEquals(version1, doc.get("_version_"));
@@ -372,7 +372,7 @@ private void reorderedDBQsSimpleTest() throws Exception {
     }
 
     // assert both replicas have same effect
-    for (SolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
+    for (HttpSolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
       SolrDocument doc = client.getById(String.valueOf(0), params("distrib", "false"));
       assertNull("This doc was supposed to have been deleted, but was: " + doc, doc);
     }
@@ -662,7 +662,7 @@ private void assertDocIdsAndValuesAgainstAllClients(
     assertEquals(luceneDocids.size(), valuesList.size());
     final long numFoundExpected = luceneDocids.size();
 
-    for (SolrClient client : clients) {
+    for (HttpSolrClient client : clients) {
       final String clientDebug =
           client.toString() + (LEADER.equals(client) ? " (leader)" : " (not leader)");
       final String msg = "'" + debug + "' results against client: " + clientDebug;
@@ -838,7 +838,7 @@ private void ensureRtgWorksWithPartialUpdatesTest() throws Exception {
     assertThat(e.getMessage(), containsString("For input string: \"NOT_NUMBER\""));
 
     // RTG from tlog(s)
-    for (SolrClient client : clients) {
+    for (HttpSolrClient client : clients) {
       final String clientDebug =
           client.toString() + (LEADER.equals(client) ? " (leader)" : " (not leader)");
       sdoc = client.getById("100", params("distrib", "false"));
@@ -868,7 +868,7 @@ private void ensureRtgWorksWithPartialUpdatesTest() throws Exception {
    */
   private List<Integer> getInternalDocIds(String id) throws SolrServerException, IOException {
     List<Integer> ret = new ArrayList<>(clients.size());
-    for (SolrClient client : clients) {
+    for (HttpSolrClient client : clients) {
       SolrDocument doc = client.getById(id, params("distrib", "false", "fl", "[docid]"));
       Object docid = doc.get("[docid]");
       assertNotNull(docid);
@@ -960,9 +960,9 @@ private void outOfOrderUpdatesIndividualReplicaTest() throws Exception {
     }
 
     // assert both replicas have same effect
-    for (SolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
+    for (HttpSolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
       if (log.isInfoEnabled()) {
-        log.info("Testing client: {}", ((HttpApacheSolrClient) client).getBaseURL());
+        log.info("Testing client: {}", client.getBaseURL());
       }
       assertReplicaValue(
           client,
@@ -970,14 +970,14 @@ private void outOfOrderUpdatesIndividualReplicaTest() throws Exception {
           "inplace_updatable_float",
           (newinplace_updatable_float + (float) (updates.size() - 1)),
           "inplace_updatable_float didn't match for replica at client: "
-              + ((HttpApacheSolrClient) client).getBaseURL());
+              + client.getBaseURL());
       assertReplicaValue(
           client,
           0,
           "title_s",
           "title0_new",
           "Title didn't match for replica at client: "
-              + ((HttpApacheSolrClient) client).getBaseURL());
+              + client.getBaseURL());
       assertEquals(version0 + updates.size(), getReplicaValue(client, 0, "_version_"));
     }
 
@@ -1065,7 +1065,7 @@ private void reorderedDeletesTest() throws Exception {
     }
 
     // assert both replicas have same effect
-    for (SolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
+    for (HttpSolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
       SolrDocument doc = client.getById(String.valueOf(0), params("distrib", "false"));
       assertNull("This doc was supposed to have been deleted, but was: " + doc, doc);
     }
@@ -1205,11 +1205,11 @@ private void reorderedDBQsResurrectionTest() throws Exception {
     log.info("Doc in both replica 0: {}", doc0);
     log.info("Doc in both replica 1: {}", doc1);
     // assert both replicas have same effect
-    for (SolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
+    for (HttpSolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
       SolrDocument doc = client.getById(String.valueOf(0), params("distrib", "false"));
-      assertNotNull("Client: " + ((HttpApacheSolrClient) client).getBaseURL(), doc);
+      assertNotNull("Client: " + client.getBaseURL(), doc);
       assertEquals(
-          "Client: " + ((HttpApacheSolrClient) client).getBaseURL(), 5, doc.getFieldValue(field));
+          "Client: " + client.getBaseURL(), 5, doc.getFieldValue(field));
     }
 
     log.info("reorderedDBQsResurrectionTest: This test passed fine...");
@@ -1283,7 +1283,7 @@ private void delayedReorderingFetchesMissingUpdateFromLeaderTest() throws Except
           "The replica receiving reordered updates must not have gone down", 3, numActiveReplicas);
     }
 
-    for (SolrClient client : clients) {
+    for (HttpSolrClient client : clients) {
       TimeOut timeout = new TimeOut(30, TimeUnit.SECONDS, TimeSource.NANO_TIME);
       try {
         timeout.waitFor(
@@ -1303,8 +1303,8 @@ private void delayedReorderingFetchesMissingUpdateFromLeaderTest() throws Except
       }
     }
 
-    for (SolrClient client : clients) {
-      String baseURL = ((HttpApacheSolrClient) client).getBaseURL();
+    for (HttpSolrClient client : clients) {
+      String baseURL = client.getBaseURL();
       if (log.isInfoEnabled()) {
         log.info("Testing client (Fetch missing test): {}", baseURL);
         log.info(
@@ -1485,7 +1485,7 @@ UpdateRequest simulatedDeleteRequest(int id, long version) throws IOException {
   }
 
   UpdateRequest simulatedDeleteRequest(String query, long version) {
-    String baseUrl = getBaseUrl((HttpApacheSolrClient) LEADER);
+    String baseUrl = getBaseUrl(LEADER);
 
     UpdateRequest ur = new UpdateRequest();
     ur.deleteByQuery(query);
@@ -1501,7 +1501,7 @@ private String getBaseUrl(String id) {
     return slice.getLeader().getCoreUrl();
   }
 
-  protected String getBaseUrl(HttpApacheSolrClient client) {
+  protected String getBaseUrl(HttpSolrClient client) {
     // take a complete Solr url that ends with /collection1 and truncates it to the root url
     // that is used for admin api calls.
     return client
@@ -1685,14 +1685,14 @@ private void reorderedDBQsUsingUpdatedValueFromADroppedUpdate() throws Exception
           "The replica receiving reordered updates must not have gone down", 3, numActiveReplicas);
     }
 
-    for (SolrClient client : clients) {
+    for (HttpSolrClient client : clients) {
       if (log.isInfoEnabled()) {
         log.info(
             "Testing client (testDBQUsingUpdatedFieldFromDroppedUpdate): {}",
-            ((HttpApacheSolrClient) client).getBaseURL());
+            client.getBaseURL());
         log.info(
             "Version at {} is: {}",
-            ((HttpApacheSolrClient) client).getBaseURL(),
+            client.getBaseURL(),
             getReplicaValue(client, 1, "_version_")); // nowarn
       }
       assertNull(client.getById("1", params("distrib", "false")));
diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
index e72ffaa213cd..0e58b671d7bf 100644
--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
@@ -50,6 +50,7 @@
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.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;
@@ -166,14 +167,14 @@ public void fixShardCount(int count) {
   }
 
   protected volatile JettySolrRunner controlJetty;
-  protected final List<SolrClient> clients = Collections.synchronizedList(new ArrayList<>());
+  protected final List<HttpSolrClient> clients = Collections.synchronizedList(new ArrayList<>());
   protected final List<JettySolrRunner> jettys = Collections.synchronizedList(new ArrayList<>());
 
   protected volatile String[] deadServers;
   protected volatile String shards;
   protected volatile String[] shardsArr;
   protected volatile Path testDir;
-  protected volatile SolrClient controlClient;
+  protected volatile HttpSolrClient controlClient;
 
   // to stress with higher thread counts and requests, make sure the junit
   // xml formatter is not being used (all output will be buffered before
@@ -444,7 +445,7 @@ public SequencedMap<Class<? extends Filter>, String> getExtraRequestFilters() {
     return null;
   }
 
-  protected SolrClient createNewSolrClient(int port) {
+  protected HttpSolrClient createNewSolrClient(int port) {
     return getHttpSolrClient(buildUrl(port), DEFAULT_TEST_CORENAME);
   }
 
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 675631193136..e977ffc82892 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
@@ -57,8 +57,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.HttpApacheSolrClient;
 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;
@@ -160,7 +160,8 @@ public void beforeTest() {
 
   protected volatile CloudSolrClient controlClientCloud; // cloud version of the control client
   protected volatile CloudSolrClient cloudClient;
-  protected final List<SolrClient> coreClients = Collections.synchronizedList(new ArrayList<>());
+  protected final List<HttpSolrClient> coreClients =
+      Collections.synchronizedList(new ArrayList<>());
 
   protected final List<CloudJettyRunner> cloudJettys =
       Collections.synchronizedList(new ArrayList<>());
@@ -209,7 +210,7 @@ public String toString() {
   }
 
   public static class CloudSolrServerClient {
-    SolrClient solrClient;
+    HttpSolrClient solrClient;
     String nodeName;
     int port;
 
@@ -388,7 +389,7 @@ protected void createServers(int numServers) throws Exception {
     }
 
     controlClient =
-        new HttpApacheSolrClient.Builder(controlJetty.getBaseUrl().toString())
+        HttpSolrClient.builder(controlJetty.getBaseUrl().toString())
             .withDefaultCollection("control_collection")
             .build();
     if (sliceCount <= 0) {
@@ -442,7 +443,7 @@ public static void waitForCollection(ZkStateReader reader, String collection, in
 
   protected List<JettySolrRunner> createJettys(int numJettys) throws Exception {
     List<JettySolrRunner> jettys = Collections.synchronizedList(new ArrayList<>());
-    List<SolrClient> clients = Collections.synchronizedList(new ArrayList<>());
+    List<HttpSolrClient> clients = Collections.synchronizedList(new ArrayList<>());
     List<CollectionAdminRequest<CollectionAdminResponse>> createReplicaRequests =
         Collections.synchronizedList(new ArrayList<>());
     List<CollectionAdminRequest<CollectionAdminResponse>> createPullReplicaRequests =
@@ -526,7 +527,7 @@ protected List<JettySolrRunner> createJettys(int numJettys) throws Exception {
                           .setType(Replica.Type.TLOG));
 
                   coreClients.add(createNewSolrClient(coreName, j.getLocalPort()));
-                  SolrClient client = createNewSolrClient(j.getLocalPort());
+                  var client = createNewSolrClient(j.getLocalPort());
                   clients.add(client);
 
                 } catch (Exception e) {
@@ -565,8 +566,7 @@ protected List<JettySolrRunner> createJettys(int numJettys) throws Exception {
                           .setNode(j.getNodeName())
                           .setType(Replica.Type.NRT));
                   coreClients.add(createNewSolrClient(coreName, j.getLocalPort()));
-                  SolrClient client = createNewSolrClient(j.getLocalPort());
-                  clients.add(client);
+                  clients.add(createNewSolrClient(j.getLocalPort()));
                 } catch (Exception e) {
                   log.error("error creating jetty", e);
                   throw new RuntimeException(e);
@@ -601,8 +601,7 @@ protected List<JettySolrRunner> createJettys(int numJettys) throws Exception {
                         .setNode(j.getNodeName())
                         .setType(Replica.Type.PULL));
                 coreClients.add(createNewSolrClient(coreName, j.getLocalPort()));
-                SolrClient client = createNewSolrClient(j.getLocalPort());
-                clients.add(client);
+                clients.add(createNewSolrClient(j.getLocalPort()));
               } catch (Exception e) {
                 log.error("error creating jetty", e);
                 throw new RuntimeException(e);
@@ -932,13 +931,13 @@ private Path getRelativeSolrHomePath(Path solrHome) {
     return relativizedCurDir.resolve(solrHomeRelativeToRoot).toAbsolutePath();
   }
 
-  protected void updateMappingsFromZk(List<JettySolrRunner> jettys, List<SolrClient> clients)
+  protected void updateMappingsFromZk(List<JettySolrRunner> jettys, List<HttpSolrClient> clients)
       throws Exception {
     updateMappingsFromZk(jettys, clients, false);
   }
 
   protected void updateMappingsFromZk(
-      List<JettySolrRunner> jettys, List<SolrClient> clients, boolean allowOverSharding)
+      List<JettySolrRunner> jettys, List<HttpSolrClient> clients, boolean allowOverSharding)
       throws Exception {
     ZkStateReader zkStateReader = ZkStateReader.from(cloudClient);
     zkStateReader.forceUpdateCollection(DEFAULT_COLLECTION);
@@ -949,13 +948,13 @@ protected void updateMappingsFromZk(
     DocCollection coll = clusterState.getCollection(DEFAULT_COLLECTION);
 
     List<CloudSolrServerClient> theClients = new ArrayList<>();
-    for (SolrClient client : clients) {
+    for (var client : clients) {
       // find info for this client in zk
       nextClient:
       // we find out state by simply matching ports...
       for (Slice slice : coll.getSlices()) {
         for (Replica replica : slice.getReplicas()) {
-          int port = new URI(((HttpApacheSolrClient) client).getBaseURL()).getPort();
+          int port = new URI(client.getBaseURL()).getPort();
 
           if (replica.getBaseUrl().contains(":" + port)) {
             CloudSolrServerClient csc = new CloudSolrServerClient();
@@ -2037,8 +2036,7 @@ protected void assertDocCounts(boolean verbose) throws Exception {
       for (Map.Entry<String, Slice> slice : slices.entrySet()) {
         Map<String, Replica> theShards = slice.getValue().getReplicasMap();
         for (Map.Entry<String, Replica> shard : theShards.entrySet()) {
-          String shardName =
-              new URI(((HttpApacheSolrClient) client.solrClient).getBaseURL()).getPort() + "_solr_";
+          String shardName = new URI(client.solrClient.getBaseURL()).getPort() + "_solr_";
           if (verbose && shard.getKey().endsWith(shardName)) {
             System.err.println("shard:" + slice.getKey());
             System.err.println(shard.getValue());
@@ -2456,16 +2454,16 @@ public static CloudSolrClient getCloudSolrClient(
   }
 
   @Override
-  protected SolrClient createNewSolrClient(int port) {
+  protected HttpSolrClient createNewSolrClient(int port) {
     return createNewSolrClient(DEFAULT_COLLECTION, port);
   }
 
-  protected SolrClient createNewSolrClient(String coreName, int port) {
+  protected HttpSolrClient createNewSolrClient(String coreName, int port) {
     String baseUrl = buildUrl(port);
-    return new HttpApacheSolrClient.Builder(baseUrl)
+    return HttpSolrClient.builder(baseUrl)
         .withDefaultCollection(coreName)
         .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-        .withSocketTimeout(60000, TimeUnit.MILLISECONDS)
+        .withIdleTimeout(60000, TimeUnit.MILLISECONDS)
         .build();
   }
 
@@ -2992,7 +2990,7 @@ protected void waitForReplicationFromReplicas(
 
   protected long getIndexVersion(Replica replica) throws IOException {
     try (SolrClient client =
-        new HttpApacheSolrClient.Builder(replica.getBaseUrl())
+        HttpSolrClient.builder(replica.getBaseUrl())
             .withDefaultCollection(replica.getCoreName())
             .build()) {
       ModifiableSolrParams params = new ModifiableSolrParams();
@@ -3042,7 +3040,7 @@ protected static boolean attemptCollectionDelete(CloudSolrClient client, String
 
   protected void logReplicationDetails(Replica replica, StringBuilder builder) throws IOException {
     try (SolrClient client =
-        new HttpApacheSolrClient.Builder(replica.getBaseUrl())
+        HttpSolrClient.builder(replica.getBaseUrl())
             .withDefaultCollection(replica.getCoreName())
             .build()) {
       ModifiableSolrParams params = new ModifiableSolrParams();
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 8b430bfdc9a2..30c8f67d406a 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java
@@ -23,12 +23,13 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.http.client.HttpClient;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.ConcurrentUpdateBaseSolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.jetty.ConcurrentUpdateJettySolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.common.SolrInputDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,19 +39,18 @@ class FullThrottleStoppableIndexingThread extends StoppableIndexingThread {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   /** */
-  private final HttpClient httpClient;
+  private final HttpJettySolrClient httpClient;
 
   private volatile boolean stop = false;
   int clientIndex = 0;
-  private ConcurrentUpdateSolrClient cusc;
-  private List<SolrClient> clients;
+  private ConcurrentUpdateBaseSolrClient cusc;
+  private List<HttpSolrClient> clients;
   private AtomicInteger fails = new AtomicInteger();
 
   public FullThrottleStoppableIndexingThread(
-      HttpClient httpClient,
       SolrClient controlClient,
       CloudSolrClient cloudClient,
-      List<SolrClient> clients,
+      List<HttpSolrClient> clients,
       String id,
       boolean doDeletes,
       int clientSoTimeout) {
@@ -58,17 +58,18 @@ public FullThrottleStoppableIndexingThread(
     setName("FullThrottleStoppableIndexingThread");
     setDaemon(true);
     this.clients = clients;
-    this.httpClient = httpClient;
+    this.httpClient =
+        new HttpJettySolrClient.Builder()
+            .withConnectionTimeout(10, TimeUnit.SECONDS)
+            .withIdleTimeout(clientSoTimeout, TimeUnit.MILLISECONDS)
+            .build();
 
     cusc =
         new ErrorLoggingConcurrentUpdateSolrClient.Builder(
-                ((HttpApacheSolrClient) clients.get(0)).getBaseURL())
-            .withDefaultCollection(clients.get(0).getDefaultCollection())
-            .withHttpClient(httpClient)
+                clients.getFirst().getBaseURL(), httpClient)
+            .withDefaultCollection(clients.getFirst().getDefaultCollection())
             .withQueueSize(8)
             .withThreadCount(2)
-            .withConnectionTimeout(10000, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(clientSoTimeout, TimeUnit.MILLISECONDS)
             .build();
   }
 
@@ -127,9 +128,8 @@ private void changeUrlOnError(Exception e) {
       cusc.shutdownNow();
       cusc =
           new ErrorLoggingConcurrentUpdateSolrClient.Builder(
-                  ((HttpApacheSolrClient) clients.get(clientIndex)).getBaseURL())
+                  clients.get(clientIndex).getBaseURL(), httpClient)
               .withDefaultCollection(clients.get(clientIndex).getDefaultCollection())
-              .withHttpClient(httpClient)
               .withQueueSize(30)
               .withThreadCount(3)
               .build();
@@ -163,7 +163,7 @@ public Set<String> getDeleteFails() {
     throw new UnsupportedOperationException();
   }
 
-  static class ErrorLoggingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient {
+  static class ErrorLoggingConcurrentUpdateSolrClient extends ConcurrentUpdateJettySolrClient {
     public ErrorLoggingConcurrentUpdateSolrClient(Builder builder) {
       super(builder);
     }
@@ -173,10 +173,10 @@ public void handleError(Throwable ex) {
       log.warn("cusc error", ex);
     }
 
-    static class Builder extends ConcurrentUpdateSolrClient.Builder {
+    static class Builder extends ConcurrentUpdateJettySolrClient.Builder {
 
-      public Builder(String baseSolrUrl) {
-        super(baseSolrUrl);
+      public Builder(String baseSolrUrl, HttpJettySolrClient jettySolrClient) {
+        super(baseSolrUrl, jettySolrClient);
       }
 
       @Override

From 00f488a420b5b493c7dbfc1d753fde4c824e49a6 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Mon, 11 May 2026 10:59:47 -0400
Subject: [PATCH 15/27] withHttpClient takes baseSolrUrl

---
 .../java/org/apache/solr/client/solrj/impl/HttpSolrClient.java | 3 +++
 .../java/org/apache/solr/client/solrj/util/ClientUtils.java    | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
index 93ae9e332f15..7c197323a4b1 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
@@ -465,6 +465,9 @@ public abstract static class BuilderBase<B extends BuilderBase<?, ?>, C extends
      */
     @SuppressWarnings("unchecked")
     public B withHttpClient(C httpSolrClient) {
+      if (this.baseSolrUrl == null) {
+        this.baseSolrUrl = httpSolrClient.getBaseURL();
+      }
       if (this.basicAuthAuthorizationStr == null) {
         this.basicAuthAuthorizationStr = httpSolrClient.basicAuthAuthorizationStr;
       }
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java b/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
index 60005d50e5a4..bf06c491d032 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.SolrInputField;
@@ -69,7 +70,7 @@ public static String buildRequestUrl(
       SolrRequest<?> solrRequest, String serverRootUrl, String collection)
       throws MalformedURLException {
 
-    String basePath = serverRootUrl;
+    String basePath = Objects.requireNonNull(serverRootUrl);
     if (solrRequest.getApiVersion() == SolrRequest.ApiVersion.V2) {
       basePath = addNormalV2ApiRoot(basePath);
     }

From d7c767a94a57cd6b4b67332e2a2b3359cdb17e25 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 12 May 2026 11:29:21 -0400
Subject: [PATCH 16/27] Tests, switch

---
 .../solr/cli/TestSolrCLIRunExample.java       |   2 +-
 .../solr/cloud/AliasIntegrationTest.java      |   2 +-
 .../solr/cloud/BasicDistributedZkTest.java    |  22 +-
 .../cloud/ChaosMonkeyNothingIsSafeTest.java   |   2 +-
 ...nkeyNothingIsSafeWithPullReplicasTest.java |   2 +-
 .../apache/solr/cloud/ForceLeaderTest.java    |  24 +--
 .../cloud/FullSolrCloudDistribCmdsTest.java   |   7 +-
 .../apache/solr/cloud/HttpPartitionTest.java  |   6 +-
 .../cloud/LeaderElectionContextKeyTest.java   |  54 +++--
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java |  53 +++--
 .../solr/cloud/MultiThreadedOCPTest.java      |  10 +-
 .../cloud/RecoveryStrategyStressTest.java     |  20 +-
 .../org/apache/solr/cloud/RecoveryZkTest.java |  19 +-
 .../solr/cloud/RecoveryZkTestWithAuth.java    |  27 +--
 .../org/apache/solr/cloud/RouteFieldTest.java |  13 +-
 .../apache/solr/cloud/SSLMigrationTest.java   |  14 +-
 .../cloud/TestAuthenticationFramework.java    |  10 +-
 .../solr/cloud/TestCloudConsistency.java      |  15 +-
 .../TestLeaderElectionWithEmptyReplica.java   |  11 +-
 .../solr/cloud/TestRandomFlRTGCloud.java      |  29 +--
 .../cloud/TestRandomRequestDistribution.java  |  72 ++++---
 .../solr/cloud/UnloadDistributedZkTest.java   |  98 ++++-----
 .../CollectionsAPIAsyncDistributedZkTest.java |  81 ++++----
 .../cloud/api/collections/ShardSplitTest.java |  39 +---
 .../TestRequestStatusCollectionAPI.java       |  12 +-
 .../handler/TestReplicationHandlerBackup.java |  11 +-
 .../apache/solr/handler/TestRestoreCore.java  |  13 +-
 .../handler/admin/CoreAdminHandlerTest.java   | 110 +++-------
 .../admin/ShowFileRequestHandlerTest.java     |  11 +
 .../handler/admin/ZookeeperReadAPITest.java   | 172 +++++++---------
 .../ZookeeperStatusHandlerFailureTest.java    |  23 +--
 .../admin/ZookeeperStatusHandlerTest.java     |  32 +--
 ...istributedQueryElevationComponentTest.java |  36 ++--
 .../handler/component/SearchHandlerTest.java  |  42 ++--
 .../TestPrometheusResponseWriter.java         |   2 +
 .../solr/schema/TestCloudManagedSchema.java   |  32 ++-
 .../org/apache/solr/search/TestSolrJ.java     | 188 ------------------
 .../security/BasicAuthIntegrationTest.java    |   7 +-
 .../update/DeleteByIdWithRouterFieldTest.java |  14 +-
 .../solr/update/SolrCmdDistributorTest.java   |   5 +-
 .../update/TestInPlaceUpdatesDistrib.java     |  24 +--
 .../apache/solr/util/TestCborDataFormat.java  |   6 +-
 ...estSimplePropagatorDistributedTracing.java |  11 +-
 .../opentelemetry/TestDistributedTracing.java |  36 +++-
 .../HttpJettySolrClientCompatibilityTest.java |  12 +-
 ...eemptiveBasicAuthClientCustomizerTest.java |  14 +-
 .../solrj/io/graph/GraphExpressionTest.java   |  25 +--
 .../impl/CollectionScopedSolrClient.java      |  55 +++++
 .../client/solrj/SolrExampleBinaryTest.java   |   6 +-
 .../client/solrj/SolrExampleCborTest.java     |   6 +-
 .../solr/client/solrj/SolrExampleTests.java   |   6 +-
 .../solr/client/solrj/SolrExampleXMLTest.java |   6 +-
 .../solr/client/solrj/TestBatchUpdate.java    |  11 +-
 .../client/solrj/TestSolrJErrorHandling.java  |   8 +-
 .../SolrExampleStreamingBinaryTest.java       |  12 +-
 .../embedded/SolrExampleStreamingTest.java    |  35 ++--
 .../CloudHttp2SolrClientBadInputTest.java     |   2 +-
 .../solrj/impl/CloudHttp2SolrClientTest.java  |   3 +-
 .../solrj/impl/CloudSolrClientCacheTest.java  |  17 +-
 .../impl/LBHttpSolrClientBadInputTest.java    |   7 +-
 .../SendUpdatesToLeadersOverrideTest.java     |  29 ---
 .../client/solrj/request/TestV2Request.java   |  31 ++-
 .../InputStreamResponseParserTest.java        |   5 +-
 .../solrj/response/TestSuggesterResponse.java |   6 +-
 .../java/org/apache/solr/SolrTestCaseJ4.java  |  68 ++-----
 .../cloud/AbstractFullDistribZkTestBase.java  |  66 +++---
 .../solr/cloud/MiniSolrCloudCluster.java      |  21 +-
 .../AbstractCloudBackupRestoreTestCase.java   |  27 +--
 .../apache/solr/embedded/JettySolrRunner.java |  23 +--
 .../org/apache/solr/util/SocketProxy.java     |   2 +
 .../apache/solr/util/SolrJettyTestRule.java   |   5 +-
 71 files changed, 718 insertions(+), 1209 deletions(-)
 delete mode 100644 solr/core/src/test/org/apache/solr/search/TestSolrJ.java
 rename solr/{solrj/src/test/org/apache/solr/client/solrj/impl => solrj-jetty/src/test/org/apache/solr/client/solrj/jetty}/PreemptiveBasicAuthClientCustomizerTest.java (88%)
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/impl/CollectionScopedSolrClient.java

diff --git a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java
index ad9660080ca3..7a7f105c0848 100644
--- a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java
+++ b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java
@@ -475,7 +475,7 @@ public void testInteractiveSolrCloudExample() throws Exception {
 
     // index some docs - to verify all is good for both shards
     try (CloudSolrClient cloudClient =
-        new RandomizingCloudHttp2SolrClientBuilder(
+        new RandomizingCloudSolrClientBuilder(
                 List.of(executor.solrCloudCluster.getZkServer().getZkAddress()), Optional.empty())
             .withDefaultCollection(collectionName)
             .build()) {
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 18e4d92ba4b6..423ffaa03540 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
@@ -938,7 +938,7 @@ private void searchSeveralWays(
     } else {
       // new CloudSolrClient (random shardLeadersOnly)
 
-      RandomizingCloudSolrClientBuilder builder = new RandomizingCloudSolrClientBuilder(cluster);
+      var builder = new RandomizingCloudSolrClientBuilder(cluster);
       boolean useDefaultCollection = random().nextBoolean();
       try (CloudSolrClient solrClient =
           useDefaultCollection
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
index 417969992a0b..16031370fc3b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
@@ -1150,7 +1150,7 @@ protected CollectionAdminResponse createCollection(
     if (client == null) {
       final String baseUrl = clients.get(clientIndex).getBaseURL();
 
-      try (SolrClient aClient = createNewSolrClient("", baseUrl)) {
+      try (SolrClient aClient = createNewSolrClient(baseUrl, null)) {
         res.setResponse(aClient.request(request));
       }
     } else {
@@ -1313,7 +1313,7 @@ private void testANewCollectionInOneInstanceWithManualShardAssignement() throws
               .setNode(jettys.get(0).getNodeName())
               .process(cloudClient);
       for (String coreName : resp.getCollectionCoresStatus().keySet()) {
-        collectionClients.add(createNewSolrClient(coreName, jettys.get(0).getBaseUrl().toString()));
+        collectionClients.add(createNewSolrClient(jettys.get(0).getBaseUrl().toString(), coreName));
       }
     }
 
@@ -1426,7 +1426,7 @@ private void testSearchByCollectionName() throws SolrServerException, IOExceptio
 
     // the cores each have different names, but if we add the collection name to the url
     // we should get mapped to the right core
-    try (SolrClient client1 = createNewSolrClient(oneInstanceCollection, baseUrl)) {
+    try (SolrClient client1 = createNewSolrClient(baseUrl, oneInstanceCollection)) {
       SolrQuery query = new SolrQuery("*:*");
       long oneDocs = client1.query(query).getResults().getNumFound();
       assertEquals(3, oneDocs);
@@ -1440,7 +1440,7 @@ private void testUpdateByCollectionName() throws SolrServerException, IOExceptio
     // the cores each have different names, but if we add the collection name to the url
     // we should get mapped to the right core
     // test hitting an update url
-    try (SolrClient client1 = createNewSolrClient(oneInstanceCollection, baseUrl)) {
+    try (SolrClient client1 = createNewSolrClient(baseUrl, oneInstanceCollection)) {
       client1.commit();
     }
   }
@@ -1454,7 +1454,7 @@ private void testANewCollectionInOneInstance() throws Exception {
     assertEquals(0, response.getStatus());
     List<SolrClient> collectionClients = new ArrayList<>();
     for (String coreName : response.getCollectionCoresStatus().keySet()) {
-      collectionClients.add(createNewSolrClient(coreName, jettys.get(0).getBaseUrl().toString()));
+      collectionClients.add(createNewSolrClient(jettys.get(0).getBaseUrl().toString(), coreName));
     }
 
     SolrClient client1 = collectionClients.get(0);
@@ -1528,7 +1528,7 @@ private void createSolrCore(
 
     pending.add(completionService.submit(call));
 
-    collectionClients.add(createNewSolrClient(collection + num, baseUrl));
+    collectionClients.add(createNewSolrClient(baseUrl, collection + num));
   }
 
   private void testMultipleCollections() throws Exception {
@@ -1650,7 +1650,7 @@ private void createNewCollection(final String collection) throws InterruptedExce
             return null;
           };
 
-      collectionClients.add(createNewSolrClient(collection, runner.getBaseUrl().toString()));
+      collectionClients.add(createNewSolrClient(runner.getBaseUrl().toString(), collection));
       pending.add(completionService.submit(call));
       while (pending != null && pending.size() > 0) {
 
@@ -1661,14 +1661,6 @@ private void createNewCollection(final String collection) throws InterruptedExce
     }
   }
 
-  @Override
-  protected SolrClient createNewSolrClient(String collection, String baseUrl) {
-
-    SolrClient client = getHttpSolrClient(baseUrl, collection);
-
-    return client;
-  }
-
   @Override
   protected QueryResponse queryRandomShard(ModifiableSolrParams params)
       throws SolrServerException, IOException {
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
index 8e91990844b1..03c2bac7a3d9 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
@@ -132,7 +132,7 @@ protected CloudSolrClient createCloudClient(String defaultCollection) {
 
   protected CloudSolrClient createCloudClient(String defaultCollection, int socketTimeout) {
 
-    return getCloudSolrClient(
+    return createNewCloudSolrClient(
         zkServer.getZkAddress(), defaultCollection, random().nextBoolean(), 30000, socketTimeout);
   }
 
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 16e800a93bed..e80b765af89f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java
@@ -143,7 +143,7 @@ protected CloudSolrClient createCloudClient(String defaultCollection) {
   }
 
   protected CloudSolrClient createCloudClient(String defaultCollection, int socketTimeout) {
-    return getCloudSolrClient(
+    return createNewCloudSolrClient(
         zkServer.getZkAddress(), defaultCollection, random().nextBoolean(), 30000, socketTimeout);
   }
 
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 e5c32a3a257b..a14af61f4b5a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
@@ -20,10 +20,8 @@
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.common.SolrException;
@@ -43,6 +41,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+// nocommit fails
 @Nightly // this test is currently too slow for non-nightly
 public class ForceLeaderTest extends HttpPartitionTest {
   public static final String TEST_COLLECTION = "forceleader_lower_terms_collection";
@@ -193,19 +192,11 @@ public void testReplicasInLowerTerms() throws Exception {
     }
   }
 
-  /**
-   * For this test, we need a cloudClient that is not randomized since we need to NEVER send the
-   * updates only to the leader. The way the RandomizingCloudSolrClientBuilder works, you can't
-   * avoid its internal decision-making process to sometimes send updates only to leaders. We
-   * override the definition of this class in AbstractFullDistribZkTestBase to make sure we always
-   * use DEFAULT_COLLECTION defined in ForceLeaderTest.
-   */
   @Override
   protected CloudSolrClient createCloudClient(String defaultCollection) {
-    CloudLegacySolrClient.Builder builder =
-        new CloudLegacySolrClient.Builder(List.of(zkServer.getZkAddress()), Optional.empty());
-    builder.withDefaultCollection(TEST_COLLECTION);
-    return builder.withConnectionTimeout(30000).withSocketTimeout(120000).build();
+    boolean shardLeadersOnly = false; // this test requires we use any replica
+    return createNewCloudSolrClient(
+        zkServer.getZkHost(), TEST_COLLECTION, shardLeadersOnly, 30_000, 120_000);
   }
 
   private void putNonLeadersIntoLowerTerm(
@@ -321,11 +312,8 @@ private void doForceLeader(String collectionName, String shard)
     CollectionAdminRequest.ForceLeader forceLeader =
         CollectionAdminRequest.forceLeaderElection(collectionName, shard);
 
-    try (CloudSolrClient cloudClient =
-        new CloudLegacySolrClient.Builder(List.of(zkServer.getZkAddress()), Optional.empty())
-            .withConnectionTimeout(3000)
-            .withSocketTimeout(60000)
-            .build()) {
+    try (var cloudClient =
+        createNewCloudSolrClient(zkServer.getZkHost(), null, true, 3_000, 60_000)) {
       cloudClient.request(forceLeader);
     }
   }
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 d0d10fda0297..cb5bee468783 100644
--- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
@@ -29,8 +29,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.jetty.ConcurrentUpdateJettySolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -816,8 +816,9 @@ public void testConcurrentIndexing() throws Exception {
 
     final int numDocs = atLeast(50);
     final JettySolrRunner nodeToUpdate = cluster.getRandomJetty(random());
-    try (ConcurrentUpdateSolrClient indexClient =
-        new ConcurrentUpdateSolrClient.Builder(nodeToUpdate.getProxyBaseUrl().toString())
+    try (var indexClient =
+        new ConcurrentUpdateJettySolrClient.Builder(
+                nodeToUpdate.getProxyBaseUrl().toString(), nodeToUpdate.getSolrClient(), false)
             .withDefaultCollection(collectionName)
             .withQueueSize(10)
             .withThreadCount(2)
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 f1fb1a79de1b..76f41dd0e1cd 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -36,7 +36,6 @@
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.common.SolrException;
@@ -521,10 +520,7 @@ protected SolrClient getHttpSolrClient(Replica replica, String collection) {
   // Send doc directly to a server (without going through proxy)
   protected int sendDoc(String collectionName, int docId, JettySolrRunner leaderJetty)
       throws IOException, SolrServerException {
-    try (SolrClient solrClient =
-        new HttpApacheSolrClient.Builder(leaderJetty.getBaseUrl().toString()).build()) {
-      return sendDoc(docId, solrClient, collectionName);
-    }
+    return sendDoc(docId, leaderJetty.getSolrClient(), collectionName);
   }
 
   protected int sendDoc(String collectionName, int docId) throws Exception {
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 f0c2dd11a431..9b1faef7fe74 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,6 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.common.cloud.ClusterState;
@@ -92,37 +91,32 @@ public void test()
     Replica replica = clusterState.getCollection(TEST_COLLECTION_1).getLeader(shard);
     assertNotNull(replica);
 
-    try (SolrClient shardLeaderClient =
-        new HttpApacheSolrClient.Builder(replica.get("base_url").toString()).build()) {
-      assertEquals(
-          1L, getElectionNodes(TEST_COLLECTION_1, shard, stateReader.getZkClient()).size());
-      List<String> collection2Shard1Nodes =
-          getElectionNodes(TEST_COLLECTION_2, "shard1", stateReader.getZkClient());
-      List<String> collection2Shard2Nodes =
-          getElectionNodes(TEST_COLLECTION_2, "shard2", stateReader.getZkClient());
-      CoreAdminRequest.unloadCore(replica.getCoreName(), shardLeaderClient);
-      // Waiting for leader election being kicked off
-      long timeout = System.nanoTime() + TimeUnit.NANOSECONDS.convert(60, TimeUnit.SECONDS);
-      boolean found = false;
-      while (System.nanoTime() < timeout) {
-        try {
-          found = getElectionNodes(TEST_COLLECTION_1, shard, stateReader.getZkClient()).size() == 0;
-          break;
-        } catch (KeeperException.NoNodeException nne) {
-          // ignore
-        }
+    SolrClient shardLeaderClient = cluster.getReplicaJetty(replica).getSolrClient();
+    assertEquals(1L, getElectionNodes(TEST_COLLECTION_1, shard, stateReader.getZkClient()).size());
+    List<String> collection2Shard1Nodes =
+        getElectionNodes(TEST_COLLECTION_2, "shard1", stateReader.getZkClient());
+    List<String> collection2Shard2Nodes =
+        getElectionNodes(TEST_COLLECTION_2, "shard2", stateReader.getZkClient());
+    CoreAdminRequest.unloadCore(replica.getCoreName(), shardLeaderClient);
+    // Waiting for leader election being kicked off
+    long timeout = System.nanoTime() + TimeUnit.NANOSECONDS.convert(60, TimeUnit.SECONDS);
+    boolean found = false;
+    while (System.nanoTime() < timeout) {
+      try {
+        found = getElectionNodes(TEST_COLLECTION_1, shard, stateReader.getZkClient()).size() == 0;
+        break;
+      } catch (KeeperException.NoNodeException nne) {
+        // ignore
       }
-      assertTrue(found);
-      // There are no leader election was kicked off on testCollection2
-      assertThat(
-          collection2Shard1Nodes,
-          CoreMatchers.is(
-              getElectionNodes(TEST_COLLECTION_2, "shard1", stateReader.getZkClient())));
-      assertThat(
-          collection2Shard2Nodes,
-          CoreMatchers.is(
-              getElectionNodes(TEST_COLLECTION_2, "shard2", stateReader.getZkClient())));
     }
+    assertTrue(found);
+    // There are no leader election was kicked off on testCollection2
+    assertThat(
+        collection2Shard1Nodes,
+        CoreMatchers.is(getElectionNodes(TEST_COLLECTION_2, "shard1", stateReader.getZkClient())));
+    assertThat(
+        collection2Shard2Nodes,
+        CoreMatchers.is(getElectionNodes(TEST_COLLECTION_2, "shard2", stateReader.getZkClient())));
   }
 
   private List<String> getElectionNodes(String collection, String shard, SolrZkClient client)
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 13184460f5e1..d00190cfe531 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
@@ -31,7 +31,6 @@
 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.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.common.SolrInputDocument;
@@ -291,48 +290,47 @@ public void testMostInSyncReplicasCanWinElection() throws Exception {
 
   private void addDoc(String collection, int docId, JettySolrRunner solrRunner)
       throws IOException, SolrServerException {
-    try (SolrClient solrClient =
-        new HttpApacheSolrClient.Builder(solrRunner.getBaseUrl().toString()).build()) {
-      solrClient.add(collection, new SolrInputDocument("id", String.valueOf(docId)));
-      solrClient.commit(collection);
-    }
+    var solrClient = solrRunner.getSolrClient();
+    solrClient.add(collection, new SolrInputDocument("id", String.valueOf(docId)));
+    solrClient.commit(collection);
   }
 
   private void assertDocsExistInAllReplicas(
       List<Replica> notLeaders, String testCollectionName, int firstDocId, int lastDocId)
       throws Exception {
     Replica leader = cluster.getZkStateReader().getLeaderRetry(testCollectionName, "shard1", 10000);
-    SolrClient leaderSolr = getSolrClient(leader, testCollectionName);
+    SolrClient leaderSolr = getJettyForReplica(leader).getSolrClient();
     List<SolrClient> replicas = new ArrayList<>(notLeaders.size());
 
     for (Replica r : notLeaders) {
-      replicas.add(getSolrClient(r, testCollectionName));
+      replicas.add(getJettyForReplica(r).getSolrClient());
     }
-    try {
-      for (int d = firstDocId; d <= lastDocId; d++) {
-        String docId = String.valueOf(d);
-        assertDocExists(leaderSolr, docId);
-        for (SolrClient replicaSolr : replicas) {
-          assertDocExists(replicaSolr, docId);
-        }
-      }
-    } finally {
-      if (leaderSolr != null) {
-        leaderSolr.close();
-      }
+    for (int d = firstDocId; d <= lastDocId; d++) {
+      String docId = String.valueOf(d);
+      assertDocExists(leaderSolr, testCollectionName, docId);
       for (SolrClient replicaSolr : replicas) {
-        replicaSolr.close();
+        assertDocExists(replicaSolr, testCollectionName, docId);
       }
     }
   }
 
-  private void assertDocExists(SolrClient solr, String docId) throws Exception {
-    NamedList<?> rsp = realTimeGetDocId(solr, docId);
+  private JettySolrRunner getJettyForReplica(Replica replica) {
+    return cluster.getJettySolrRunners().stream()
+        .filter(j -> j.getNodeName().equals(replica.getNodeName()))
+        .findFirst()
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    "Cannot find Jetty for replica node: " + replica.getNodeName()));
+  }
+
+  private void assertDocExists(SolrClient solr, String collection, String docId) throws Exception {
+    NamedList<?> rsp = realTimeGetDocId(solr, collection, docId);
     String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);
     assertNull("Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match);
   }
 
-  private NamedList<Object> realTimeGetDocId(SolrClient solr, String docId)
+  private NamedList<Object> realTimeGetDocId(SolrClient solr, String collection, String docId)
       throws SolrServerException, IOException {
     return solr.request(
         new GenericSolrRequest(
@@ -340,10 +338,7 @@ private NamedList<Object> realTimeGetDocId(SolrClient solr, String docId)
                 "/get",
                 SolrRequestType.QUERY,
                 params("id", docId, "distrib", "false"))
-            .setRequiresCollection(true));
-  }
-
-  protected SolrClient getSolrClient(Replica replica, String coll) {
-    return getHttpSolrClient(replica.getBaseUrl(), coll);
+            .setRequiresCollection(true),
+        collection);
   }
 }
diff --git a/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java b/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java
index 6a8e56cbb514..38f629245692 100644
--- a/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java
@@ -51,7 +51,7 @@ public MultiThreadedOCPTest() {
 
   @Test
   public void testFillWorkQueue() throws Exception {
-    try (SolrClient client = createNewSolrClient("", getBaseUrl(jettys.get(0)))) {
+    try (SolrClient client = createNewSolrClient(getBaseUrl(jettys.get(0)), null)) {
       // This test does not make sense when the Collection API execution is distributed. There is no
       // queue to fill
       if (!new CollectionAdminRequest.RequestApiDistributedProcessing()
@@ -147,7 +147,7 @@ private Long waitForTaskToCompleted(SolrClient client, int requestId) throws Exc
   @Test
   public void testParallelCollectionAPICalls() throws IOException, SolrServerException {
     final int ASYNC_SHIFT = 10000;
-    try (SolrClient client = createNewSolrClient("", getBaseUrl(jettys.get(0)))) {
+    try (SolrClient client = createNewSolrClient(getBaseUrl(jettys.get(0)), null)) {
       for (int i = 1 + ASYNC_SHIFT; i <= NUM_COLLECTIONS + ASYNC_SHIFT; i++) {
         CollectionAdminRequest.createCollection("ocptest" + i, "conf1", 3, 1)
             .processAsync(String.valueOf(i), client);
@@ -188,7 +188,7 @@ public void testParallelCollectionAPICalls() throws IOException, SolrServerExcep
 
   @Test
   public void testTaskExclusivity() throws Exception, SolrServerException {
-    try (SolrClient client = createNewSolrClient("", getBaseUrl(jettys.get(0)))) {
+    try (SolrClient client = createNewSolrClient(getBaseUrl(jettys.get(0)), null)) {
 
       Create createCollectionRequest =
           CollectionAdminRequest.createCollection("ocptest_shardsplit", "conf1", 4, 1);
@@ -246,7 +246,7 @@ public void testTaskExclusivity() throws Exception, SolrServerException {
 
   @Test
   public void testDeduplicationOfSubmittedTasks() throws IOException, SolrServerException {
-    try (SolrClient client = createNewSolrClient("", getBaseUrl(jettys.get(0)))) {
+    try (SolrClient client = createNewSolrClient(getBaseUrl(jettys.get(0)), null)) {
       CollectionAdminRequest.createCollection("ocptest_shardsplit2", "conf1", 3, 1).process(client);
 
       SplitShard splitShardRequest =
@@ -300,7 +300,7 @@ public void run() {
           }
         };
     indexThread.start();
-    try (SolrClient client = createNewSolrClient("", getBaseUrl(jettys.get(0)))) {
+    try (SolrClient client = createNewSolrClient(getBaseUrl(jettys.get(0)), null)) {
 
       SplitShard splitShardRequest =
           CollectionAdminRequest.splitShard("collection1").setShardName(SHARD1);
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 9737d77c81a2..67c143b240fa 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.java
@@ -24,10 +24,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.apache.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
-import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.Replica;
@@ -114,15 +111,14 @@ private void assertShardConsistency(Slice shard, boolean expectDocs) throws Exce
     long[] numCounts = new long[replicas.size()];
     int i = 0;
     for (Replica replica : replicas) {
-      try (var client =
-          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
-              .withDefaultCollection(replica.getCoreName())
-              .withHttpClient(((CloudLegacySolrClient) cluster.getSolrClient()).getHttpClient())
-              .build()) {
-        numCounts[i] =
-            client.query(new SolrQuery("*:*").add("distrib", "false")).getResults().getNumFound();
-        i++;
-      }
+      numCounts[i] =
+          cluster
+              .getReplicaJetty(replica)
+              .getSolrClient()
+              .query(replica.getCoreName(), params("q", "*:*", "distrib", "false"))
+              .getResults()
+              .getNumFound();
+      i++;
     }
     for (int j = 1; j < replicas.size(); j++) {
       if (numCounts[j] != numCounts[j - 1])
diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
index 9559539861fa..24383d8d317c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
@@ -21,10 +21,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
-import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.Replica;
@@ -137,15 +134,13 @@ private void assertShardConsistency(Slice shard, boolean expectDocs) throws Exce
     long[] numCounts = new long[replicas.size()];
     int i = 0;
     for (Replica replica : replicas) {
-      try (var client =
-          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
-              .withDefaultCollection(replica.getCoreName())
-              .withHttpClient(((CloudLegacySolrClient) cluster.getSolrClient()).getHttpClient())
-              .build()) {
-        numCounts[i] =
-            client.query(new SolrQuery("*:*").add("distrib", "false")).getResults().getNumFound();
-        i++;
-      }
+      numCounts[i++] =
+          cluster
+              .getReplicaJetty(replica)
+              .getSolrClient()
+              .query(replica.getCoreName(), params("q", "*:*", "distrib", "false"))
+              .getResults()
+              .getNumFound();
     }
     for (int j = 1; j < replicas.size(); j++) {
       if (numCounts[j] != numCounts[j - 1])
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 85a901dbc8b6..111bcaea8b76 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java
@@ -18,22 +18,17 @@
 
 import static org.apache.solr.client.solrj.response.RequestStatusState.COMPLETED;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrResponse;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.jetty.PreemptiveBasicAuthClientCustomizer;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.request.UpdateRequest;
-import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.RequestStatusState;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.Replica;
@@ -66,11 +61,6 @@ private <T extends SolrRequest<? extends SolrResponse>> T withBasicAuth(T req) {
     return req;
   }
 
-  private QueryResponse queryWithBasicAuth(SolrClient client, SolrQuery q)
-      throws IOException, SolrServerException {
-    return withBasicAuth(new QueryRequest(q)).process(client);
-  }
-
   @Test
   public void testRecoveryWithAuthEnabled() throws Exception {
     final String collection = "recoverytestwithauth";
@@ -110,16 +100,13 @@ private void assertShardConsistency(Slice shard, boolean expectDocs) throws Exce
     long[] numCounts = new long[replicas.size()];
     int i = 0;
     for (Replica replica : replicas) {
-      try (var client =
-          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
-              .withDefaultCollection(replica.getCoreName())
-              .withHttpClient(((CloudLegacySolrClient) cluster.getSolrClient()).getHttpClient())
-              .build()) {
-        var q = new SolrQuery("*:*");
-        q.add("distrib", "false");
-        numCounts[i] = queryWithBasicAuth(client, q).getResults().getNumFound();
-        i++;
-      }
+      var client = cluster.getReplicaJetty(replica).getSolrClient();
+      var q = new SolrQuery("q", "*:*", "distrib", "false");
+      numCounts[i++] =
+          withBasicAuth(new QueryRequest(q))
+              .process(client, replica.getCoreName())
+              .getResults()
+              .getNumFound();
     }
     for (int j = 1; j < replicas.size(); j++) {
       if (numCounts[j] != numCounts[j - 1])
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 e75c933caa18..fbc789ed2f58 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java
@@ -26,7 +26,6 @@
 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.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -174,11 +173,13 @@ private void compareShardDocs(String urlId, String urlRoute)
 
   private SolrDocumentList getDocsMatching(String coreUrl, QueryRequest request)
       throws IOException, SolrServerException {
-    final var baseUrl = URLUtil.extractBaseUrl(coreUrl);
     final var coreName = URLUtil.extractCoreFromCoreUrl(coreUrl);
-    try (SolrClient solrClient =
-        new HttpApacheSolrClient.Builder(baseUrl).withDefaultCollection(coreName).build()) {
-      return (SolrDocumentList) solrClient.request(request).get("response");
-    }
+    SolrClient solrClient =
+        cluster.getJettySolrRunners().stream()
+            .filter(j -> coreUrl.startsWith(j.getBaseUrl().toString()))
+            .findFirst()
+            .orElseThrow()
+            .getSolrClient();
+    return request.process(solrClient, coreName).getResults();
   }
 }
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 bbdfecf34753..3687371b1ca3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java
@@ -23,9 +23,9 @@
 import java.util.Properties;
 import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
-import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.apache.HttpClientUtil;
-import org.apache.solr.client.solrj.apache.LBHttpSolrClient;
+import org.apache.solr.client.solrj.impl.LBSolrClient;
+import org.apache.solr.client.solrj.jetty.LBJettySolrClient;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.Replica;
@@ -128,12 +128,14 @@ private void setUrlScheme(String value) throws Exception {
     QueryRequest request = new QueryRequest(params);
     request.setPath("/admin/collections");
 
-    String[] urls =
+    LBSolrClient.Endpoint[] urls =
         getReplicas().stream()
             .map(r -> r.getStr(ZkStateReader.BASE_URL_PROP))
-            .toArray(String[]::new);
-    // Create new SolrServer to configure new HttpClient w/ SSL config
-    try (SolrClient client = new LBHttpSolrClient.Builder().withBaseEndpoints(urls).build()) {
+            .map(LBSolrClient.Endpoint::new)
+            .toArray(LBSolrClient.Endpoint[]::new);
+    // Create new HttpClient w/ SSL config
+    try (var client =
+        new LBJettySolrClient.Builder(jettys.getFirst().getSolrClient(), urls).build()) {
       client.request(request);
     }
   }
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 6a90af12d04f..130e288ee960 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
@@ -21,7 +21,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import java.lang.invoke.MethodHandles;
 import java.util.Map;
-import org.apache.solr.client.solrj.RemoteSolrException;
+import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
@@ -70,9 +70,11 @@ public void testBasics() throws Exception {
 
     // Should fail with 401
     try {
-      RemoteSolrException e =
-          expectThrows(RemoteSolrException.class, this::collectionCreateSearchDeleteTwice);
-      assertTrue("Should've returned a 401 error", e.getMessage().contains("Error 401"));
+      SolrServerException e =
+          expectThrows(SolrServerException.class, this::collectionCreateSearchDeleteTwice);
+      assertTrue(
+          "Should've returned a 401 error",
+          e.getMessage().contains("401") || e.getMessage().contains("Authentication"));
     } finally {
       MockAuthenticationPlugin.expectedUsername = null;
       MockAuthenticationPlugin.expectedPassword = null;
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 dc4a6edb094b..9041d42555d0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java
@@ -32,7 +32,6 @@
 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.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.common.SolrInputDocument;
@@ -297,13 +296,13 @@ private void addDocs(String collection, int numDocs, int startId)
 
   private void addDoc(String collection, int docId, JettySolrRunner solrRunner)
       throws IOException, SolrServerException {
-    try (SolrClient solrClient =
-        new HttpApacheSolrClient.Builder(solrRunner.getBaseUrl().toString()).build()) {
-      solrClient.add(
-          collection,
-          new SolrInputDocument("id", String.valueOf(docId), "fieldName_s", String.valueOf(docId)));
-      solrClient.commit(collection);
-    }
+    solrRunner
+        .getSolrClient()
+        .add(
+            collection,
+            new SolrInputDocument(
+                "id", String.valueOf(docId), "fieldName_s", String.valueOf(docId)));
+    solrRunner.getSolrClient().commit(collection);
   }
 
   private void assertDocsExistInAllReplicas(
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 95dd6684cba4..e9cb371f25a8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java
@@ -22,8 +22,6 @@
 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.apache.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
@@ -116,12 +114,9 @@ private static int assertConsistentReplicas(CloudSolrClient cloudClient, Slice s
     long numFound = Long.MIN_VALUE;
     int count = 0;
     for (Replica replica : shard.getReplicas()) {
-      SolrClient client =
-          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
-              .withDefaultCollection(replica.getCoreName())
-              .withHttpClient(((CloudLegacySolrClient) cloudClient).getHttpClient())
-              .build();
-      QueryResponse response = client.query(new SolrQuery("q", "*:*", "distrib", "false"));
+      SolrClient client = cluster.getReplicaJetty(replica).getSolrClient();
+      QueryResponse response =
+          client.query(replica.getCoreName(), params("q", "*:*", "distrib", "false"));
       //      log.info("Found numFound={} on replica: {}", response.getResults().getNumFound(),
       // replica.getCoreUrl());
       if (numFound == Long.MIN_VALUE) {
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 f379cfa1a2ab..53c9fe0b3ac2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
@@ -30,7 +30,6 @@
 import java.util.Random;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -38,8 +37,8 @@
 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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.CollectionScopedSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
@@ -52,7 +51,6 @@
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.IOUtils;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.response.transform.DocTransformer;
@@ -77,9 +75,6 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
   /** A collection specific client for operations at the cloud level */
   private static CloudSolrClient COLLECTION_CLIENT;
 
-  /** We have a map of clients, keyed by base URL */
-  private static final Map<String, SolrClient> CLIENTS = new ConcurrentHashMap<>();
-
   /** Always included in fl, so we can check what doc we're looking at */
   private static final FlValidator ID_VALIDATOR = new SimpleFieldValueValidator("id");
 
@@ -167,7 +162,7 @@ public static void createMiniSolrCloudCluster() throws Exception {
 
     configureCluster(numNodes).addConfig(configName, configDir).configure();
 
-    COLLECTION_CLIENT = cluster.getSolrClient(COLLECTION_NAME);
+    COLLECTION_CLIENT = cluster.getSolrClient(COLLECTION_NAME); // FYI is closed automatically
 
     CollectionAdminRequest.createCollection(COLLECTION_NAME, configName, numShards, repFactor)
         .withProperty("config", "solrconfig-tlog.xml")
@@ -179,14 +174,7 @@ public static void createMiniSolrCloudCluster() throws Exception {
 
   @AfterClass
   public static void afterClass() throws Exception {
-    if (null != COLLECTION_CLIENT) {
-      COLLECTION_CLIENT.close();
-      COLLECTION_CLIENT = null;
-    }
-    for (SolrClient client : CLIENTS.values()) {
-      IOUtils.closeQuietly(client);
-    }
-    CLIENTS.clear();
+    COLLECTION_CLIENT = null;
   }
 
   /**
@@ -420,12 +408,6 @@ private String makeXml(String s) {
     }
   }
 
-  private static SolrClient getSolrClient(final String jettyBaseUrl) {
-    return new HttpApacheSolrClient.Builder(jettyBaseUrl)
-        .withDefaultCollection(COLLECTION_NAME)
-        .build();
-  }
-
   /**
    * Does one or more RTG request for the specified docIds with a randomized fl &amp; fq params,
    * asserting that the returned document (if any) makes sense given the expected SolrInputDocuments
@@ -619,9 +601,8 @@ public static SolrClient getRandomClient(Random rand) {
       // Return the CloudSolrClient, it only uses javabin writerType.
       return COLLECTION_CLIENT;
     } else {
-      JettySolrRunner jetty = jettySolrRunners.get(idx);
-      String jettyBaseUrl = jetty.getBaseUrl().toString();
-      return CLIENTS.computeIfAbsent(jettyBaseUrl, TestRandomFlRTGCloud::getSolrClient);
+      var solrClient = jettySolrRunners.get(idx).getSolrClient();
+      return new CollectionScopedSolrClient(solrClient, COLLECTION_NAME);
     }
   }
 
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 2988cdbe48db..08330e310c2f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java
@@ -29,7 +29,7 @@
 import org.apache.solr.BaseDistributedSearchTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.cloud.overseer.OverseerAction;
@@ -107,44 +107,42 @@ private void testRequestTracking() throws Exception {
     Collection<Replica> replicas = b1x1.getSlice("shard1").getReplicas();
     assertEquals(1, replicas.size());
     String baseUrl = replicas.iterator().next().getBaseUrl();
-    if (!baseUrl.endsWith("/")) baseUrl += "/";
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(baseUrl)
-            .withDefaultCollection("a1x2")
-            .withConnectionTimeout(2000, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(5000, TimeUnit.MILLISECONDS)
-            .build()) {
-
-      long expectedTotalRequests = 0;
-      Set<String> uniqueCoreNames = new LinkedHashSet<>();
-
-      log.info("Making requests to {} a1x2", baseUrl);
-      while (uniqueCoreNames.size() < cores.size() && expectedTotalRequests < 1000L) {
-        expectedTotalRequests++;
-        client.query(new SolrQuery("*:*"));
-
-        double actualTotalRequests = 0;
-        for (Map.Entry<String, SolrCore> entry : cores.entrySet()) {
-          final double coreCount = getSelectRequestCount(entry.getValue());
-          actualTotalRequests += coreCount;
-          if (0 < coreCount) {
-            uniqueCoreNames.add(entry.getKey());
-          }
+    SolrClient client =
+        jettys.stream()
+            .filter(j -> baseUrl.equals(j.getBaseUrl().toString()))
+            .findFirst()
+            .orElseThrow()
+            .getSolrClient();
+
+    long expectedTotalRequests = 0;
+    Set<String> uniqueCoreNames = new LinkedHashSet<>();
+
+    log.info("Making requests to {} a1x2", baseUrl);
+    while (uniqueCoreNames.size() < cores.size() && expectedTotalRequests < 1000L) {
+      expectedTotalRequests++;
+      client.query("a1x2", new SolrQuery("*:*"));
+
+      double actualTotalRequests = 0;
+      for (Map.Entry<String, SolrCore> entry : cores.entrySet()) {
+        final double coreCount = getSelectRequestCount(entry.getValue());
+        actualTotalRequests += coreCount;
+        if (0 < coreCount) {
+          uniqueCoreNames.add(entry.getKey());
         }
-        assertEquals(
-            "Sanity Check: Num Queries So Far Doesn't Match Total????",
-            expectedTotalRequests,
-            (long) actualTotalRequests);
       }
-      log.info("Total requests: {}", expectedTotalRequests);
       assertEquals(
-          "either request randomization code is broken of this test seed is really unlucky, "
-              + "Gave up waiting for requests to hit every core at least once after "
-              + expectedTotalRequests
-              + " requests",
-          uniqueCoreNames.size(),
-          cores.size());
+          "Sanity Check: Num Queries So Far Doesn't Match Total????",
+          expectedTotalRequests,
+          (long) actualTotalRequests);
     }
+    log.info("Total requests: {}", expectedTotalRequests);
+    assertEquals(
+        "either request randomization code is broken of this test seed is really unlucky, "
+            + "Gave up waiting for requests to hit every core at least once after "
+            + expectedTotalRequests
+            + " requests",
+        uniqueCoreNames.size(),
+        cores.size());
   }
 
   /** Asserts that requests against a collection are only served by a 'active' local replica */
@@ -221,10 +219,10 @@ private void testQueryAgainstDownReplica() throws Exception {
     String baseUrl = notLeader.getBaseUrl();
     log.info("Firing queries against path={} and collection=football", baseUrl);
     try (SolrClient client =
-        new HttpApacheSolrClient.Builder(baseUrl)
+        new HttpJettySolrClient.Builder(baseUrl)
             .withDefaultCollection("football")
             .withConnectionTimeout(2000, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(5000, TimeUnit.MILLISECONDS)
+            .withIdleTimeout(5000, TimeUnit.MILLISECONDS)
             .build()) {
 
       SolrCore leaderCore = null;
diff --git a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
index 0766e3412a25..093470a2bb9d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
@@ -33,12 +33,10 @@
 import org.apache.solr.client.solrj.impl.CollectionScopedSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;
-import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.cloud.ZkStateReader;
-import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.SolrNamedThreadFactory;
 import org.apache.solr.core.SolrCore;
@@ -83,16 +81,6 @@ public void test() throws Exception {
     testUnloadShardAndCollection();
   }
 
-  /**
-   * @param url a Solr node base URL. Should <em>not</em> contain a core or collection name.
-   */
-  private SolrClient newSolrClient(String url) {
-    return new HttpApacheSolrClient.Builder(url)
-        .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
-        .withSocketTimeout(30000, TimeUnit.MILLISECONDS)
-        .build();
-  }
-
   private void checkCoreNamePresenceAndSliceCount(
       String collectionName, String coreName, boolean shouldBePresent, int expectedSliceCount)
       throws Exception {
@@ -276,30 +264,22 @@ private void testCoreUnloadAndLeaders() throws Exception {
     // so that we start with some versions when we reload...
     TestInjection.skipIndexWriterCommitOnClose = true;
 
-    try (SolrClient addClient =
-        new HttpApacheSolrClient.Builder(jettys.get(2).getBaseUrl().toString())
-            .withDefaultCollection("unloadcollection_shard1_replica3")
-            .withConnectionTimeout(30000, TimeUnit.MILLISECONDS)
-            .build()) {
-
+    {
       // add a few docs
       for (int x = 20; x < 100; x++) {
         SolrInputDocument doc1 =
             getDoc(id, x, i1, -600, tlong, 600, t1, "humpty dumpy sat on a wall");
-        addClient.add(doc1);
+        jettys.get(2).getSolrClient().add("unloadcollection_shard1_replica3", doc1);
       }
     }
     // don't commit so they remain in the tran log
     // collectionClient.commit();
 
     // unload the leader
-    try (SolrClient collectionClient = newSolrClient(leader.getBaseUrl())) {
-
+    {
       Unload unloadCmd = new Unload(false);
       unloadCmd.setCoreName(leader.getCoreName());
-      ModifiableSolrParams p = (ModifiableSolrParams) unloadCmd.getParams();
-
-      collectionClient.request(unloadCmd);
+      getReplicaNodeClient(leader).request(unloadCmd);
     }
     //    Thread.currentThread().sleep(500);
     //    printLayout();
@@ -317,19 +297,11 @@ private void testCoreUnloadAndLeaders() throws Exception {
     // ensure there is a leader
     zkStateReader.getLeaderRetry("unloadcollection", "shard1", 15000);
 
-    try (SolrClient addClient =
-        new HttpApacheSolrClient.Builder(jettys.get(1).getBaseUrl().toString())
-            .withDefaultCollection("unloadcollection_shard1_replica2")
-            .withConnectionTimeout(30000, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(90000, TimeUnit.MILLISECONDS)
-            .build()) {
-
-      // add a few docs while the leader is down
-      for (int x = 101; x < 200; x++) {
-        SolrInputDocument doc1 =
-            getDoc(id, x, i1, -600, tlong, 600, t1, "humpty dumpy sat on a wall");
-        addClient.add(doc1);
-      }
+    // add a few docs while the leader is down
+    for (int x = 101; x < 200; x++) {
+      SolrInputDocument doc1 =
+          getDoc(id, x, i1, -600, tlong, 600, t1, "humpty dumpy sat on a wall");
+      jettys.get(1).getSolrClient().add("unloadcollection_shard1_replica2", doc1);
     }
 
     assertTrue(
@@ -343,11 +315,10 @@ private void testCoreUnloadAndLeaders() throws Exception {
 
     // unload the leader again
     leader = getLeaderFromZk("unloadcollection", "shard1");
-    try (SolrClient collectionClient = newSolrClient(leader.getBaseUrl())) {
-
+    {
       Unload unloadCmd = new Unload(false);
       unloadCmd.setCoreName(leader.getCoreName());
-      collectionClient.request(unloadCmd);
+      getReplicaNodeClient(leader).request(unloadCmd);
     }
     tries = 50;
     while (leader
@@ -374,32 +345,27 @@ private void testCoreUnloadAndLeaders() throws Exception {
 
     long found1, found3;
 
-    try (SolrClient adminClient =
-        newSolrClient((jettys.get(1).getBaseUrl() + "/unloadcollection_shard1_replica2"))) {
-      adminClient.commit();
-      SolrQuery q = new SolrQuery("*:*");
-      q.set("distrib", false);
-      found1 = adminClient.query(q).getResults().getNumFound();
+    var params = params("q", "*:*", "distrib", "false");
+
+    {
+      SolrClient adminClient = jettys.get(1).getSolrClient();
+      adminClient.commit("unloadcollection_shard1_replica2");
+      found1 =
+          adminClient.query("unloadcollection_shard1_replica2", params).getResults().getNumFound();
     }
 
-    try (SolrClient adminClient =
-        new HttpApacheSolrClient.Builder(jettys.get(2).getBaseUrl().toString())
-            .withDefaultCollection("unloadcollection_shard1_replica3")
-            .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(30000, TimeUnit.MILLISECONDS)
-            .build()) {
-      adminClient.commit();
-      SolrQuery q = new SolrQuery("*:*");
-      q.set("distrib", false);
-      found3 = adminClient.query(q).getResults().getNumFound();
+    {
+      SolrClient adminClient = jettys.get(2).getSolrClient();
+      adminClient.commit("unloadcollection_shard1_replica3");
+      found3 =
+          adminClient.query("unloadcollection_shard1_replica3", params).getResults().getNumFound();
     }
 
-    try (SolrClient adminClient =
-        newSolrClient((jettys.get(3).getBaseUrl() + "/unloadcollection_shard1_replica4"))) {
-      adminClient.commit();
-      SolrQuery q = new SolrQuery("*:*");
-      q.set("distrib", false);
-      long found4 = adminClient.query(q).getResults().getNumFound();
+    {
+      SolrClient adminClient = jettys.get(3).getSolrClient();
+      adminClient.commit("unloadcollection_shard1_replica4");
+      long found4 =
+          adminClient.query("unloadcollection_shard1_replica4", params).getResults().getNumFound();
 
       // all 3 shards should now have the same number of docs
       assertEquals(found1, found3);
@@ -407,6 +373,14 @@ private void testCoreUnloadAndLeaders() throws Exception {
     }
   }
 
+  private SolrClient getReplicaNodeClient(Replica replica) {
+    return jettys.stream()
+        .filter(j -> j.getBaseUrl().toString().equals(replica.getBaseUrl()))
+        .findAny()
+        .orElseThrow()
+        .getSolrClient();
+  }
+
   private void testUnloadLotsOfCores() throws Exception {
     JettySolrRunner jetty = jettys.get(0);
     int shards = TEST_NIGHTLY ? 2 : 1;
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 c38aa3fe7c79..b874181aded5 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,7 +30,6 @@
 import org.apache.solr.client.solrj.RemoteSolrException;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
@@ -234,7 +233,7 @@ public void testAsyncIdRaceCondition() throws Exception {
     SolrClient[] clients = new SolrClient[cluster.getJettySolrRunners().size()];
     int j = 0;
     for (JettySolrRunner r : cluster.getJettySolrRunners()) {
-      clients[j++] = new HttpApacheSolrClient.Builder(r.getBaseUrl().toString()).build();
+      clients[j++] = r.getSolrClient(); // no need to close
     }
     RequestStatusState state =
         CollectionAdminRequest.createCollection("testAsyncIdRaceCondition", "conf1", 1, 1)
@@ -251,51 +250,41 @@ public void testAsyncIdRaceCondition() throws Exception {
     ExecutorService es =
         ExecutorUtil.newMDCAwareFixedThreadPool(
             numThreads, new SolrNamedThreadFactory("testAsyncIdRaceCondition"));
-    try {
-      for (int i = 0; i < numThreads; i++) {
-        es.execute(
-            new Runnable() {
-
-              @Override
-              public void run() {
-                CollectionAdminRequest.Reload reloadCollectionRequest =
-                    CollectionAdminRequest.reloadCollection("testAsyncIdRaceCondition");
-                latch.countDown();
-                try {
-                  latch.await();
-                } catch (InterruptedException e) {
-                  throw new RuntimeException();
-                }
-
-                try {
-                  if (log.isInfoEnabled()) {
-                    log.info("{} - Reloading Collection.", Thread.currentThread().getName());
-                  }
-                  reloadCollectionRequest.processAsync(
-                      "repeatedId", clients[random().nextInt(clients.length)]);
-                  numSuccess.incrementAndGet();
-                } catch (SolrServerException | RemoteSolrException e) {
-                  if (log.isInfoEnabled()) {
-                    log.info("Exception during collection reloading, we were waiting for one: ", e);
-                  }
-                  assertThat(
-                      e.getMessage(),
-                      containsString("Task with the same requestid already exists. (repeatedId)"));
-                  numFailure.incrementAndGet();
-                } catch (IOException e) {
-                  throw new RuntimeException();
-                }
+    for (int i = 0; i < numThreads; i++) {
+      es.execute(
+          () -> {
+            CollectionAdminRequest.Reload reloadCollectionRequest =
+                CollectionAdminRequest.reloadCollection("testAsyncIdRaceCondition");
+            latch.countDown();
+            try {
+              latch.await();
+            } catch (InterruptedException e) {
+              throw new RuntimeException();
+            }
+
+            try {
+              if (log.isInfoEnabled()) {
+                log.info("{} - Reloading Collection.", Thread.currentThread().getName());
               }
-            });
-      }
-      es.shutdown();
-      assertTrue(es.awaitTermination(10, TimeUnit.SECONDS));
-      assertEquals(1, numSuccess.get());
-      assertEquals(numThreads - 1, numFailure.get());
-    } finally {
-      for (SolrClient client : clients) {
-        client.close();
-      }
+              reloadCollectionRequest.processAsync(
+                  "repeatedId", clients[random().nextInt(clients.length)]);
+              numSuccess.incrementAndGet();
+            } catch (SolrServerException | RemoteSolrException e) {
+              if (log.isInfoEnabled()) {
+                log.info("Exception during collection reloading, we were waiting for one: ", e);
+              }
+              assertThat(
+                  e.getMessage(),
+                  containsString("Task with the same requestid already exists. (repeatedId)"));
+              numFailure.incrementAndGet();
+            } catch (IOException e) {
+              throw new RuntimeException();
+            }
+          });
     }
+    es.shutdown();
+    assertTrue(es.awaitTermination(10, TimeUnit.SECONDS));
+    assertEquals(1, numSuccess.get());
+    assertEquals(numThreads - 1, numFailure.get());
   }
 }
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 dfce1569c10a..cc26029cb08a 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
@@ -40,9 +40,8 @@
 import org.apache.solr.client.solrj.RemoteSolrException;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.jetty.CloudJettySolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
@@ -158,7 +157,7 @@ private void doSplitStaticIndexReplication(SolrIndexSplitter.SplitMethod splitMe
         builder
             .withDefaultCollection(collectionName)
             .sendUpdatesOnlyToShardLeaders()
-            .withHttpClient(((CloudLegacySolrClient) cloudClient).getHttpClient())
+            .withHttpClient(((CloudJettySolrClient) cloudClient).getHttpClient())
             .build()) {
       StoppableIndexingThread thread =
           new StoppableIndexingThread(controlClient, client, "i1", true);
@@ -233,19 +232,7 @@ private void doSplitStaticIndexReplication(SolrIndexSplitter.SplitMethod splitMe
               CollectionAdminRequest.addReplicaToShard(collectionName, SHARD1_0);
           // use control client because there are fewer chances of it being the node being restarted
           // this is to avoid flakiness of test because of NoHttpResponseExceptions
-          String control_collection =
-              client
-                  .getClusterState()
-                  .getCollection("control_collection")
-                  .getReplicas()
-                  .get(0)
-                  .getBaseUrl();
-          try (var control =
-              new HttpApacheSolrClient.Builder(control_collection)
-                  .withHttpClient(((CloudLegacySolrClient) client).getHttpClient())
-                  .build()) {
-            state = addReplica.processAndWait(control, 30);
-          }
+          state = addReplica.processAndWait(controlClient, 30);
 
           ZkStateReader.from(cloudClient)
               .waitForState(
@@ -306,11 +293,12 @@ private int assertConsistentReplicas(Slice shard) throws SolrServerException, IO
     int count = 0;
     for (Replica replica : shard.getReplicas()) {
       var client =
-          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
-              .withDefaultCollection(replica.getCoreName())
-              .withHttpClient(((CloudLegacySolrClient) cloudClient).getHttpClient())
-              .build();
-      QueryResponse response = client.query(new SolrQuery("q", "*:*", "distrib", "false"));
+          clients.stream()
+              .filter(c -> c.getBaseURL().equals(replica.getBaseUrl()))
+              .findAny()
+              .orElseThrow();
+      QueryResponse response =
+          client.query(replica.getCoreName(), new SolrQuery("q", "*:*", "distrib", "false"));
       if (log.isInfoEnabled()) {
         log.info(
             "Found numFound={} on replica: {}",
@@ -1282,13 +1270,8 @@ protected void splitShard(
     QueryRequest request = new QueryRequest(params);
     request.setPath("/admin/collections");
 
-    String baseUrl = shardToJetty.get(SHARD1).get(0).jetty.getBaseUrl().toString();
-
-    try (SolrClient baseServer =
-        new HttpApacheSolrClient.Builder(baseUrl)
-            .withConnectionTimeout(30, TimeUnit.SECONDS)
-            .withSocketTimeout(5, TimeUnit.MINUTES)
-            .build()) {
+    JettySolrRunner jetty = shardToJetty.get(SHARD1).getFirst().jetty;
+    try (SolrClient baseServer = jetty.newClient(30_000, 300_000)) {
       NamedList<Object> rsp = baseServer.request(request);
       if (log.isInfoEnabled()) {
         log.info("Shard split response: {}", Utils.toJSONString(rsp));
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 1fd0b32c1247..5f93ef717688 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
@@ -23,11 +23,8 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.RemoteSolrException;
-import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.response.RequestStatusState;
 import org.apache.solr.cloud.BasicDistributedZkTest;
@@ -231,13 +228,6 @@ protected NamedList<Object> sendRequest(ModifiableSolrParams params)
     QueryRequest request = new QueryRequest(params);
     request.setPath("/admin/collections");
 
-    String baseUrl = shardToJetty.get(SHARD1).get(0).jetty.getBaseUrl().toString();
-
-    try (SolrClient baseServer =
-        new HttpApacheSolrClient.Builder(baseUrl)
-            .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
-            .build()) {
-      return baseServer.request(request);
-    }
+    return shardToJetty.get(SHARD1).getFirst().jetty.getSolrClient().request(request);
   }
 }
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 3abf6d9de022..361d7e07d46d 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java
@@ -28,7 +28,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.TimeUnit;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.IndexSearcher;
@@ -40,7 +39,6 @@
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.embedded.JettyConfig;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.junit.After;
@@ -74,13 +72,6 @@ private static JettySolrRunner createAndStartJetty(ReplicationTestHelper.SolrIns
     return jetty;
   }
 
-  private static SolrClient createNewSolrClient(JettySolrRunner jetty) {
-    return new HttpApacheSolrClient.Builder(jetty.getBaseUrl().toString())
-        .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
-        .withSocketTimeout(60000, TimeUnit.MILLISECONDS)
-        .build();
-  }
-
   @Override
   @Before
   public void setUp() throws Exception {
@@ -97,7 +88,7 @@ public void setUp() throws Exception {
     leader.copyConfigFile(CONF_DIR.resolve(configFile).toString(), "solrconfig.xml");
 
     leaderJetty = createAndStartJetty(leader);
-    leaderClient = createNewSolrClient(leaderJetty);
+    leaderClient = leaderJetty.getSolrClient();
     docsSeed = random().nextLong();
   }
 
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 bf951311ea18..a2f79f7f3b1f 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
@@ -23,13 +23,11 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Properties;
-import java.util.concurrent.TimeUnit;
 import org.apache.lucene.index.IndexFileNames;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.embedded.JettyConfig;
 import org.apache.solr.embedded.JettySolrRunner;
@@ -59,15 +57,6 @@ private static JettySolrRunner createAndStartJetty(ReplicationTestHelper.SolrIns
     return jetty;
   }
 
-  private static SolrClient createNewSolrClient(int port) {
-
-    final String baseUrl = buildUrl(port);
-    return new HttpApacheSolrClient.Builder(baseUrl)
-        .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
-        .withSocketTimeout(60000, TimeUnit.MILLISECONDS)
-        .build();
-  }
-
   @Override
   @Before
   public void setUp() throws Exception {
@@ -79,7 +68,7 @@ public void setUp() throws Exception {
     leader.copyConfigFile(CONF_DIR.resolve(configFile).toString(), "solrconfig.xml");
 
     leaderJetty = createAndStartJetty(leader);
-    leaderClient = createNewSolrClient(leaderJetty.getLocalPort());
+    leaderClient = leaderJetty.getSolrClient();
     docsSeed = random().nextLong();
   }
 
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 59b8af58e8de..66627c225833 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
@@ -27,7 +27,6 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.commons.io.file.PathUtils;
 import org.apache.lucene.util.Constants;
@@ -35,7 +34,6 @@
 import org.apache.solr.client.api.model.CoreStatusResponse;
 import org.apache.solr.client.solrj.RemoteSolrException;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.request.json.JacksonContentWriter;
@@ -315,23 +313,11 @@ public void testDeleteInstanceDir() throws Exception {
             solrHomeDirectory.toAbsolutePath().toString(), JettyConfig.builder().build());
     runner.start();
 
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
-            .withDefaultCollection("corex")
-            .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .build()) {
-      SolrInputDocument doc = new SolrInputDocument();
-      doc.addField("id", "123");
-      client.add(doc);
-      client.commit();
-    }
+    var client = runner.getSolrClient();
+    {
+      client.add("corex", sdoc("id", "123"));
+      client.commit("corex");
 
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
-            .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .build()) {
       CoreAdminRequest.Unload req = new CoreAdminRequest.Unload(false);
       req.setDeleteInstanceDir(true);
       req.setCoreName("corex");
@@ -342,11 +328,7 @@ public void testDeleteInstanceDir() throws Exception {
     // 1> has the property persisted (SOLR-11783)
     // 2> is deleted after rename properly.
 
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
-            .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .build()) {
+    {
       CoreAdminRequest.renameCore("corerename", "brand_new_core_name", client);
       Properties props = new Properties();
       try (Reader is = Files.newBufferedReader(renamePropFile, StandardCharsets.UTF_8)) {
@@ -356,11 +338,7 @@ public void testDeleteInstanceDir() throws Exception {
           "Name should have been persisted!", "brand_new_core_name", props.getProperty("name"));
     }
 
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
-            .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .build()) {
+    {
       CoreAdminRequest.Unload req = new CoreAdminRequest.Unload(false);
       req.setDeleteInstanceDir(true);
       req.setCoreName("brand_new_core_name");
@@ -389,33 +367,18 @@ public void testUnloadForever() throws Exception {
             solrHomeDirectory.toAbsolutePath().toString(), JettyConfig.builder().build());
     runner.start();
 
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
-            .withDefaultCollection("corex")
-            .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .build()) {
-      SolrInputDocument doc = new SolrInputDocument();
-      doc.addField("id", "123");
-      client.add(doc);
-      client.commit();
+    var client = runner.getSolrClient();
+    {
+      client.add("corex", sdoc("id", "123"));
+      client.commit("corex");
     }
 
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
-            .withDefaultCollection("corex")
-            .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .build()) {
-      QueryResponse result = client.query(new SolrQuery("id:*"));
+    {
+      QueryResponse result = client.query("corex", new SolrQuery("id:*"));
       assertEquals(1, result.getResults().getNumFound());
     }
 
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
-            .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .build()) {
+    {
       CoreAdminRequest.Unload req = new CoreAdminRequest.Unload(false);
       req.setDeleteInstanceDir(false); // random().nextBoolean());
       req.setCoreName("corex");
@@ -426,13 +389,8 @@ public void testUnloadForever() throws Exception {
         expectThrows(
             RemoteSolrException.class,
             () -> {
-              try (SolrClient client =
-                  new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
-                      .withDefaultCollection("corex")
-                      .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-                      .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT * 1000, TimeUnit.MILLISECONDS)
-                      .build()) {
-                client.query(new SolrQuery("id:*"));
+              try {
+                runner.getSolrClient().query("corex", new SolrQuery("id:*"));
               } finally {
                 runner.stop();
               }
@@ -454,17 +412,10 @@ public void testDeleteInstanceDirAfterCreateFailure() throws Exception {
             solrHomeDirectory.toAbsolutePath().toString(), JettyConfig.builder().build());
     runner.start();
 
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
-            .withDefaultCollection("corex")
-            .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .build()) {
-      SolrInputDocument doc = new SolrInputDocument();
-      doc.addField("id", "123");
-      client.add(doc);
-      client.commit();
-    }
+    SolrInputDocument doc = new SolrInputDocument();
+    doc.addField("id", "123");
+    runner.getSolrClient().add("corex", doc);
+    runner.getSolrClient().commit("corex");
 
     Path dataDir = null;
     try (SolrClient client = getHttpSolrClient(runner.getBaseUrl().toString())) {
@@ -481,21 +432,16 @@ public void testDeleteInstanceDirAfterCreateFailure() throws Exception {
         subHome.resolve("solrconfig.xml"),
         StandardCopyOption.REPLACE_EXISTING);
 
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(runner.getBaseUrl().toString())
-            .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-            .build()) {
-      // this is expected because we put a bad solrconfig -- ignore
-      expectThrows(Exception.class, () -> CoreAdminRequest.reloadCore("corex", client));
+    // this is expected because we put a bad solrconfig -- ignore
+    expectThrows(
+        Exception.class, () -> CoreAdminRequest.reloadCore("corex", runner.getSolrClient()));
 
-      CoreAdminRequest.Unload req = new CoreAdminRequest.Unload(false);
-      req.setDeleteDataDir(true);
-      // important because the data directory is inside the instance directory
-      req.setDeleteInstanceDir(false);
-      req.setCoreName("corex");
-      req.process(client);
-    }
+    CoreAdminRequest.Unload unloadReq = new CoreAdminRequest.Unload(false);
+    unloadReq.setDeleteDataDir(true);
+    // important because the data directory is inside the instance directory
+    unloadReq.setDeleteInstanceDir(false);
+    unloadReq.setCoreName("corex");
+    unloadReq.process(runner.getSolrClient());
 
     runner.stop();
 
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java
index 69f3108ba8a1..31b0f00b79ce 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java
@@ -142,6 +142,7 @@ public void testIllegalContentType() throws SolrServerException, IOException {
         createShowFileRequest(params("file", "managed-schema", "contentType", "not/known"));
     request.setResponseParser(new InputStreamResponseParser("xml"));
     NamedList<Object> response = client.request(request);
+    closeResponseStream(response);
     assertEquals(response.get("responseStatus"), 404);
   }
 
@@ -152,6 +153,7 @@ public void testAbsoluteFilename() throws SolrServerException, IOException {
             params("file", "/etc/passwd", "contentType", "text/plain; charset=utf-8"));
     request.setResponseParser(new InputStreamResponseParser("xml"));
     NamedList<Object> response = client.request(request);
+    closeResponseStream(response);
     assertEquals(response.get("responseStatus"), 404);
   }
 
@@ -162,6 +164,7 @@ public void testEscapeConfDir() throws SolrServerException, IOException {
             params("file", "../../solr.xml", "contentType", "application/xml; charset=utf-8"));
     request.setResponseParser(new InputStreamResponseParser("xml"));
     NamedList<Object> response = client.request(request);
+    closeResponseStream(response);
     assertEquals(response.get("responseStatus"), 400);
   }
 
@@ -176,6 +179,7 @@ public void testPathTraversalFilename() throws SolrServerException, IOException
                 "text/plain; charset=utf-8"));
     request.setResponseParser(new InputStreamResponseParser("xml"));
     NamedList<Object> response = client.request(request);
+    closeResponseStream(response);
     assertEquals(response.get("responseStatus"), 400);
   }
 
@@ -202,4 +206,11 @@ public void testGetSafeContentType() {
     // Non-known content types are rejected with 400 error
     expectThrows(SolrException.class, () -> ShowFileRequestHandler.getSafeContentType("foo/bar"));
   }
+
+  private void closeResponseStream(NamedList<Object> response) throws IOException {
+    InputStream stream = (InputStream) response.get("stream");
+    if (stream != null) {
+      stream.close();
+    }
+  }
 }
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 f22cd5d7dc89..f4c558de4678 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
@@ -19,19 +19,16 @@
 
 import static org.hamcrest.Matchers.containsInAnyOrder;
 
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.commons.io.IOUtils;
 import org.apache.solr.client.api.model.ZooKeeperStat;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.ZookeeperReadApi;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.SolrException;
 import org.apache.zookeeper.CreateMode;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -42,22 +39,6 @@ public static void setupCluster() throws Exception {
     configureCluster(1).addConfig("conf", configset("cloud-minimal")).configure();
   }
 
-  private URL baseUrl;
-  private String basezk;
-  private String basezkls;
-
-  @Before
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    baseUrl = cluster.getJettySolrRunner(0).getBaseUrl();
-
-    String baseUrlV2 = cluster.getJettySolrRunner(0).getBaseURLV2().toString();
-    basezk = baseUrlV2 + "/cluster/zookeeper/data";
-    basezkls = baseUrlV2 + "/cluster/zookeeper/children";
-  }
-
   @After
   @Override
   public void tearDown() throws Exception {
@@ -66,96 +47,93 @@ public void tearDown() throws Exception {
 
   @Test
   public void testZkread() throws Exception {
-    try (var client = new HttpApacheSolrClient.Builder(baseUrl.toString()).build()) {
-      final var securityJsonRequest = new ZookeeperReadApi.ReadNode("/security.json");
-      final var securityJsonResponse = securityJsonRequest.process(client);
-      assertEquals(200, securityJsonResponse.getHttpStatus());
-      try (final var stream = securityJsonResponse.getResponseStream()) {
-        final var securityJsonContent = IOUtils.toString(stream, StandardCharsets.UTF_8);
-        assertNotNull(securityJsonContent);
-      }
-
-      final var configListRequest = new ZookeeperReadApi.ListNodes("/configs");
-      final var configListResponse = configListRequest.process(client);
-      assertEquals(
-          6, configListResponse.unknownProperties().get("/configs").get("_default").children);
-      assertEquals(2, configListResponse.unknownProperties().get("/configs").get("conf").children);
-      assertEquals(0, configListResponse.stat.version);
-
-      final var configDataRequest = new ZookeeperReadApi.ReadNode("/configs");
-      final var configDataResponse = configDataRequest.process(client);
-      // /configs exists but has no data, so API returns '200 OK' with empty response body
-      assertEquals(200, configDataResponse.getHttpStatus());
-      try (final var stream = configDataResponse.getResponseStream()) {
-        assertEquals("", IOUtils.toString(stream, StandardCharsets.UTF_8));
-      }
+    var client = cluster.getJettySolrRunner(0).getSolrClient();
+    final var securityJsonRequest = new ZookeeperReadApi.ReadNode("/security.json");
+    final var securityJsonResponse = securityJsonRequest.process(client);
+    assertEquals(200, securityJsonResponse.getHttpStatus());
+    try (final var stream = securityJsonResponse.getResponseStream()) {
+      final var securityJsonContent = IOUtils.toString(stream, StandardCharsets.UTF_8);
+      assertNotNull(securityJsonContent);
+    }
 
-      byte[] bytes = new byte[1024 * 5];
-      for (int i = 0; i < bytes.length; i++) {
-        bytes[i] = (byte) random().nextInt(128);
-      }
-      try {
-        cluster.getZkClient().create("/configs/_default/testdata", bytes, CreateMode.PERSISTENT);
+    final var configListRequest = new ZookeeperReadApi.ListNodes("/configs");
+    final var configListResponse = configListRequest.process(client);
+    assertEquals(
+        6, configListResponse.unknownProperties().get("/configs").get("_default").children);
+    assertEquals(2, configListResponse.unknownProperties().get("/configs").get("conf").children);
+    assertEquals(0, configListResponse.stat.version);
+
+    final var configDataRequest = new ZookeeperReadApi.ReadNode("/configs");
+    final var configDataResponse = configDataRequest.process(client);
+    // /configs exists but has no data, so API returns '200 OK' with empty response body
+    assertEquals(200, configDataResponse.getHttpStatus());
+    try (final var stream = configDataResponse.getResponseStream()) {
+      assertEquals("", IOUtils.toString(stream, StandardCharsets.UTF_8));
+    }
 
-        final var testDataRequest = new ZookeeperReadApi.ReadNode("/configs/_default/testdata");
-        final var testDataResponse = testDataRequest.process(client);
-        assertEquals(200, testDataResponse.getHttpStatus());
-        try (final var stream = testDataResponse.getResponseStream()) {
-          final var foundContents = stream.readAllBytes();
-          for (int i = 0; i < foundContents.length; i++) {
-            assertEquals(foundContents[i], bytes[i]);
-          }
+    byte[] bytes = new byte[1024 * 5];
+    for (int i = 0; i < bytes.length; i++) {
+      bytes[i] = (byte) random().nextInt(128);
+    }
+    try {
+      cluster.getZkClient().create("/configs/_default/testdata", bytes, CreateMode.PERSISTENT);
+
+      final var testDataRequest = new ZookeeperReadApi.ReadNode("/configs/_default/testdata");
+      final var testDataResponse = testDataRequest.process(client);
+      assertEquals(200, testDataResponse.getHttpStatus());
+      try (final var stream = testDataResponse.getResponseStream()) {
+        final var foundContents = stream.readAllBytes();
+        for (int i = 0; i < foundContents.length; i++) {
+          assertEquals(foundContents[i], bytes[i]);
         }
-      } finally {
-        cluster.getZkClient().delete("/configs/_default/testdata", -1);
       }
+    } finally {
+      cluster.getZkClient().delete("/configs/_default/testdata", -1);
     }
   }
 
   @Test
   public void testRequestingDataFromNonexistentNodeReturnsAnError() throws Exception {
-    try (var client = new HttpApacheSolrClient.Builder(baseUrl.toString()).build()) {
-      final var missingNodeReq = new ZookeeperReadApi.ReadNode("/configs/_default/nonexistentnode");
-      final var missingNodeResponse = missingNodeReq.process(client);
-      assertEquals(404, missingNodeResponse.getHttpStatus());
-
-      final var expected =
-          expectThrows(
-              SolrException.class, () -> missingNodeResponse.getResponseStreamIfSuccessful());
-      assertEquals(404, expected.code());
-    }
+    var client = cluster.getJettySolrRunner(0).getSolrClient();
+    final var missingNodeReq = new ZookeeperReadApi.ReadNode("/configs/_default/nonexistentnode");
+    final var missingNodeResponse = missingNodeReq.process(client);
+    assertEquals(404, missingNodeResponse.getHttpStatus());
+
+    final var expected =
+        expectThrows(
+            SolrException.class, () -> missingNodeResponse.getResponseStreamIfSuccessful());
+    assertEquals(404, expected.code());
   }
 
   @Test
   public void testCanListChildNodes() throws Exception {
-    try (var client = new HttpApacheSolrClient.Builder(baseUrl.toString()).build()) {
-      final var listDefaultFilesReq = new ZookeeperReadApi.ListNodes("/configs/_default");
-      final var listDefaultFilesResponse = listDefaultFilesReq.process(client);
-
-      // At the top level, the response contains a key with the value of the specified zkPath
-      assertEquals(1, listDefaultFilesResponse.unknownProperties().size());
-      assertEquals(
-          "/configs/_default",
-          listDefaultFilesResponse.unknownProperties().keySet().stream()
-              .collect(Collectors.toList())
-              .get(0));
-
-      // Under the specified zkPath is a key for each child, with values being that stat for that
-      // node.
-      // The actual stat values vary a good bit so aren't very useful to assert on, so let's just
-      // make sure all of the expected child nodes were found.
-      final Map<String, ZooKeeperStat> childStatsByPath =
-          listDefaultFilesResponse.unknownProperties().get("/configs/_default");
-      assertEquals(6, childStatsByPath.size());
-      assertThat(
-          childStatsByPath.keySet(),
-          containsInAnyOrder(
-              "protwords.txt",
-              "solrconfig.xml",
-              "synonyms.txt",
-              "stopwords.txt",
-              "managed-schema.xml",
-              "lang"));
-    }
+    var client = cluster.getJettySolrRunner(0).getSolrClient();
+    final var listDefaultFilesReq = new ZookeeperReadApi.ListNodes("/configs/_default");
+    final var listDefaultFilesResponse = listDefaultFilesReq.process(client);
+
+    // At the top level, the response contains a key with the value of the specified zkPath
+    assertEquals(1, listDefaultFilesResponse.unknownProperties().size());
+    assertEquals(
+        "/configs/_default",
+        listDefaultFilesResponse.unknownProperties().keySet().stream()
+            .collect(Collectors.toList())
+            .get(0));
+
+    // Under the specified zkPath is a key for each child, with values being that stat for that
+    // node.
+    // The actual stat values vary a good bit so aren't very useful to assert on, so let's just
+    // make sure all of the expected child nodes were found.
+    final Map<String, ZooKeeperStat> childStatsByPath =
+        listDefaultFilesResponse.unknownProperties().get("/configs/_default");
+    assertEquals(6, childStatsByPath.size());
+    assertThat(
+        childStatsByPath.keySet(),
+        containsInAnyOrder(
+            "protwords.txt",
+            "solrconfig.xml",
+            "synonyms.txt",
+            "stopwords.txt",
+            "managed-schema.xml",
+            "lang"));
   }
 }
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 364b930c0a1d..6b48759e7340 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
@@ -18,15 +18,10 @@
 package org.apache.solr.handler.admin;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;
 import org.apache.solr.cloud.SolrCloudTestCase;
@@ -42,22 +37,15 @@ public static void setupCluster() throws Exception {
     cluster.getZkServer().shutdown();
   }
 
-  /*
-   Test the monitoring endpoint, when no Zookeeper is answering. There should still be a response
-  */
+  /**
+   * Test the monitoring endpoint, when no Zookeeper is answering. There should still be a response
+   */
   @Test
-  public void monitorZookeeperAfterZkShutdown()
-      throws IOException,
-          SolrServerException,
-          InterruptedException,
-          ExecutionException,
-          TimeoutException {
-    URL baseUrl = cluster.getJettySolrRunner(0).getBaseUrl();
-    var solr = new HttpApacheSolrClient.Builder(baseUrl.toString()).build();
+  public void monitorZookeeperAfterZkShutdown() throws IOException, SolrServerException {
     GenericSolrRequest mntrReq =
         new GenericSolrRequest(SolrRequest.METHOD.GET, "/admin/zookeeper/status");
     mntrReq.setResponseParser(new JsonMapResponseParser());
-    NamedList<Object> nl = solr.httpUriRequest(mntrReq).future.get(10000, TimeUnit.MILLISECONDS);
+    NamedList<Object> nl = cluster.getJettySolrRunner(0).getSolrClient().request(mntrReq);
 
     assertEquals("zkStatus", nl.getName(1));
     @SuppressWarnings({"unchecked"})
@@ -71,6 +59,5 @@ public void monitorZookeeperAfterZkShutdown()
     @SuppressWarnings({"unchecked"})
     Map<String, Object> details = (Map<String, Object>) detailsList.get(0);
     assertEquals(false, details.get("ok"));
-    solr.close();
   }
 }
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 ebc00dd067a1..8e6735ef9661 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
@@ -23,24 +23,17 @@
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ZkDynamicConfig;
 import org.apache.solr.common.util.NamedList;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Answers;
@@ -53,35 +46,17 @@ public static void setupCluster() throws Exception {
     configureCluster(1).addConfig("conf", configset("cloud-minimal")).configure();
   }
 
-  @Before
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-  }
-
-  @After
-  @Override
-  public void tearDown() throws Exception {
-    super.tearDown();
-  }
-
   /*
    Test the monitoring endpoint, used in the Cloud => ZkStatus Admin UI screen
    NOTE: We do not currently test with multiple zookeepers, but the only difference is that there are multiple "details" objects and mode is "ensemble"...
   */
   @Test
-  public void monitorZookeeper()
-      throws IOException,
-          SolrServerException,
-          InterruptedException,
-          ExecutionException,
-          TimeoutException {
-    URL baseUrl = cluster.getJettySolrRunner(0).getBaseUrl();
-    var solr = new HttpApacheSolrClient.Builder(baseUrl.toString()).build();
+  public void monitorZookeeper() throws IOException, SolrServerException {
+    var solr = cluster.getJettySolrRunner(0).getSolrClient();
     GenericSolrRequest mntrReq =
         new GenericSolrRequest(SolrRequest.METHOD.GET, "/admin/zookeeper/status");
     mntrReq.setResponseParser(new JsonMapResponseParser());
-    NamedList<Object> nl = solr.httpUriRequest(mntrReq).future.get(10000, TimeUnit.MILLISECONDS);
+    NamedList<Object> nl = solr.request(mntrReq);
 
     assertEquals("zkStatus", nl.getName(1));
     @SuppressWarnings({"unchecked"})
@@ -96,7 +71,6 @@ public void monitorZookeeper()
     Map<String, Object> details = (Map<String, Object>) detailsList.get(0);
     assertEquals(true, details.get("ok"));
     assertTrue(Integer.parseInt((String) details.get("zk_znode_count")) > 50);
-    solr.close();
   }
 
   @Test
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 ca349d656c0f..6a794b8d768b 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
@@ -18,8 +18,6 @@
 
 import org.apache.lucene.util.Constants;
 import org.apache.solr.BaseDistributedSearchTestCase;
-import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.response.JavaBinResponseParser;
 import org.apache.solr.client.solrj.response.QueryResponse;
@@ -165,26 +163,20 @@ public void test() throws Exception {
     assertEquals("6", document.getFieldValue("id"));
     assertEquals(true, document.getFieldValue("[elevated]"));
 
-    // Force javabin format
-    final String clientUrl = jettys.get(0).getBaseUrl().toString();
-    try (SolrClient client =
-        new HttpApacheSolrClient.Builder(clientUrl)
-            .withDefaultCollection("collection1")
-            .withResponseParser(new JavaBinResponseParser())
-            .build(); ) {
-      SolrQuery solrQuery =
-          new SolrQuery("XXXX")
-              .setParam("qt", "/elevate")
-              .setParam("shards.qt", "/elevate")
-              .setRows(500)
-              .setFields("id,[elevated]")
-              .setParam("enableElevation", "true")
-              .setParam("forceElevation", "true")
-              .setParam("elevateIds", "6", "wt", "javabin")
-              .setSort("id", SolrQuery.ORDER.desc);
-      setDistributedParams(solrQuery);
-      response = client.query(solrQuery);
-    }
+    var client = jettys.getFirst().getSolrClient();
+    assertTrue(client.getParser() instanceof JavaBinResponseParser);
+    SolrQuery solrQuery =
+        new SolrQuery("XXXX")
+            .setParam("qt", "/elevate")
+            .setParam("shards.qt", "/elevate")
+            .setRows(500)
+            .setFields("id,[elevated]")
+            .setParam("enableElevation", "true")
+            .setParam("forceElevation", "true")
+            .setParam("elevateIds", "6")
+            .setSort("id", SolrQuery.ORDER.desc);
+    setDistributedParams(solrQuery);
+    response = client.query(DEFAULT_TEST_CORENAME, solrQuery);
 
     assertTrue(response.getResults().getNumFound() > 0);
     document = response.getResults().get(0);
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 53e096cf89ff..79592e3bc4cd 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
@@ -22,8 +22,6 @@
 import java.util.Iterator;
 import java.util.List;
 import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -158,14 +156,10 @@ public void testZkConnected() throws Exception {
       Replica replica = getRandomEntry(slice.getReplicas());
       JettySolrRunner jetty = miniCluster.getReplicaJetty(replica);
       // Use the replica's core URL to avoid ZK communication
-      try (SolrClient client =
-          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
-              .withDefaultCollection(replica.getCoreName())
-              .build()) {
-        jetty.getCoreContainer().getZkController().getZkClient().close();
-        rsp = req.process(client);
-        assertFalse(rsp.getResponseHeader().getBooleanArg("zkConnected"));
-      }
+      var client = jetty.getSolrClient();
+      jetty.getCoreContainer().getZkController().getZkClient().close();
+      rsp = req.process(client, replica.getCoreName());
+      assertFalse(rsp.getResponseHeader().getBooleanArg("zkConnected"));
     } finally {
       miniCluster.shutdown();
     }
@@ -209,13 +203,11 @@ public void testRequireZkConnected() throws Exception {
       JettySolrRunner disconnectedJetty = miniCluster.getReplicaJetty(disconnectedReplica);
       req = new QueryRequest(params); // TODO Can be removed when SOLR-17314 fixed
       // Use the replica's core URL to avoid ZK communication
-      try (SolrClient solrClient =
-          new HttpApacheSolrClient.Builder(disconnectedReplica.getBaseUrl())
-              .withDefaultCollection(disconnectedReplica.getCoreName())
-              .build()) {
-        ignoreException("ZooKeeper is not connected");
-        disconnectedJetty.getCoreContainer().getZkController().getZkClient().close();
-        req.process(solrClient);
+      var solrClient = disconnectedJetty.getSolrClient();
+      ignoreException("ZooKeeper is not connected");
+      disconnectedJetty.getCoreContainer().getZkController().getZkClient().close();
+      try {
+        req.process(solrClient, disconnectedReplica.getCoreName());
         fail(
             "An exception should be thrown when ZooKeeper is not connected and shards.tolerant=requireZkConnected");
       } catch (Exception e) {
@@ -268,15 +260,13 @@ public void testRequireZkConnectedDistrib() throws Exception {
         connectedSlice = getRandomEntry(slices);
       }
       Replica connectedReplica = connectedSlice.getReplicas().iterator().next();
-      try (SolrClient solrClient =
-          new HttpApacheSolrClient.Builder(connectedReplica.getBaseUrl())
-              .withDefaultCollection(connectedReplica.getCoreName())
-              .build()) {
-        ignoreException("ZooKeeper is not connected");
-        ignoreException("no active servers hosting shard:");
-        JettySolrRunner disconnectedJetty = miniCluster.getReplicaJetty(disconnectedReplica);
-        disconnectedJetty.getCoreContainer().getZkController().getZkClient().close();
-        req.process(solrClient);
+      var solrClient = miniCluster.getReplicaJetty(connectedReplica).getSolrClient();
+      ignoreException("ZooKeeper is not connected");
+      ignoreException("no active servers hosting shard:");
+      JettySolrRunner disconnectedJetty = miniCluster.getReplicaJetty(disconnectedReplica);
+      disconnectedJetty.getCoreContainer().getZkController().getZkClient().close();
+      try {
+        req.process(solrClient, connectedReplica.getCoreName());
         fail(
             "An exception should be thrown when ZooKeeper is not connected and shards.tolerant=requireZkConnected");
       } catch (Exception e) {
diff --git a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
index f229b01ac67a..610b7267cbe3 100644
--- a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
@@ -193,6 +193,8 @@ public void testUnsupportedMetricsFormat() throws Exception {
 
     try (SolrClient adminClient = getHttpSolrClient(solrTestRule.getBaseUrl())) {
       NamedList<Object> res = adminClient.request(req);
+      InputStream stream = (InputStream) res.get("stream");
+      if (stream != null) stream.close();
       // Unknown wt parameter should return a 400 error
       assertEquals(400, res.get("responseStatus"));
     }
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 ec42461bc758..6a584ddb1652 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
@@ -22,8 +22,6 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.api.model.CoreStatusResponse;
-import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.request.json.JacksonContentWriter;
 import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
@@ -60,22 +58,20 @@ public void test() throws Exception {
     request.setPath("/admin/cores");
     int which = r.nextInt(clients.size());
 
-    // create a client that does not have the /collection1 as part of the URL.
-    try (SolrClient rootClient =
-        new HttpApacheSolrClient.Builder(buildUrl(jettys.get(which).getLocalPort())).build()) {
-      NamedList<?> namedListResponse = rootClient.request(request);
-      final var statusByCore =
-          JacksonContentWriter.DEFAULT_MAPPER.convertValue(
-              namedListResponse.get("status"),
-              new TypeReference<Map<String, CoreStatusResponse.SingleCoreData>>() {});
-      final String coreName = statusByCore.keySet().stream().findFirst().get();
-      final var collectionStatus = statusByCore.get(coreName);
-      // Make sure the upgrade to managed schema happened
-      assertEquals(
-          "Schema resource name differs from expected name",
-          "managed-schema.xml",
-          collectionStatus.schema);
-    }
+    // use a client that does not have the /collection1 as part of the URL.
+    var rootClient = jettys.get(which).getSolrClient();
+    NamedList<?> namedListResponse = rootClient.request(request);
+    final var statusByCore =
+        JacksonContentWriter.DEFAULT_MAPPER.convertValue(
+            namedListResponse.get("status"),
+            new TypeReference<Map<String, CoreStatusResponse.SingleCoreData>>() {});
+    final String coreName = statusByCore.keySet().stream().findFirst().get();
+    final var collectionStatus = statusByCore.get(coreName);
+    // Make sure the upgrade to managed schema happened
+    assertEquals(
+        "Schema resource name differs from expected name",
+        "managed-schema.xml",
+        collectionStatus.schema);
 
     try (SolrZkClient zkClient =
         new SolrZkClient.Builder()
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrJ.java b/solr/core/src/test/org/apache/solr/search/TestSolrJ.java
deleted file mode 100644
index 4d3c4a3c9d73..000000000000
--- a/solr/core/src/test/org/apache/solr/search/TestSolrJ.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.search;
-
-import java.io.IOException;
-import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
-import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient;
-import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.util.RTimer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestSolrJ extends SolrTestCaseJ4 {
-  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-  public void testSolrJ() {
-    // docs, producers, connections, sleep_time
-    //  main(new String[] {"1000000","4", "1", "0"});
-
-    // doCommitPerf();
-  }
-
-  public static SolrClient client;
-  public static String idField = "id";
-  public static Exception ex;
-
-  public static void main(String[] args) throws Exception {
-    // String addr = "http://odin.local:80/solr";
-    // String addr = "http://odin.local:8983/solr";
-    String addr = "http://127.0.0.1:8983/solr";
-
-    int i = 0;
-    final int nDocs = Integer.parseInt(args[i++]);
-    final int nProducers = Integer.parseInt(args[i++]);
-    final int nConnections = Integer.parseInt(args[i++]);
-    final int maxSleep = Integer.parseInt(args[i++]);
-
-    ConcurrentUpdateSolrClient concurrentClient = null;
-
-    // server = concurrentClient = new ConcurrentUpdateSolrServer(addr,32,8);
-    client =
-        concurrentClient =
-            new ConcurrentUpdateSolrClient.Builder(addr)
-                .withQueueSize(64)
-                .withThreadCount(nConnections)
-                .build();
-
-    client.deleteByQuery("*:*");
-    client.commit();
-
-    final RTimer timer = new RTimer();
-
-    final int docsPerThread = nDocs / nProducers;
-
-    Thread[] threads = new Thread[nProducers];
-
-    for (int threadNum = 0; threadNum < nProducers; threadNum++) {
-      final int base = threadNum * docsPerThread;
-
-      threads[threadNum] =
-          new Thread("add-thread" + i) {
-            @Override
-            public void run() {
-              try {
-                indexDocs(base, docsPerThread, maxSleep);
-              } catch (Exception e) {
-                log.error("###############################CAUGHT EXCEPTION", e);
-                ex = e;
-              }
-            }
-          };
-      threads[threadNum].start();
-    }
-
-    // optional: wait for commit?
-
-    for (int threadNum = 0; threadNum < nProducers; threadNum++) {
-      threads[threadNum].join();
-    }
-
-    if (concurrentClient != null) {
-      concurrentClient.blockUntilFinished();
-    }
-
-    double elapsed = timer.getTime();
-    System.out.println(
-        "time=" + elapsed + " throughput=" + (nDocs * 1000 / elapsed) + " Exception=" + ex);
-
-    // should server threads be marked as daemon?
-    // need a server.close()!!!
-  }
-
-  @SuppressWarnings({"unchecked"})
-  public static SolrInputDocument getDocument(int docnum) {
-    SolrInputDocument doc = new SolrInputDocument();
-    doc.setField(idField, docnum);
-    doc.setField("cat", Integer.toString(docnum & 0x0f));
-    doc.setField("name", "my name is " + Integer.toString(docnum & 0xff));
-    doc.setField("foo_t", "now is the time for all good men to come to the aid of their country");
-    doc.setField("foo_i", Integer.toString(docnum & 0x0f));
-    doc.setField("foo_s", Integer.toString(docnum & 0xff));
-    doc.setField("foo_b", Boolean.toString((docnum & 0x01) == 1));
-    doc.setField("parent_s", Integer.toString(docnum - 1));
-    doc.setField("price", Integer.toString(docnum >> 4));
-
-    int golden = (int) 2654435761L;
-    int h = docnum * golden;
-    int n = (h & 0xff) + 1;
-    @SuppressWarnings({"rawtypes"})
-    List lst = new ArrayList(n);
-    for (int i = 0; i < n; i++) {
-      h = (h + i) * golden;
-      lst.add(h & 0xfff);
-    }
-
-    doc.setField("num_is", lst);
-    return doc;
-  }
-
-  public static void indexDocs(int base, int count, int maxSleep)
-      throws IOException, SolrServerException {
-    Random r = new Random(base);
-
-    for (int i = base; i < count + base; i++) {
-      if ((i & 0xfffff) == 0) {
-        System.out.print("\n% " + new Date() + "\t" + i + "\t");
-        System.out.flush();
-      }
-
-      if ((i & 0xffff) == 0) {
-        System.out.print(".");
-        System.out.flush();
-      }
-
-      SolrInputDocument doc = getDocument(i);
-      client.add(doc);
-
-      if (maxSleep > 0) {
-        int sleep = r.nextInt(maxSleep);
-        try {
-          Thread.sleep(sleep);
-        } catch (InterruptedException e) {
-          Thread.currentThread().interrupt();
-          log.error("interrupted", e);
-          throw new RuntimeException(e);
-        }
-      }
-    }
-  }
-
-  public void doCommitPerf() throws Exception {
-
-    try (SolrClient client = getHttpSolrClient("http://127.0.0.1:8983/solr")) {
-
-      final RTimer timer = new RTimer();
-
-      for (int i = 0; i < 10000; i++) {
-        SolrInputDocument doc = new SolrInputDocument();
-        doc.addField("id", Integer.toString(i % 13));
-        client.add(doc);
-        client.commit(true, true, true);
-      }
-
-      System.out.println("TIME: " + timer.getTime());
-    }
-  }
-}
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 d08280c17bc7..166b9f440c61 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
@@ -31,7 +31,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.apache.CloudLegacySolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -136,9 +135,9 @@ public void testBasicAuth() throws Exception {
     }
 
     // avoid bad connection races due to shutdown
-    final var apacheHttpClient = ((CloudLegacySolrClient) cluster.getSolrClient()).getHttpClient();
-    apacheHttpClient.getConnectionManager().closeExpiredConnections();
-    apacheHttpClient.getConnectionManager().closeIdleConnections(1, TimeUnit.MILLISECONDS);
+    // var apacheHttpClient = ((CloudLegacySolrClient) cluster.getSolrClient()).getHttpClient();
+    // apacheHttpClient.getConnectionManager().closeExpiredConnections();
+    // apacheHttpClient.getConnectionManager().closeIdleConnections(1, TimeUnit.MILLISECONDS);
 
     RemoteSolrException exp =
         expectThrows(
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 74056b94ed7d..4a92852cbdc5 100644
--- a/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.java
@@ -24,9 +24,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.lucene.tests.util.TestUtil;
-import org.apache.lucene.util.IOUtils;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.impl.CollectionScopedSolrClient;
 import org.apache.solr.client.solrj.impl.LBSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -77,22 +76,21 @@ public static void setupClusterAndCollection() throws Exception {
             .process(cluster.getSolrClient())
             .isSuccess());
 
-    solrClient = cluster.newSolrClient(COLL);
+    solrClient = cluster.getSolrClient(COLL);
 
     ClusterState clusterState = cluster.getSolrClient().getClusterState();
     for (Replica replica : clusterState.getCollection(COLL).getReplicas()) {
       clients.add(
-          new HttpApacheSolrClient.Builder(replica.getBaseUrl())
-              .withDefaultCollection(replica.getCoreName())
-              .build());
+          new CollectionScopedSolrClient(
+              cluster.getReplicaJetty(replica).getSolrClient(), replica.getCoreName()));
     }
   }
 
   @AfterClass
   public static void afterClass() throws Exception {
-    IOUtils.close(clients);
+    // lifecycle internally managed; we simply GC here
     clients.clear();
-    IOUtils.close(solrClient);
+    solrClient = null;
 
     RVAL_PRE = null;
   }
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 003c3b401517..aeb413532045 100644
--- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
@@ -918,10 +918,7 @@ private void testStuckUpdates() {
           }
           ZkNodeProps nodeProps =
               new ZkNodeProps(
-                  ZkStateReader.BASE_URL_PROP,
-                  c.getBaseURL(),
-                  ZkStateReader.CORE_NAME_PROP,
-                  "");
+                  ZkStateReader.BASE_URL_PROP, c.getBaseURL(), ZkStateReader.CORE_NAME_PROP, "");
           StdNode node = new StdNode(new ZkCoreNodeProps(nodeProps));
           nodes.add(node);
         }
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 ab988dcd8909..8a1dd5fd46c4 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
@@ -372,7 +372,8 @@ private void reorderedDBQsSimpleTest() throws Exception {
     }
 
     // assert both replicas have same effect
-    for (HttpSolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
+    for (HttpSolrClient client :
+        NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
       SolrDocument doc = client.getById(String.valueOf(0), params("distrib", "false"));
       assertNull("This doc was supposed to have been deleted, but was: " + doc, doc);
     }
@@ -960,7 +961,8 @@ private void outOfOrderUpdatesIndividualReplicaTest() throws Exception {
     }
 
     // assert both replicas have same effect
-    for (HttpSolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
+    for (HttpSolrClient client :
+        NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
       if (log.isInfoEnabled()) {
         log.info("Testing client: {}", client.getBaseURL());
       }
@@ -969,15 +971,13 @@ private void outOfOrderUpdatesIndividualReplicaTest() throws Exception {
           0,
           "inplace_updatable_float",
           (newinplace_updatable_float + (float) (updates.size() - 1)),
-          "inplace_updatable_float didn't match for replica at client: "
-              + client.getBaseURL());
+          "inplace_updatable_float didn't match for replica at client: " + client.getBaseURL());
       assertReplicaValue(
           client,
           0,
           "title_s",
           "title0_new",
-          "Title didn't match for replica at client: "
-              + client.getBaseURL());
+          "Title didn't match for replica at client: " + client.getBaseURL());
       assertEquals(version0 + updates.size(), getReplicaValue(client, 0, "_version_"));
     }
 
@@ -1065,7 +1065,8 @@ private void reorderedDeletesTest() throws Exception {
     }
 
     // assert both replicas have same effect
-    for (HttpSolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
+    for (HttpSolrClient client :
+        NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
       SolrDocument doc = client.getById(String.valueOf(0), params("distrib", "false"));
       assertNull("This doc was supposed to have been deleted, but was: " + doc, doc);
     }
@@ -1205,11 +1206,11 @@ private void reorderedDBQsResurrectionTest() throws Exception {
     log.info("Doc in both replica 0: {}", doc0);
     log.info("Doc in both replica 1: {}", doc1);
     // assert both replicas have same effect
-    for (HttpSolrClient client : NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
+    for (HttpSolrClient client :
+        NONLEADERS) { // 0th is re-ordered replica, 1st is well-ordered replica
       SolrDocument doc = client.getById(String.valueOf(0), params("distrib", "false"));
       assertNotNull("Client: " + client.getBaseURL(), doc);
-      assertEquals(
-          "Client: " + client.getBaseURL(), 5, doc.getFieldValue(field));
+      assertEquals("Client: " + client.getBaseURL(), 5, doc.getFieldValue(field));
     }
 
     log.info("reorderedDBQsResurrectionTest: This test passed fine...");
@@ -1688,8 +1689,7 @@ private void reorderedDBQsUsingUpdatedValueFromADroppedUpdate() throws Exception
     for (HttpSolrClient client : clients) {
       if (log.isInfoEnabled()) {
         log.info(
-            "Testing client (testDBQUsingUpdatedFieldFromDroppedUpdate): {}",
-            client.getBaseURL());
+            "Testing client (testDBQUsingUpdatedFieldFromDroppedUpdate): {}", client.getBaseURL());
         log.info(
             "Version at {} is: {}",
             client.getBaseURL(),
diff --git a/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java b/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java
index 056e95365299..c98ef9f01eb8 100644
--- a/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java
+++ b/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java
@@ -135,8 +135,10 @@ private byte[] runQuery(String testCollection, CloudSolrClient client, String wt
       request.setResponseParser(new InputStreamResponseParser(wt));
     }
     result = client.request(request, testCollection);
-    InputStream inputStream = (InputStream) result.get("stream");
-    byte[] b = inputStream.readAllBytes();
+    byte[] b;
+    try (InputStream inputStream = (InputStream) result.get("stream")) {
+      b = inputStream.readAllBytes();
+    }
     System.out.println(wt + "_time : " + timer.getTime());
     System.out.println(wt + "_size : " + b.length);
     return b;
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 d66e8933e6df..31567090e0cf 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
@@ -25,7 +25,6 @@
 import java.util.Optional;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-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.QueryRequest;
@@ -72,7 +71,7 @@ public void testQueryRequest() throws IOException, SolrServerException {
 
     try (LogListener reqLog = LogListener.info(SolrCore.class.getName() + ".Request")) {
 
-      try (SolrClient testClient = newCloudLegacySolrClient()) {
+      try (SolrClient testClient = newCloudSolrClient()) {
         // verify all query events have the same auto-generated trace id
         var r1 = testClient.query(COLLECTION, new SolrQuery("*:*"));
         assertEquals(0, r1.getStatus());
@@ -108,7 +107,7 @@ public void testQueryRequest() throws IOException, SolrServerException {
   public void testUpdateRequest() throws IOException, SolrServerException {
     try (LogListener reqLog = LogListener.info(LogUpdateProcessorFactory.class.getName())) {
 
-      try (SolrClient testClient = newCloudLegacySolrClient()) {
+      try (SolrClient testClient = newCloudSolrClient()) {
         // verify all indexing events have trace id present
         testClient.add(COLLECTION, sdoc("id", "1"));
         testClient.add(COLLECTION, sdoc("id", "3"));
@@ -170,12 +169,6 @@ private void assertSameTraceId(LogListener reqLog, String traceId) {
     }
   }
 
-  private CloudSolrClient newCloudLegacySolrClient() {
-    return new CloudLegacySolrClient.Builder(
-            List.of(cluster.getZkServer().getZkAddress()), Optional.empty())
-        .build();
-  }
-
   private CloudSolrClient newCloudSolrClient() {
     var builder =
         new CloudSolrClient.Builder(
diff --git a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.java b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.java
index ad5b474b771c..5433c11fd1d8 100644
--- a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.java
+++ b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.java
@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -41,6 +42,7 @@
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.RetryUtil;
 import org.apache.solr.util.stats.MetricUtils;
 import org.apache.solr.util.tracing.TraceUtils;
 import org.junit.AfterClass;
@@ -92,7 +94,7 @@ public void test() throws IOException, SolrServerException {
 
     // Indexing
     cloudClient.add(COLLECTION, sdoc("id", "1"));
-    var finishedSpans = getAndClearSpans();
+    var finishedSpans = getAndClearSpans(1);
     finishedSpans.removeIf(
         span ->
             span.getAttributes().get(TraceUtils.TAG_HTTP_URL) == null
@@ -111,7 +113,7 @@ public void test() throws IOException, SolrServerException {
 
     // Searching
     cloudClient.query(COLLECTION, new SolrQuery("*:*"));
-    finishedSpans = getAndClearSpans();
+    finishedSpans = getAndClearSpans(1);
     finishedSpans.removeIf(
         span ->
             span.getAttributes().get(TraceUtils.TAG_HTTP_URL) == null
@@ -138,11 +140,11 @@ public void testAdminApi() throws Exception {
     request.setResponseParser(new InputStreamResponseParser(MetricUtils.PROMETHEUS_METRICS_WT));
     NamedList<Object> rsp = cloudClient.request(request);
     ((InputStream) rsp.get("stream")).close();
-    var finishedSpans = getAndClearSpans();
+    var finishedSpans = getAndClearSpans(1);
     assertEquals("get:/admin/metrics", finishedSpans.get(0).getName());
 
     CollectionAdminRequest.listCollections(cloudClient);
-    finishedSpans = getAndClearSpans();
+    finishedSpans = getAndClearSpans(1);
     assertEquals("list:/admin/collections", finishedSpans.get(0).getName());
   }
 
@@ -155,7 +157,7 @@ public void testV2Api() throws Exception {
         .withPayload("{}")
         .build()
         .process(cloudClient);
-    var finishedSpans = getAndClearSpans();
+    var finishedSpans = getAndClearSpans(1);
     assertEquals("post:/collections/{collection}/reload", finishedSpans.get(0).getName());
     assertCollectionName(finishedSpans.get(0), COLLECTION);
 
@@ -165,7 +167,7 @@ public void testV2Api() throws Exception {
         .withParams(params("commit", "true"))
         .build()
         .process(cloudClient);
-    finishedSpans = getAndClearSpans();
+    finishedSpans = getAndClearSpans(1);
     assertEquals("post:/c/{collection}/update/json", finishedSpans.get(0).getName());
     assertCollectionName(finishedSpans.get(0), COLLECTION);
 
@@ -175,7 +177,7 @@ public void testV2Api() throws Exception {
             .withParams(params("q", "id:9"))
             .build()
             .process(cloudClient);
-    finishedSpans = getAndClearSpans();
+    finishedSpans = getAndClearSpans(1);
     assertEquals("get:/c/{collection}/select", finishedSpans.get(0).getName());
     assertCollectionName(finishedSpans.get(0), COLLECTION);
     assertEquals(1, ((SolrDocumentList) v2Response.getResponse().get("response")).getNumFound());
@@ -191,7 +193,7 @@ public void testApacheClient() throws Exception {
     CollectionAdminRequest.ColStatus a1 = CollectionAdminRequest.collectionStatus(COLLECTION);
     CollectionAdminResponse r1 = a1.process(cluster.getSolrClient());
     assertEquals(0, r1.getStatus());
-    var finishedSpans = getAndClearSpans();
+    var finishedSpans = getAndClearSpans(1);
     var parentTraceId = getRootTraceId(finishedSpans);
     for (var span : finishedSpans) {
       if (isRootSpan(span)) {
@@ -239,7 +241,7 @@ private void verifyCollectionCreation(String collection) throws Exception {
     // db.instance=testInternalCollectionApiCommands_shard2_replica_n4
     // db.instance=testInternalCollectionApiCommands_shard1_replica_n2
 
-    var finishedSpans = getAndClearSpans();
+    var finishedSpans = getAndClearSpans(1);
     var s0 = finishedSpans.remove(0);
     assertCollectionName(s0, collection);
     assertEquals("create:/admin/collections", s0.getName());
@@ -280,7 +282,7 @@ private void verifyCollectionDeletion(String collection) throws Exception {
     // db.instance=testInternalCollectionApiCommands_shard2_replica_n4
     // db.instance=testInternalCollectionApiCommands_shard1_replica_n6
 
-    var finishedSpans = getAndClearSpans();
+    var finishedSpans = getAndClearSpans(1);
     var s0 = finishedSpans.remove(0);
     assertCollectionName(s0, collection);
     assertEquals("delete:/admin/collections", s0.getName());
@@ -327,7 +329,21 @@ private void assertOneSpanIsChildOfAnother(List<SpanData> finishedSpans) {
   }
 
   static List<SpanData> getAndClearSpans() {
+    return getAndClearSpans(0);
+  }
+
+  static List<SpanData> getAndClearSpans(int minExpected) {
     InMemorySpanExporter exporter = CustomTestOtelTracerConfigurator.getInMemorySpanExporter();
+    try {
+      RetryUtil.retryUntil(
+          "Timed out waiting for " + minExpected + " span(s)",
+          250,
+          20,
+          TimeUnit.MILLISECONDS,
+          () -> exporter.getFinishedSpanItems().size() >= minExpected);
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+    }
     List<SpanData> result = new ArrayList<>(exporter.getFinishedSpanItems());
     Collections.reverse(result); // nicer to see spans chronologically
     exporter.reset();
diff --git a/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java b/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java
index 82b3fd8e83ae..af9248be307b 100644
--- a/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java
+++ b/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java
@@ -34,13 +34,13 @@
 import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2;
-import org.junit.ClassRule;
+import org.junit.Rule;
 
 @LogLevel("org.eclipse.jetty.client=DEBUG;org.eclipse.jetty.util=DEBUG")
 @SolrTestCaseJ4.SuppressSSL
 public class HttpJettySolrClientCompatibilityTest extends SolrTestCaseJ4 {
 
-  @ClassRule public static SolrJettyTestRule solrTestRule = new SolrJettyTestRule();
+  @Rule public SolrJettyTestRule solrTestRule = new SolrJettyTestRule();
 
   public void testSystemPropertyFlag() {
     System.setProperty("solr.http1", "true");
@@ -62,6 +62,7 @@ public void testConnectToOldNodesUsingHttp1() throws Exception {
             .build();
     EnvUtils.setProperty(
         ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
+    System.setProperty("solr.http1", "true");
     solrTestRule.startSolr(createTempDir(), new Properties(), jettyConfig);
     solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();
 
@@ -74,8 +75,6 @@ public void testConnectToOldNodesUsingHttp1() throws Exception {
         client.query(new SolrQuery("*:*"), SolrRequest.METHOD.GET);
       } catch (RemoteSolrException ignored) {
       }
-    } finally {
-      solrTestRule.reset();
     }
   }
 
@@ -100,8 +99,6 @@ public void testConnectToNewNodesUsingHttp1() throws Exception {
         client.query(new SolrQuery("*:*"), SolrRequest.METHOD.GET);
       } catch (RemoteSolrException ignored) {
       }
-    } finally {
-      solrTestRule.reset();
     }
   }
 
@@ -118,6 +115,7 @@ public void testConnectToOldNodesUsingHttp2() throws Exception {
 
     EnvUtils.setProperty(
         ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
+    System.setProperty("solr.http1", "true");
     solrTestRule.startSolr(createTempDir(), new Properties(), jettyConfig);
     solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();
 
@@ -133,8 +131,6 @@ public void testConnectToOldNodesUsingHttp2() throws Exception {
       } catch (SolrServerException e) {
         // expected
       }
-    } finally {
-      solrTestRule.reset();
     }
   }
 }
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientCustomizerTest.java b/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/PreemptiveBasicAuthClientCustomizerTest.java
similarity index 88%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientCustomizerTest.java
rename to solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/PreemptiveBasicAuthClientCustomizerTest.java
index ae76c810232b..cf5af87a16a5 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientCustomizerTest.java
+++ b/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/PreemptiveBasicAuthClientCustomizerTest.java
@@ -24,7 +24,7 @@
 import java.nio.file.Path;
 import java.util.Properties;
 import org.apache.solr.SolrTestCase;
-import org.apache.solr.client.solrj.apache.HttpClientUtil;
+import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 
 public class PreemptiveBasicAuthClientCustomizerTest extends SolrTestCase {
 
@@ -70,8 +70,10 @@ public void testCredentialsFromSystemProperties() {
         PreemptiveBasicAuthClientCustomizer.SYS_PROP_BASIC_AUTH_CREDENTIALS, "foo:bar");
     PreemptiveBasicAuthClientCustomizer.CredentialsResolver credentialsResolver =
         new PreemptiveBasicAuthClientCustomizer.CredentialsResolver();
-    assertEquals("foo", credentialsResolver.defaultParams.get(HttpClientUtil.PROP_BASIC_AUTH_USER));
-    assertEquals("bar", credentialsResolver.defaultParams.get(HttpClientUtil.PROP_BASIC_AUTH_PASS));
+    assertEquals(
+        "foo", credentialsResolver.defaultParams.get(SolrHttpConstants.PROP_BASIC_AUTH_USER));
+    assertEquals(
+        "bar", credentialsResolver.defaultParams.get(SolrHttpConstants.PROP_BASIC_AUTH_PASS));
   }
 
   public void testCredentialsFromConfigFile() throws IOException {
@@ -86,7 +88,9 @@ public void testCredentialsFromConfigFile() throws IOException {
         PreemptiveBasicAuthClientCustomizer.SYS_PROP_HTTP_CLIENT_CONFIG, f.toString());
     PreemptiveBasicAuthClientCustomizer.CredentialsResolver credentialsResolver =
         new PreemptiveBasicAuthClientCustomizer.CredentialsResolver();
-    assertEquals("foo", credentialsResolver.defaultParams.get(HttpClientUtil.PROP_BASIC_AUTH_USER));
-    assertEquals("bar", credentialsResolver.defaultParams.get(HttpClientUtil.PROP_BASIC_AUTH_PASS));
+    assertEquals(
+        "foo", credentialsResolver.defaultParams.get(SolrHttpConstants.PROP_BASIC_AUTH_USER));
+    assertEquals(
+        "bar", credentialsResolver.defaultParams.get(SolrHttpConstants.PROP_BASIC_AUTH_PASS));
   }
 }
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
index 9b190864c868..72e49588c17c 100644
--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
@@ -18,9 +18,6 @@
 package org.apache.solr.client.solrj.io.graph;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -56,7 +53,6 @@
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.NamedList;
-import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.util.BaseTestHarness;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -1226,13 +1222,8 @@ public void testGraphHandler() throws Exception {
         .add(id, "5", "from_s", "jim", "to_s", "ann", "message_t", "Hello steve")
         .commit(cluster.getSolrClient(), COLLECTION);
 
-    commit();
+    SolrClient client = cluster.getRandomJetty(random()).getSolrClient();
 
-    List<JettySolrRunner> runners = cluster.getJettySolrRunners();
-    JettySolrRunner runner = runners.get(0);
-    String url = runner.getBaseUrl().toString();
-
-    SolrClient client = getHttpSolrClient(url);
     ModifiableSolrParams params = new ModifiableSolrParams();
 
     String expr =
@@ -1250,9 +1241,7 @@ public void testGraphHandler() throws Exception {
 
     NamedList<Object> genericResponse = client.request(query);
 
-    InputStream stream = (InputStream) genericResponse.get(InputStreamResponseParser.STREAM_KEY);
-    InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8);
-    String xml = readString(reader);
+    String xml = InputStreamResponseParser.consumeResponseToString(genericResponse);
     // Validate the nodes
     String error =
         BaseTestHarness.validateXPath(
@@ -1281,16 +1270,6 @@ public void testGraphHandler() throws Exception {
     client.close();
   }
 
-  private String readString(InputStreamReader reader) throws Exception {
-    StringBuilder builder = new StringBuilder();
-    int c = 0;
-    while ((c = reader.read()) != -1) {
-      builder.append(((char) c));
-    }
-
-    return builder.toString();
-  }
-
   protected List<Tuple> getTuples(TupleStream tupleStream) throws IOException {
     tupleStream.open();
     List<Tuple> tuples = new ArrayList<>();
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CollectionScopedSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CollectionScopedSolrClient.java
new file mode 100644
index 000000000000..d8d51ef83455
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CollectionScopedSolrClient.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.solr.client.solrj.impl;
+
+import java.io.IOException;
+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.common.util.NamedList;
+
+/**
+ * This SolrClient delegates to a backing client with a specified collection. Simple attempts to
+ * refer to another collection will fail. DISCLAIMER: this isn't a security mechanism.
+ */
+public class CollectionScopedSolrClient extends SolrClient {
+
+  private final SolrClient delegate;
+
+  public CollectionScopedSolrClient(SolrClient delegate, String defaultCollection) {
+    this.delegate = delegate;
+    this.defaultCollection = defaultCollection;
+  }
+
+  @Override
+  public NamedList<Object> request(SolrRequest<?> request, String collection)
+      throws SolrServerException, IOException {
+    if (collection == null) {
+      collection = defaultCollection;
+    } else if (!collection.equals(defaultCollection)) {
+      throw new IllegalArgumentException(
+          "Restricted to default collection " + defaultCollection + " but was given " + collection);
+    }
+    return delegate.request(request, collection);
+  }
+
+  @Override
+  public void close() throws IOException {
+    delegate.close();
+  }
+}
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 895cc090733e..ba83a8495440 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.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.JavaBinRequestWriter;
 import org.apache.solr.client.solrj.response.JavaBinResponseParser;
 
@@ -30,9 +30,9 @@ public class SolrExampleBinaryTest extends SolrExampleTests {
 
   @Override
   public SolrClient createNewSolrClient() {
-    return new HttpApacheSolrClient.Builder(solrTestRule.getBaseUrl())
+    return new HttpJettySolrClient.Builder()
+        .withHttpClient(solrTestRule.getJetty().getSolrClient())
         .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)
-        .allowMultiPartPost(random().nextBoolean())
         .withRequestWriter(new JavaBinRequestWriter())
         .withResponseParser(new JavaBinResponseParser())
         .build();
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 0f6ba80c56c7..deabd8534c7a 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.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.JavaBinRequestWriter;
 import org.apache.solr.client.solrj.request.RequestWriter;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -47,9 +47,9 @@ public class SolrExampleCborTest extends SolrExampleTests {
 
   @Override
   public SolrClient createNewSolrClient() {
-    return new HttpApacheSolrClient.Builder(solrTestRule.getBaseUrl())
+    return new HttpJettySolrClient.Builder()
+        .withHttpClient(solrTestRule.getJetty().getSolrClient())
         .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)
-        .allowMultiPartPost(random().nextBoolean())
         .withRequestWriter(cborRequestWriter())
         .withResponseParser(cborResponseParser())
         .build();
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 509d2b06b654..ca9ef93e5245 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
@@ -44,10 +44,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.HttpApacheSolrClient;
 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.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
 import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;
 import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
@@ -722,7 +722,7 @@ public void testErrorHandling() throws Exception {
     doc.addField("id", "DOCID2");
     doc.addField("name", "hello");
 
-    if (client instanceof HttpApacheSolrClient) {
+    if (client instanceof HttpJettySolrClient) {
       ex = expectThrows(SolrException.class, () -> client.add(doc));
       assertEquals(400, ex.code());
       assertTrue(ex.getMessage().indexOf("contains multiple values for uniqueKey") > 0);
@@ -2386,7 +2386,7 @@ public void testUpdateField() throws Exception {
     doc.addField(field, oper);
     try {
       client.add(doc);
-      if (client instanceof HttpApacheSolrClient) {
+      if (client instanceof HttpJettySolrClient) {
         // XXX concurrent client reports exceptions differently
         fail("Operation should throw an exception!");
       } else if (client instanceof ErrorTrackingConcurrentUpdateSolrClient concurrentClient) {
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 9ee59fce4a58..07f8fe6fa1fb 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.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.XMLRequestWriter;
 import org.apache.solr.client.solrj.response.XMLResponseParser;
 
@@ -30,9 +30,9 @@ public class SolrExampleXMLTest extends SolrExampleTests {
 
   @Override
   public SolrClient createNewSolrClient() {
-    return new HttpApacheSolrClient.Builder(solrTestRule.getBaseUrl())
+    return new HttpJettySolrClient.Builder()
+        .withHttpClient(solrTestRule.getJetty().getSolrClient())
         .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)
-        .allowMultiPartPost(random().nextBoolean())
         .withRequestWriter(new XMLRequestWriter())
         .withResponseParser(new XMLResponseParser())
         .build();
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 bf2a63ceb48f..94e909d1252a 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
@@ -22,8 +22,8 @@
 import java.util.Iterator;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.beans.Field;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.JavaBinRequestWriter;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.request.XMLRequestWriter;
@@ -60,7 +60,8 @@ public static void beforeTest() throws Exception {
   @Test
   public void testWithXml() throws Exception {
     try (SolrClient client =
-        new HttpApacheSolrClient.Builder(solrTestRule.getBaseUrl())
+        new HttpJettySolrClient.Builder()
+            .withHttpClient(solrTestRule.getJetty().getSolrClient())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withRequestWriter(new XMLRequestWriter())
             .build()) {
@@ -72,7 +73,8 @@ public void testWithXml() throws Exception {
   @Test
   public void testWithBinary() throws Exception {
     try (SolrClient client =
-        new HttpApacheSolrClient.Builder(solrTestRule.getBaseUrl())
+        new HttpJettySolrClient.Builder()
+            .withHttpClient(solrTestRule.getJetty().getSolrClient())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withRequestWriter(new JavaBinRequestWriter())
             .build()) {
@@ -84,7 +86,8 @@ public void testWithBinary() throws Exception {
   @Test
   public void testWithBinaryBean() throws Exception {
     try (SolrClient client =
-        new HttpApacheSolrClient.Builder(solrTestRule.getBaseUrl())
+        new HttpJettySolrClient.Builder()
+            .withHttpClient(solrTestRule.getJetty().getSolrClient())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withRequestWriter(new JavaBinRequestWriter())
             .build()) {
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 7db897f7e890..e0b26f7d86b1 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
@@ -39,7 +39,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.JavaBinRequestWriter;
 import org.apache.solr.client.solrj.request.XMLRequestWriter;
 import org.apache.solr.client.solrj.response.QueryResponse;
@@ -114,7 +114,8 @@ public void showExceptions() throws Exception {
   @Test
   public void testWithXml() throws Exception {
     try (SolrClient client =
-        new HttpApacheSolrClient.Builder(solrTestRule.getBaseUrl())
+        new HttpJettySolrClient.Builder()
+            .withHttpClient(solrTestRule.getJetty().getSolrClient())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withRequestWriter(new XMLRequestWriter())
             .build()) {
@@ -126,7 +127,8 @@ public void testWithXml() throws Exception {
   @Test
   public void testWithBinary() throws Exception {
     try (SolrClient client =
-        new HttpApacheSolrClient.Builder(solrTestRule.getBaseUrl())
+        new HttpJettySolrClient.Builder()
+            .withHttpClient(solrTestRule.getJetty().getSolrClient())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withRequestWriter(new JavaBinRequestWriter())
             .build()) {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java
index 3a66dc2c7bc3..32aa7164cd12 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.JavaBinRequestWriter;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.response.JavaBinResponseParser;
@@ -35,15 +36,18 @@ public class SolrExampleStreamingBinaryTest extends SolrExampleStreamingTest {
   @Override
   public SolrClient createNewSolrClient() {
 
+    var httpJettyClient =
+        new HttpJettySolrClient.Builder()
+            .withResponseParser(new JavaBinResponseParser())
+            .withRequestWriter(new JavaBinRequestWriter())
+            .build();
     SolrClient client =
-        new ErrorTrackingConcurrentUpdateSolrClient.Builder(solrTestRule.getBaseUrl())
+        new ErrorTrackingConcurrentUpdateSolrClient.Builder(
+                solrTestRule.getBaseUrl(), httpJettyClient, true)
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withQueueSize(2)
             .withThreadCount(5)
-            .withResponseParser(new JavaBinResponseParser())
-            .withRequestWriter(new JavaBinRequestWriter())
             .build();
-
     return client;
   }
 
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 0625ab905919..be869ada9bf7 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,8 @@
 import java.util.List;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrExampleTests;
-import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient;
+import org.apache.solr.client.solrj.jetty.ConcurrentUpdateJettySolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.client.solrj.request.XMLRequestWriter;
@@ -38,12 +39,16 @@ public class SolrExampleStreamingTest extends SolrExampleTests {
   @Override
   public SolrClient createNewSolrClient() {
     // smaller queue size hits locks more often
-    return new ErrorTrackingConcurrentUpdateSolrClient.Builder(solrTestRule.getBaseUrl())
+    var httpJettyClient =
+        new HttpJettySolrClient.Builder()
+            .withResponseParser(new XMLResponseParser())
+            .withRequestWriter(new XMLRequestWriter())
+            .build();
+    return new ErrorTrackingConcurrentUpdateSolrClient.Builder(
+            solrTestRule.getBaseUrl(), httpJettyClient, true)
         .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)
         .withQueueSize(2)
         .withThreadCount(5)
-        .withResponseParser(new XMLResponseParser())
-        .withRequestWriter(new XMLRequestWriter())
         .build();
   }
 
@@ -52,8 +57,9 @@ public void testWaitOptions() throws Exception {
     // TODO these failures are not the same as recorded by the client
     final List<Throwable> failures = new ArrayList<>();
     final String serverUrl = solrTestRule.getBaseUrl() + "/" + DEFAULT_TEST_CORENAME;
-    try (ConcurrentUpdateSolrClient concurrentClient =
-        new FailureRecordingConcurrentUpdateSolrClient.Builder(serverUrl)
+    try (var concurrentClient =
+        new FailureRecordingConcurrentUpdateSolrClient.Builder(
+                serverUrl, (HttpJettySolrClient) solrTestRule.getSolrClient(), false)
             .withQueueSize(2)
             .withThreadCount(2)
             .build()) {
@@ -79,7 +85,7 @@ public void testWaitOptions() throws Exception {
     }
   }
 
-  static class FailureRecordingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient {
+  static class FailureRecordingConcurrentUpdateSolrClient extends ConcurrentUpdateJettySolrClient {
     private final List<Throwable> failures = new ArrayList<>();
 
     public FailureRecordingConcurrentUpdateSolrClient(Builder builder) {
@@ -91,9 +97,9 @@ public void handleError(Throwable ex) {
       failures.add(ex);
     }
 
-    static class Builder extends ConcurrentUpdateSolrClient.Builder {
-      public Builder(String baseSolrUrl) {
-        super(baseSolrUrl);
+    static class Builder extends ConcurrentUpdateJettySolrClient.Builder {
+      public Builder(String baseSolrUrl, HttpJettySolrClient solrClient, boolean closeClient) {
+        super(baseSolrUrl, solrClient, closeClient);
       }
 
       @Override
@@ -103,7 +109,8 @@ public FailureRecordingConcurrentUpdateSolrClient build() {
     }
   }
 
-  public static class ErrorTrackingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient {
+  public static class ErrorTrackingConcurrentUpdateSolrClient
+      extends ConcurrentUpdateJettySolrClient {
     public Throwable lastError = null;
 
     public ErrorTrackingConcurrentUpdateSolrClient(Builder builder) {
@@ -115,10 +122,10 @@ public void handleError(Throwable ex) {
       lastError = ex;
     }
 
-    public static class Builder extends ConcurrentUpdateSolrClient.Builder {
+    public static class Builder extends ConcurrentUpdateJettySolrClient.Builder {
 
-      public Builder(String baseSolrUrl) {
-        super(baseSolrUrl);
+      public Builder(String baseSolrUrl, HttpJettySolrClient solrClient, boolean closeClient) {
+        super(baseSolrUrl, solrClient, closeClient);
       }
 
       @Override
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBadInputTest.java
index 5f2fc5ee67af..f08cfcce42f1 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBadInputTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBadInputTest.java
@@ -37,7 +37,7 @@ public static void setupCluster() throws Exception {
 
   @Test
   public void testDeleteByIdReportsInvalidIdLists() throws Exception {
-    try (SolrClient client = new RandomizingCloudHttp2SolrClientBuilder(cluster).build()) {
+    try (SolrClient client = new RandomizingCloudSolrClientBuilder(cluster).build()) {
       assertExceptionThrownWithMessageContaining(
           IllegalArgumentException.class,
           List.of("ids", "null"),
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 3d2f32fc2a75..88ae42fc32c4 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
@@ -34,6 +34,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.solr.client.solrj.RemoteSolrException;
@@ -1062,7 +1063,7 @@ public void testRetryUpdatesWhenClusterStateIsStale() throws Exception {
             .sendDirectUpdatesToAnyShardReplica()
             .withDefaultCollection(COL)
             // don't let collection cache entries get expired, even on a slow machine...
-            .withCollectionCacheTtl(Integer.MAX_VALUE)
+            .withCollectionCacheTtl(1, TimeUnit.DAYS)
             .build()) {
 
       // do a query to populate stale_client's cache...
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 8d279ea773bd..706e334f1d16 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
@@ -47,7 +47,7 @@
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.LBHttpSolrClient;
+import org.apache.solr.client.solrj.jetty.LBJettySolrClient;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ClusterState;
@@ -95,13 +95,16 @@ public DocCollection get() {
     NamedList<Object> okResponse = new NamedList<>();
     okResponse.add("responseHeader", new NamedList<>(Map.of("status", 0)));
 
-    LBHttpSolrClient mockLbclient = getMockLbHttpSolrClient(responses);
+    LBJettySolrClient mockLbclient = getMockLbHttpSolrClient(responses);
     AtomicInteger lbhttpRequestCount = new AtomicInteger();
     try (ClusterStateProvider clusterStateProvider = getStateProvider(livenodes, refs);
         CloudSolrClient cloudClient =
-            new RandomizingCloudSolrClientBuilder(clusterStateProvider)
-                .withLBHttpSolrClient(mockLbclient)
-                .build()) {
+            new RandomizingCloudSolrClientBuilder(clusterStateProvider) {
+              @Override
+              protected LBSolrClient createOrGetLbClient(HttpSolrClient myClient) {
+                return mockLbclient;
+              }
+            }.build()) {
       livenodes.addAll(Set.of("192.168.1.108:7574_solr", "192.168.1.108:8983_solr"));
       ClusterState cs =
           ClusterState.createFromJson(
@@ -297,9 +300,9 @@ public void testConcurrentRefreshIsDeduplicated() throws Exception {
   }
 
   @SuppressWarnings({"unchecked"})
-  private LBHttpSolrClient getMockLbHttpSolrClient(Map<String, Function<?, ?>> responses)
+  private LBJettySolrClient getMockLbHttpSolrClient(Map<String, Function<?, ?>> responses)
       throws Exception {
-    LBHttpSolrClient mockLbclient = mock(LBHttpSolrClient.class);
+    var mockLbclient = mock(LBJettySolrClient.class);
 
     when(mockLbclient.request(any(LBSolrClient.Req.class)))
         .then(
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 e82dcb1ca9fb..ae429783d4f7 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
@@ -23,7 +23,7 @@
 import java.util.List;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.LBHttpSolrClient;
+import org.apache.solr.client.solrj.jetty.LBJettySolrClient;
 import org.apache.solr.common.util.EnvUtils;
 import org.apache.solr.util.ExternalPaths;
 import org.apache.solr.util.SolrJettyTestRule;
@@ -51,8 +51,7 @@ public static void beforeTest() throws Exception {
   @Test
   public void testDeleteByIdReportsInvalidIdLists() throws Exception {
     try (SolrClient client =
-        new LBHttpSolrClient.Builder()
-            .withBaseEndpoint(solrTestRule.getBaseUrl())
+        new LBJettySolrClient.Builder(solrTestRule.getJetty().getSolrClient())
             .withDefaultCollection(ANY_COLLECTION)
             .build()) {
       assertExceptionThrownWithMessageContaining(
@@ -82,7 +81,7 @@ public void testDeleteByIdReportsInvalidIdLists() throws Exception {
     }
 
     try (SolrClient client =
-        new LBHttpSolrClient.Builder().withBaseEndpoint(solrTestRule.getBaseUrl()).build()) {
+        new LBJettySolrClient.Builder(solrTestRule.getJetty().getSolrClient()).build()) {
       assertExceptionThrownWithMessageContaining(
           IllegalArgumentException.class,
           List.of("ids", "null"),
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 5d31f782379a..ab27c827c626 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
@@ -31,7 +31,6 @@
 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;
@@ -207,12 +206,6 @@ private static UpdateRequest prefPull(final UpdateRequest req) {
   }
 
   public void testBuilderImplicitBehavior() throws Exception {
-    try (CloudSolrClient client =
-        new CloudLegacySolrClient.Builder(
-                List.of(cluster.getZkServer().getZkAddress()), Optional.empty())
-            .build()) {
-      assertTrue(client.isUpdatesToLeaders());
-    }
     try (CloudSolrClient client =
         new CloudSolrClient.Builder(List.of(cluster.getZkServer().getZkAddress()), Optional.empty())
             .build()) {
@@ -220,28 +213,6 @@ public void testBuilderImplicitBehavior() throws Exception {
     }
   }
 
-  public void testLegacyClientThatDefaultsToLeaders() throws Exception {
-    try (CloudSolrClient client =
-        new CloudLegacySolrClient.Builder(
-                List.of(cluster.getZkServer().getZkAddress()), Optional.empty())
-            .sendUpdatesOnlyToShardLeaders()
-            .build()) {
-      checkUpdatesDefaultToLeaders(client);
-      checkUpdatesWithSendToLeadersFalse(client);
-    }
-  }
-
-  public void testLegacyClientThatDoesNotDefaultToLeaders() throws Exception {
-    try (CloudSolrClient client =
-        new CloudLegacySolrClient.Builder(
-                List.of(cluster.getZkServer().getZkAddress()), Optional.empty())
-            .sendUpdatesToAnyReplica()
-            .build()) {
-      checkUpdatesWithShardsPrefPull(client);
-      checkUpdatesWithSendToLeadersFalse(client);
-    }
-  }
-
   public void testHttp2ClientThatDefaultsToLeaders() throws Exception {
     try (CloudSolrClient client =
         new CloudSolrClient.Builder(List.of(cluster.getZkServer().getZkAddress()), Optional.empty())
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 87b0a8147c6a..aebadc76a426 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,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.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.response.V2Response;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.cloud.ClusterState;
@@ -84,11 +83,7 @@ public void testIsCollectionRequest() {
 
   @Test
   public void testHttpSolrClient() throws Exception {
-    SolrClient solrClient =
-        new HttpApacheSolrClient.Builder(cluster.getJettySolrRunner(0).getBaseUrl().toString())
-            .build();
-    doTest(solrClient);
-    solrClient.close();
+    doTest(cluster.getJettySolrRunner(0).getSolrClient());
   }
 
   @Test
@@ -150,23 +145,21 @@ public void testV2Forwarding() throws Exception {
     cs.getCollection("v2forward").forEachReplica((s, replica) -> node[0] = replica.getNodeName());
 
     // find a node that does not have a replica for this collection
-    final String[] testNode = new String[1];
-    cs.getLiveNodes()
-        .forEach(
-            s -> {
-              if (!s.equals(node[0])) testNode[0] = s;
-            });
-
-    String testServer = cluster.getZkStateReader().getBaseUrlForNodeName(testNode[0]);
+    String testNode =
+        cs.getLiveNodes().stream().filter(s -> !s.equals(node[0])).findAny().orElseThrow();
+
     V2Request v2r =
         new V2Request.Builder("/c/v2forward/_introspect")
             .withMethod(SolrRequest.METHOD.GET)
             .build();
 
-    try (SolrClient client1 =
-        new HttpApacheSolrClient.Builder().withBaseSolrUrl(testServer).build()) {
-      V2Response rsp = v2r.process(client1);
-      assertEquals("0", rsp._getStr("responseHeader/status"));
-    }
+    V2Response rsp =
+        v2r.process(
+            cluster.getJettySolrRunners().stream()
+                .filter(j -> testNode.equals(j.getNodeName()))
+                .findAny()
+                .orElseThrow()
+                .getSolrClient());
+    assertEquals("0", rsp._getStr("responseHeader/status"));
   }
 }
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 9c00f3279f2e..464add48ee53 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.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.common.SolrDocument;
@@ -72,7 +72,8 @@ public void doBefore() throws IOException, SolrServerException {
   public void testQueryParse() throws Exception {
 
     try (SolrClient client =
-        new HttpApacheSolrClient.Builder(solrTestRule.getBaseUrl())
+        new HttpJettySolrClient.Builder()
+            .withHttpClient(solrTestRule.getJetty().getSolrClient())
             .withDefaultCollection(DEFAULT_TEST_CORENAME)
             .withResponseParser(new InputStreamResponseParser("xml"))
             .build()) {
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 881d42f16de7..975b5721ecff 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.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.common.SolrInputDocument;
@@ -144,8 +144,8 @@ private void addSampleDocs() throws SolrServerException, IOException {
   private SolrClient createSuggestSolrClient() {
     final ResponseParser randomParser =
         random().nextBoolean() ? new JavaBinResponseParser() : new XMLResponseParser();
-    return new HttpApacheSolrClient.Builder()
-        .withBaseSolrUrl(solrTestRule.getBaseUrl())
+    return new HttpJettySolrClient.Builder()
+        .withHttpClient(solrTestRule.getJetty().getSolrClient())
         .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)
         .withResponseParser(randomParser)
         .build();
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 24aec527ac1d..26036ee28964 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -76,8 +76,6 @@
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.lucene.util.Constants;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.apache.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.ClusterStateProvider;
@@ -2474,55 +2472,8 @@ public static CollectionAdminRequest.RequestStatusResponse waitForAsyncClusterRe
         rsp -> rsp.getRequestStatus().isFinal());
   }
 
-  /**
-   * A variant of {@link org.apache.solr.client.solrj.impl.CloudSolrClient.Builder} that will
-   * randomize some internal settings.
-   */
-  public static class RandomizingCloudHttp2SolrClientBuilder extends CloudSolrClient.Builder {
-
-    public RandomizingCloudHttp2SolrClientBuilder(List<String> zkHosts, Optional<String> zkChroot) {
-      super(zkHosts, zkChroot);
-      randomizeCloudSolrClient();
-    }
-
-    public RandomizingCloudHttp2SolrClientBuilder(ClusterStateProvider stateProvider) {
-      super(new ArrayList<>());
-      this.stateProvider = stateProvider;
-      randomizeCloudSolrClient();
-    }
-
-    public RandomizingCloudHttp2SolrClientBuilder(MiniSolrCloudCluster cluster) {
-      super(new ArrayList<>());
-      if (random().nextBoolean()) {
-        this.zkHosts.add(cluster.getZkServer().getZkAddress());
-      } else {
-        populateSolrUrls(cluster);
-      }
-
-      randomizeCloudSolrClient();
-    }
-
-    private void populateSolrUrls(MiniSolrCloudCluster cluster) {
-      if (random().nextBoolean()) {
-        final List<JettySolrRunner> solrNodes = cluster.getJettySolrRunners();
-        for (JettySolrRunner node : solrNodes) {
-          this.solrUrls.add(node.getBaseUrl().toString());
-        }
-      } else {
-        this.solrUrls.add(cluster.getRandomJetty(random()).getBaseUrl().toString());
-      }
-    }
-
-    private void randomizeCloudSolrClient() {
-      this.directUpdatesToLeadersOnly = random().nextBoolean();
-      this.shardLeadersOnly = random().nextBoolean();
-      this.parallelUpdates = random().nextBoolean();
-    }
-  }
-
-  /** A variant of {@code CloudSolrClient.Builder} that will randomize some internal settings. */
-  @Deprecated
-  public static class RandomizingCloudSolrClientBuilder extends CloudLegacySolrClient.Builder {
+  /** A builder that will randomize some internal settings. */
+  public static class RandomizingCloudSolrClientBuilder extends CloudSolrClient.Builder {
 
     public RandomizingCloudSolrClientBuilder(List<String> zkHosts, Optional<String> zkChroot) {
       super(zkHosts, zkChroot);
@@ -2530,11 +2481,13 @@ public RandomizingCloudSolrClientBuilder(List<String> zkHosts, Optional<String>
     }
 
     public RandomizingCloudSolrClientBuilder(ClusterStateProvider stateProvider) {
+      super(new ArrayList<>());
       this.stateProvider = stateProvider;
       randomizeCloudSolrClient();
     }
 
     public RandomizingCloudSolrClientBuilder(MiniSolrCloudCluster cluster) {
+      super(new ArrayList<>());
       if (random().nextBoolean()) {
         this.zkHosts.add(cluster.getZkServer().getZkAddress());
       } else {
@@ -2569,12 +2522,14 @@ private void randomizeCloudSolrClient() {
    *
    * @param url the base URL for a Solr node. Should not contain a core or collection name.
    */
-  public static HttpApacheSolrClient getHttpSolrClient(String url) {
-    return new HttpApacheSolrClient.Builder(url).build();
+  @Deprecated // probably use an existing client like on a testRule/jettyRunner
+  public static HttpJettySolrClient getHttpSolrClient(String url) {
+    return new HttpJettySolrClient.Builder(url).build();
   }
 
   /** Create a basic HttpSolrClient pointed at the specified replica */
-  public static HttpApacheSolrClient getHttpSolrClient(Replica replica) {
+  @Deprecated // probably use an existing client like on a testRule/jettyRunner
+  public static HttpJettySolrClient getHttpSolrClient(Replica replica) {
     return getHttpSolrClient(replica.getBaseUrl(), replica.getCoreName());
   }
 
@@ -2587,8 +2542,9 @@ public static HttpApacheSolrClient getHttpSolrClient(Replica replica) {
    * @param defaultCoreName the name of a core that the created client should default to when making
    *     core-aware requests
    */
-  public static HttpApacheSolrClient getHttpSolrClient(String url, String defaultCoreName) {
-    return new HttpApacheSolrClient.Builder(url).withDefaultCollection(defaultCoreName).build();
+  @Deprecated // probably use an existing client like on a testRule/jettyRunner
+  public static HttpJettySolrClient getHttpSolrClient(String url, String defaultCoreName) {
+    return new HttpJettySolrClient.Builder(url).withDefaultCollection(defaultCoreName).build();
   }
 
   /**
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 e977ffc82892..ef9159a38d59 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
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.cloud;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.solr.common.cloud.ZkStateReader.HTTPS;
 import static org.apache.solr.common.cloud.ZkStateReader.URL_SCHEME;
@@ -59,6 +60,7 @@
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
@@ -90,6 +92,7 @@
 import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.IOUtils;
 import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.RetryUtil;
 import org.apache.solr.common.util.SolrNamedThreadFactory;
 import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.common.util.TimeSource;
@@ -366,7 +369,7 @@ protected boolean useTlogReplicas() {
   }
 
   protected CloudSolrClient createCloudClient(String defaultCollection) {
-    return getCloudSolrClient(
+    return createNewCloudSolrClient(
         zkServer.getZkAddress(), defaultCollection, random().nextBoolean(), 30000, 120000);
   }
 
@@ -379,12 +382,17 @@ protected void createServers(int numServers) throws Exception {
             controlJettyDir, useJettyDataDir ? getDataDir(testDir + "/control/data") : null);
     controlJetty.start();
     try (CloudSolrClient client = createCloudClient("control_collection")) {
-      assertEquals(
-          0,
-          CollectionAdminRequest.createCollection("control_collection", "conf1", 1, 1)
-              .setCreateNodeSet(controlJetty.getNodeName())
-              .process(client)
-              .getStatus());
+      RetryUtil.retryOnException(
+          SolrException.class,
+          30000,
+          1000,
+          () ->
+              assertEquals(
+                  0,
+                  CollectionAdminRequest.createCollection("control_collection", "conf1", 1, 1)
+                      .setCreateNodeSet(controlJetty.getNodeName())
+                      .process(client)
+                      .getStatus()));
       waitForActiveReplicaCount(client, "control_collection", 1);
     }
 
@@ -2259,12 +2267,14 @@ protected void destroyServers() throws Exception {
 
     customThreadPool.execute(() -> IOUtils.closeQuietly(cloudClient));
 
-    ExecutorUtil.shutdownAndAwaitTermination(customThreadPool);
-
-    coreClients.clear();
-    solrClientByCollection.clear();
+    try {
+      ExecutorUtil.shutdownAndAwaitTermination(customThreadPool);
+    } finally {
+      coreClients.clear();
+      solrClientByCollection.clear();
 
-    super.destroyServers();
+      super.destroyServers();
+    }
   }
 
   @Override
@@ -2349,7 +2359,7 @@ protected CollectionAdminResponse createCollection(
     CollectionAdminResponse res = new CollectionAdminResponse();
     if (client == null) {
       final String baseUrl = getBaseUrl(jettys.get(clientIndex));
-      try (SolrClient adminClient = createNewSolrClient("", baseUrl)) {
+      try (SolrClient adminClient = createNewSolrClient(baseUrl, null)) {
         res.setResponse(adminClient.request(request));
       }
     } else {
@@ -2431,26 +2441,24 @@ ZkStateReader.PULL_REPLICAS, getPullReplicaCount(),
    * not wish to have any randomized behavior should use the {@link
    * org.apache.solr.client.solrj.impl.CloudSolrClient.Builder} class directly
    */
-  public static CloudSolrClient getCloudSolrClient(
+  public static CloudSolrClient createNewCloudSolrClient(
       String zkHost,
       String defaultCollection,
       boolean shardLeadersOnly,
       int connectionTimeoutMillis,
-      int socketTimeoutMillis) {
-    RandomizingCloudSolrClientBuilder builder =
-        new RandomizingCloudSolrClientBuilder(List.of(zkHost), Optional.empty());
+      int idleTimeoutMillis) {
+    var builder = new RandomizingCloudSolrClientBuilder(List.of(zkHost), Optional.empty());
+    builder.withDefaultCollection(defaultCollection);
     if (shardLeadersOnly) {
       builder.sendUpdatesOnlyToShardLeaders();
     } else {
-      builder.sendUpdatesToAllReplicasInShard();
+      builder.sendUpdatesToAnyReplica();
     }
-    if (defaultCollection != null) {
-      builder.withDefaultCollection(defaultCollection);
-    }
-    return builder
-        .withConnectionTimeout(connectionTimeoutMillis)
-        .withSocketTimeout(socketTimeoutMillis)
-        .build();
+    builder.withHttpClientBuilder(
+        new HttpJettySolrClient.Builder()
+            .withConnectionTimeout(connectionTimeoutMillis, MILLISECONDS)
+            .withIdleTimeout(idleTimeoutMillis, MILLISECONDS));
+    return builder.build();
   }
 
   @Override
@@ -2467,8 +2475,8 @@ protected HttpSolrClient createNewSolrClient(String coreName, int port) {
         .build();
   }
 
-  protected SolrClient createNewSolrClient(String collection, String baseUrl) {
-    return getHttpSolrClient(baseUrl, collection);
+  protected SolrClient createNewSolrClient(String baseUrl, String collection) {
+    return new HttpJettySolrClient.Builder(baseUrl).withDefaultCollection(collection).build();
   }
 
   protected String getBaseUrl(JettySolrRunner jetty) {
@@ -2542,7 +2550,7 @@ protected CloudSolrClient getCommonCloudSolrClient() {
     synchronized (this) {
       if (commonCloudSolrClient == null) {
         commonCloudSolrClient =
-            getCloudSolrClient(
+            createNewCloudSolrClient(
                 zkServer.getZkAddress(), DEFAULT_COLLECTION, random().nextBoolean(), 5000, 120000);
         commonCloudSolrClient.connect();
         if (log.isInfoEnabled()) {
@@ -2561,7 +2569,7 @@ protected CloudSolrClient getSolrClient(String collectionName) {
         collectionName,
         k -> {
           CloudSolrClient solrClient =
-              getCloudSolrClient(
+              createNewCloudSolrClient(
                   zkServer.getZkAddress(), collectionName, random().nextBoolean(), 5000, 120000);
 
           solrClient.connect();
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 62470e6913d3..bdd5e157c657 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,10 @@
 import org.apache.solr.SolrBackend;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.ZkClientClusterStateProvider;
+import org.apache.solr.client.solrj.jetty.CloudJettySolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.jetty.SSLConfig;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.common.SolrException;
@@ -698,12 +700,7 @@ public CloudSolrClient getSolrClient(String collectionName) {
     return solrClientByCollection.computeIfAbsent(
         collectionName,
         k -> {
-          CloudSolrClient solrClient =
-              new CloudLegacySolrClient.Builder(List.of(zkServer.getZkAddress()), Optional.empty())
-                  .withDefaultCollection(collectionName)
-                  .withSocketTimeout(90000)
-                  .withConnectionTimeout(15000)
-                  .build();
+          CloudSolrClient solrClient = newSolrClient(collectionName);
 
           solrClient.connect();
           if (log.isInfoEnabled()) {
@@ -719,11 +716,13 @@ public CloudSolrClient getSolrClient(String collectionName) {
 
   @Override // SolrBackend
   public CloudSolrClient newSolrClient(String collection) {
-    return new CloudLegacySolrClient.Builder(
-            List.of(getZkServer().getZkAddress()), Optional.empty())
-        .withSocketTimeout(90000, TimeUnit.MILLISECONDS)
-        .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
+    return new CloudJettySolrClient.Builder(
+            new ZkClientClusterStateProvider(getZkServer().getZkAddress()))
         .withDefaultCollection(collection)
+        .withHttpClientBuilder(
+            new HttpJettySolrClient.Builder()
+                .withConnectionTimeout(15, TimeUnit.SECONDS)
+                .withIdleTimeout(90, TimeUnit.SECONDS))
         .build(); // we choose 90 because we run in some harsh envs
   }
 
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 01430bf69fe7..3124d5c14511 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,12 +31,11 @@
 import java.util.UUID;
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.jetty.CloudJettySolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest.ClusterProp;
-import org.apache.solr.client.solrj.request.SolrQuery;
+import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.response.RequestStatusState;
 import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
 import org.apache.solr.cloud.SolrCloudTestCase;
@@ -468,21 +467,17 @@ private void testBackupAndRestore(String collectionName) throws Exception {
   public static Map<String, Integer> getShardToDocCountMap(
       CloudSolrClient client, DocCollection docCollection) throws SolrServerException, IOException {
     Map<String, Integer> shardToDocCount = new TreeMap<>();
+    var jettySolrClient = ((CloudJettySolrClient) client).getHttpClient();
     for (Slice slice : docCollection.getActiveSlices()) {
-      String shardName = slice.getName();
-      try (var leaderClient =
-          new HttpApacheSolrClient.Builder(slice.getLeader().getBaseUrl())
-              .withDefaultCollection(slice.getLeader().getCoreName())
-              .withHttpClient(((CloudLegacySolrClient) client).getHttpClient())
-              .build()) {
-        long docsInShard =
-            leaderClient
-                .query(new SolrQuery("*:*").setParam("distrib", "false"))
-                .getResults()
-                .getNumFound();
-        shardToDocCount.put(shardName, (int) docsInShard);
-      }
+      long docsInShard =
+          new QueryRequest("/select", params("q", "*:*", "distrib", "false"))
+              .processWithBaseUrl(
+                  jettySolrClient, slice.getLeader().getBaseUrl(), slice.getLeader().getCoreName())
+              .getResults()
+              .getNumFound();
+      shardToDocCount.put(slice.getName(), (int) docsInShard);
     }
+
     return shardToDocCount;
   }
 }
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 7d4a38977907..4550eabe36fd 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
@@ -42,9 +42,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.apache.solr.SolrBackend;
-import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.apache.HttpApacheSolrClient;
 import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
 import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.client.solrj.jetty.SSLConfig;
@@ -579,6 +577,10 @@ public synchronized void stop() throws Exception {
       IOUtils.closeQuietly(jettySolrClient);
       jettySolrClient = null;
 
+      if (enableProxy) {
+        proxy.close();
+      }
+
       QueuedThreadPool qtp = (QueuedThreadPool) server.getThreadPool();
       ReservedThreadExecutor rte = qtp.getBean(ReservedThreadExecutor.class);
 
@@ -620,10 +622,6 @@ public synchronized void stop() throws Exception {
       } while (!server.isStopped());
 
     } finally {
-      if (enableProxy) {
-        proxy.close();
-      }
-
       if (prevContext != null) {
         MDC.setContextMap(prevContext);
       } else {
@@ -750,14 +748,15 @@ public URL getProxyBaseUrl() {
     }
   }
 
-  public SolrClient newClient() {
-    return new HttpApacheSolrClient.Builder(getBaseUrl().toString()).build();
+  @Deprecated
+  public HttpJettySolrClient newClient() {
+    return new HttpJettySolrClient.Builder(getBaseUrl().toString()).build();
   }
 
-  public SolrClient newClient(int connectionTimeoutMillis, int socketTimeoutMillis) {
-    return new HttpApacheSolrClient.Builder(getBaseUrl().toString())
+  public HttpJettySolrClient newClient(int connectionTimeoutMillis, int socketTimeoutMillis) {
+    return new HttpJettySolrClient.Builder(getBaseUrl().toString())
         .withConnectionTimeout(connectionTimeoutMillis, TimeUnit.MILLISECONDS)
-        .withSocketTimeout(socketTimeoutMillis, TimeUnit.MILLISECONDS)
+        .withIdleTimeout(socketTimeoutMillis, TimeUnit.MILLISECONDS)
         .build();
   }
 
@@ -811,7 +810,7 @@ public RestTestHarness getRestClient(String collection) {
   // ---- SolrBackend implementation ----
 
   @Override
-  public SolrClient newSolrClient(String collection) {
+  public HttpJettySolrClient newSolrClient(String collection) {
     return new HttpJettySolrClient.Builder(getBaseUrl().toString())
         .withDefaultCollection(collection)
         .build();
diff --git a/solr/test-framework/src/java/org/apache/solr/util/SocketProxy.java b/solr/test-framework/src/java/org/apache/solr/util/SocketProxy.java
index 2e0c6ea388b4..e64aa5a901f1 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/SocketProxy.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/SocketProxy.java
@@ -81,6 +81,7 @@ public SocketProxy(int port, boolean useSSL) throws Exception {
     this.usesSSL = useSSL;
     serverSocket = createServerSocket(useSSL);
     serverSocket.setReuseAddress(true);
+    serverSocket.setSoTimeout(1000);
     if (receiveBufferSize > 0) {
       serverSocket.setReceiveBufferSize(receiveBufferSize);
     }
@@ -188,6 +189,7 @@ public void reopen() {
       }
       serverSocket = createServerSocket(usesSSL);
       serverSocket.setReuseAddress(true);
+      serverSocket.setSoTimeout(1000);
       if (receiveBufferSize > 0) {
         serverSocket.setReceiveBufferSize(receiveBufferSize);
       }
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 16e657baf408..b1bfc23d45df 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.apache.HttpApacheSolrClient;
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
 import org.apache.solr.common.util.IOUtils;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.embedded.JettyConfig;
@@ -113,7 +113,8 @@ public SolrClient getSolrClient(String collection) {
   }
 
   protected SolrClient newSolrClient(String collection) {
-    return new HttpApacheSolrClient.Builder(getBaseUrl())
+    return new HttpJettySolrClient.Builder()
+        .withHttpClient(jetty.getSolrClient())
         .withDefaultCollection(collection) // Properly handles when collection is 'null'
         .build();
   }

From aba0816813e471b64b375eeec1d3dac9903be1e1 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 19 May 2026 01:17:32 -0400
Subject: [PATCH 17/27] Ignore TestRequestRateLimiter for now

---
 .../test/org/apache/solr/servlet/TestRequestRateLimiter.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
index 43f627d917a2..87ec473b13a0 100644
--- a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
+++ b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
@@ -38,6 +38,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.LongAdder;
+import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.RemoteSolrException;
 import org.apache.solr.client.solrj.SolrClient;
@@ -55,6 +56,7 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
+@LuceneTestCase.AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-17810")
 public class TestRequestRateLimiter extends SolrCloudTestCase {
   private static final String FIRST_COLLECTION = "c1";
   private static final String SECOND_COLLECTION = "c2";

From 68cf3c115cdc914f8f00b91e04e11ec13bdd03a5 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 19 May 2026 01:19:04 -0400
Subject: [PATCH 18/27] Stop using HttpClientUtil

---
 .../apache/solr/cloud/SSLMigrationTest.java   |  9 --
 .../cloud/TestMiniSolrCloudClusterSSL.java    | 18 ----
 .../java/org/apache/solr/SolrTestCaseJ4.java  |  5 --
 .../org/apache/solr/util/SSLTestConfig.java   | 88 +------------------
 4 files changed, 3 insertions(+), 117 deletions(-)

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 3687371b1ca3..b0e329f0836c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java
@@ -23,7 +23,6 @@
 import java.util.Properties;
 import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
-import org.apache.solr.client.solrj.apache.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.LBSolrClient;
 import org.apache.solr.client.solrj.jetty.LBJettySolrClient;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -37,7 +36,6 @@
 import org.apache.solr.embedded.JettyConfig;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.util.SSLTestConfig;
-import org.junit.After;
 import org.junit.Test;
 
 /**
@@ -48,11 +46,6 @@
 @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12028") // 17-Mar-2018
 public class SSLMigrationTest extends AbstractFullDistribZkTestBase {
 
-  @After
-  public void afterTest() {
-    HttpClientUtil.resetHttpClientBuilder(); // also resets SocketFactoryRegistryProvider
-  }
-
   @Test
   public void test() throws Exception {
     // Migrate from HTTP -> HTTPS -> HTTP
@@ -69,8 +62,6 @@ public void testMigrateSSL(SSLTestConfig sslConfig) throws Exception {
       runner.stop();
     }
 
-    HttpClientUtil.setSocketFactoryRegistryProvider(
-        sslConfig.buildClientSocketFactoryRegistryProvider()); // we reset in After
     for (int i = 0; i < this.jettys.size(); i++) {
       JettySolrRunner runner = jettys.get(i);
       JettyConfig config =
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 698afd65897a..8fbbe214fe0c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
@@ -25,7 +25,6 @@
 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.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.impl.SolrHttpConstants;
@@ -83,14 +82,12 @@ public void before() {
     // undo the randomization of our super class
     log.info(
         "NOTE: This Test ignores the randomized SSL & clientAuth settings selected by base class");
-    HttpClientUtil.resetHttpClientBuilder(); // also resets SocketFactoryRegistryProvider
     HttpJettySolrClient.resetSslContextFactory();
     System.clearProperty(SOLR_SSL_ENABLED);
   }
 
   @After
   public void after() {
-    HttpClientUtil.resetHttpClientBuilder(); // also resets SocketFactoryRegistryProvider
     HttpJettySolrClient.resetSslContextFactory();
     System.clearProperty(SOLR_SSL_ENABLED);
     SSLContext.setDefault(DEFAULT_SSL_CONTEXT);
@@ -98,8 +95,6 @@ public void after() {
 
   public void testNoSsl() throws Exception {
     final SSLTestConfig sslConfig = new SSLTestConfig(false, false);
-    HttpClientUtil.setSocketFactoryRegistryProvider(
-        sslConfig.buildClientSocketFactoryRegistryProvider()); // must be reset
     HttpJettySolrClient.setDefaultSSLConfig(sslConfig.buildClientSSLConfig()); // must be reset
     System.setProperty(SOLR_SSL_ENABLED, "false");
     checkClusterWithNodeReplacement(sslConfig);
@@ -110,8 +105,6 @@ public void testNoSslButSillyClientAuth() throws Exception {
     // ignored, but we test it anyway for completeness of checking the behavior of code that
     // looks at those options.
     final SSLTestConfig sslConfig = new SSLTestConfig(false, true);
-    HttpClientUtil.setSocketFactoryRegistryProvider(
-        sslConfig.buildClientSocketFactoryRegistryProvider());
     HttpJettySolrClient.setDefaultSSLConfig(sslConfig.buildClientSSLConfig());
     System.setProperty(SOLR_SSL_ENABLED, "false");
     checkClusterWithNodeReplacement(sslConfig);
@@ -119,8 +112,6 @@ public void testNoSslButSillyClientAuth() throws Exception {
 
   public void testSslAndNoClientAuth() throws Exception {
     final SSLTestConfig sslConfig = new SSLTestConfig(true, false);
-    HttpClientUtil.setSocketFactoryRegistryProvider(
-        sslConfig.buildClientSocketFactoryRegistryProvider());
     HttpJettySolrClient.setDefaultSSLConfig(sslConfig.buildClientSSLConfig());
     System.setProperty(SOLR_SSL_ENABLED, "true");
     checkClusterWithNodeReplacement(sslConfig);
@@ -131,8 +122,6 @@ public void testSslAndClientAuth() throws Exception {
 
     final SSLTestConfig sslConfig = new SSLTestConfig(true, true);
 
-    HttpClientUtil.setSocketFactoryRegistryProvider(
-        sslConfig.buildClientSocketFactoryRegistryProvider());
     HttpJettySolrClient.setDefaultSSLConfig(sslConfig.buildClientSSLConfig());
     System.setProperty(SOLR_SSL_ENABLED, "true");
     checkClusterWithNodeReplacement(sslConfig);
@@ -140,8 +129,6 @@ public void testSslAndClientAuth() throws Exception {
 
   public void testSslWithCheckPeerName() throws Exception {
     final SSLTestConfig sslConfig = new SSLTestConfig(true, false, true);
-    HttpClientUtil.setSocketFactoryRegistryProvider(
-        sslConfig.buildClientSocketFactoryRegistryProvider());
     HttpJettySolrClient.setDefaultSSLConfig(sslConfig.buildClientSSLConfig());
     System.setProperty(SOLR_SSL_ENABLED, "true");
     checkClusterWithNodeReplacement(sslConfig);
@@ -154,7 +141,6 @@ public void testSslWithCheckPeerName() throws Exception {
    * HttpClientBuilder, new HttpJettySolrClient instances will still be able to talk to our servers.
    *
    * @see SSLContext#setDefault
-   * @see HttpClientUtil#resetHttpClientBuilder
    * @see #checkClusterWithCollectionCreations
    */
   private void checkClusterWithNodeReplacement(SSLTestConfig sslConfig) throws Exception {
@@ -174,7 +160,6 @@ private void checkClusterWithNodeReplacement(SSLTestConfig sslConfig) throws Exc
       System.setProperty(
           SolrHttpConstants.SYS_PROP_CHECK_PEER_NAME,
           Boolean.toString(sslConfig.getCheckPeerName()));
-      HttpClientUtil.resetHttpClientBuilder();
       HttpJettySolrClient.resetSslContextFactory();
       HttpJettySolrClient.setDefaultSSLConfig(sslConfig.buildClientSSLConfig());
 
@@ -190,8 +175,6 @@ public void testSslWithInvalidPeerName() throws Exception {
     // NOTE: first initialize the cluster w/o peer name checks, which means our server will use
     // certs with a bogus hostname/ip and clients shouldn't care...
     final SSLTestConfig sslConfig = new SSLTestConfig(true, false, false);
-    HttpClientUtil.setSocketFactoryRegistryProvider(
-        sslConfig.buildClientSocketFactoryRegistryProvider());
     HttpJettySolrClient.setDefaultSSLConfig(sslConfig.buildClientSSLConfig());
     System.setProperty(SOLR_SSL_ENABLED, "true");
     final JettyConfig config =
@@ -204,7 +187,6 @@ public void testSslWithInvalidPeerName() throws Exception {
       // now initialize a client that still uses the existing SSLContext/Provider, so it will accept
       // our existing certificate, but *does* care about validating the peer name
       System.setProperty(SolrHttpConstants.SYS_PROP_CHECK_PEER_NAME, "true");
-      HttpClientUtil.resetHttpClientBuilder();
       HttpJettySolrClient.resetSslContextFactory();
 
       // and validate we get failures when trying to talk to our cluster...
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 26036ee28964..4f4dedd1eec4 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -76,7 +76,6 @@
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.lucene.util.Constants;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.apache.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.ClusterStateProvider;
 import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
@@ -279,9 +278,6 @@ public static void setupTestCases() {
     newRandomConfig();
 
     sslConfig = buildSSLConfig();
-    // based on randomized SSL config, set SocketFactoryRegistryProvider appropriately
-    HttpClientUtil.setSocketFactoryRegistryProvider(
-        sslConfig.buildClientSocketFactoryRegistryProvider());
     HttpJettySolrClient.setDefaultSSLConfig(sslConfig.buildClientSSLConfig());
     if (isSSLMode()) {
       // SolrCloud tests should usually clear this
@@ -314,7 +310,6 @@ public static void teardownTestCases() throws Exception {
     } finally {
       TestInjection.reset();
       initCoreDataDir = null;
-      HttpClientUtil.resetHttpClientBuilder();
       HttpJettySolrClient.resetSslContextFactory();
 
       clearNumericTypesProperties();
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 70f26d6405ed..dc530021e413 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
@@ -27,16 +27,9 @@
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 import javax.net.ssl.SSLContext;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.ssl.SSLContexts;
-import org.apache.solr.client.solrj.apache.HttpClientUtil.SocketFactoryRegistryProvider;
 import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.client.solrj.jetty.SSLConfig;
 import org.eclipse.jetty.util.resource.Resource;
@@ -45,9 +38,9 @@
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 /**
- * An SSLConfig that provides {@link SSLConfig} and {@link SocketFactoryRegistryProvider} for both
- * clients and servers that supports reading key/trust store information directly from resource
- * files provided with the Solr test-framework classes
+ * An SSLConfig that provides {@link SSLConfig} for both clients and servers that supports reading
+ * key/trust store information directly from resource files provided with the Solr test-framework
+ * classes
  */
 public class SSLTestConfig {
   private static final String TEST_KEYSTORE_BOGUSHOST_RESOURCE =
@@ -130,23 +123,6 @@ public boolean isClientAuthMode() {
     return clientAuth;
   }
 
-  /**
-   * Creates a {@link SocketFactoryRegistryProvider} for HTTP <b>clients</b> to use when
-   * communicating with servers which have been configured based on the settings of this object.
-   * When {@link #isSSLMode} is true, this <code>SocketFactoryRegistryProvider</code> will
-   * <i>only</i> support HTTPS (no HTTP scheme) using the appropriate certs. When {@link #isSSLMode}
-   * is false, <i>only</i> HTTP (no HTTPS scheme) will be supported.
-   */
-  public SocketFactoryRegistryProvider buildClientSocketFactoryRegistryProvider() {
-    if (isSSLMode()) {
-      SSLConnectionSocketFactory sslConnectionFactory = buildClientSSLConnectionSocketFactory();
-      assert null != sslConnectionFactory;
-      return new SSLSocketFactoryRegistryProvider(sslConnectionFactory);
-    } else {
-      return HTTP_ONLY_SCHEMA_PROVIDER;
-    }
-  }
-
   /**
    * Builds a new SSLContext for HTTP <b>clients</b> to use when communicating with servers which
    * have been configured based on the settings of this object.
@@ -269,64 +245,6 @@ private static KeyStore buildKeyStore(Resource resource, String password) {
     }
   }
 
-  /**
-   * Constructs a new SSLConnectionSocketFactory for HTTP <b>clients</b> to use when communicating
-   * with servers which have been configured based on the settings of this object. Will return null
-   * unless {@link #isSSLMode} is true.
-   */
-  public SSLConnectionSocketFactory buildClientSSLConnectionSocketFactory() {
-    if (!isSSLMode()) {
-      return null;
-    }
-    SSLConnectionSocketFactory sslConnectionFactory;
-    try {
-      SSLContext sslContext = buildClientSSLContext();
-      if (checkPeerName == false) {
-        sslConnectionFactory =
-            new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
-      } else {
-        sslConnectionFactory = new SSLConnectionSocketFactory(sslContext);
-      }
-    } catch (KeyManagementException
-        | UnrecoverableKeyException
-        | NoSuchAlgorithmException
-        | KeyStoreException e) {
-      throw new IllegalStateException(
-          "Unable to setup https scheme for HTTPClient to test SSL.", e);
-    }
-    return sslConnectionFactory;
-  }
-
-  /**
-   * A SocketFactoryRegistryProvider that only knows about SSL using a specified
-   * SSLConnectionSocketFactory
-   */
-  private static class SSLSocketFactoryRegistryProvider extends SocketFactoryRegistryProvider {
-    private final SSLConnectionSocketFactory sslConnectionFactory;
-
-    public SSLSocketFactoryRegistryProvider(SSLConnectionSocketFactory sslConnectionFactory) {
-      this.sslConnectionFactory = sslConnectionFactory;
-    }
-
-    @Override
-    public Registry<ConnectionSocketFactory> getSocketFactoryRegistry() {
-      return RegistryBuilder.<ConnectionSocketFactory>create()
-          .register("https", sslConnectionFactory)
-          .build();
-    }
-  }
-
-  /** A SocketFactoryRegistryProvider that only knows about HTTP */
-  private static final SocketFactoryRegistryProvider HTTP_ONLY_SCHEMA_PROVIDER =
-      new SocketFactoryRegistryProvider() {
-        @Override
-        public Registry<ConnectionSocketFactory> getSocketFactoryRegistry() {
-          return RegistryBuilder.<ConnectionSocketFactory>create()
-              .register("http", PlainConnectionSocketFactory.getSocketFactory())
-              .build();
-        }
-      };
-
   /**
    * A mocked up instance of SecureRandom that just uses {@link Random} under the covers. This is to
    * prevent blocking issues that arise in platform default SecureRandom instances due to too many

From c3427227862d98b03a2e329363503dd537470504 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 19 May 2026 11:34:30 -0400
Subject: [PATCH 19/27] SSLTestConfig no longer depends on Apache
 httpcomponents

---
 .../org/apache/solr/util/SSLTestConfig.java   | 100 ++++++++++++++----
 1 file changed, 77 insertions(+), 23 deletions(-)

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 dc530021e413..9a62ecb2afba 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
@@ -24,12 +24,19 @@
 import java.security.SecureRandomParameters;
 import java.security.SecureRandomSpi;
 import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
-import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.apache.http.ssl.SSLContexts;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
 import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.client.solrj.jetty.SSLConfig;
 import org.eclipse.jetty.util.resource.Resource;
@@ -94,7 +101,6 @@ public SSLTestConfig(boolean useSsl, boolean clientAuth) {
    *     Certificate (and which testing Cert should be used)
    * @see SolrHttpConstants#SYS_PROP_CHECK_PEER_NAME
    */
-  @SuppressWarnings("removal")
   public SSLTestConfig(boolean useSsl, boolean clientAuth, boolean checkPeerName) {
     this.useSsl = useSsl;
     this.clientAuth = clientAuth;
@@ -139,22 +145,25 @@ public SSLContext buildClientSSLContext()
 
     assert isSSLMode();
 
-    SSLContextBuilder builder = SSLContexts.custom();
-    builder.setSecureRandom(NotSecurePseudoRandom.INSTANCE);
-
     // NOTE: KeyStore & TrustStore are swapped because they are from configured from server
     // perspective...
     // we are a client - our keystore contains the keys the server trusts, and vice versa
-    builder
-        .loadTrustMaterial(buildKeyStore(keyStore, TEST_PASSWORD), new TrustSelfSignedStrategy())
-        .build();
+    var tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+    tmf.init(buildKeyStore(keyStore, TEST_PASSWORD));
 
+    KeyManager[] keyManagers = null;
     if (isClientAuthMode()) {
-      builder.loadKeyMaterial(
-          buildKeyStore(trustStore, TEST_PASSWORD), TEST_PASSWORD.toCharArray());
+      var kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+      kmf.init(buildKeyStore(trustStore, TEST_PASSWORD), TEST_PASSWORD.toCharArray());
+      keyManagers = kmf.getKeyManagers();
     }
 
-    return builder.build();
+    SSLContext sslContext = SSLContext.getInstance("TLS");
+    sslContext.init(
+        keyManagers,
+        trustSelfSignedStrategy(tmf.getTrustManagers()),
+        NotSecurePseudoRandom.INSTANCE);
+    return sslContext;
   }
 
   public SSLConfig buildClientSSLConfig() {
@@ -198,19 +207,19 @@ public SSLConfig buildServerSSLConfig() {
       public SslContextFactory.Server createContextFactory() {
         SslContextFactory.Server factory = new SslContextFactory.Server();
         try {
-          SSLContextBuilder builder = SSLContexts.custom();
-          builder.setSecureRandom(NotSecurePseudoRandom.INSTANCE);
-
-          builder.loadKeyMaterial(
-              buildKeyStore(keyStore, TEST_PASSWORD), TEST_PASSWORD.toCharArray());
+          var kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+          kmf.init(buildKeyStore(keyStore, TEST_PASSWORD), TEST_PASSWORD.toCharArray());
 
+          TrustManager[] trustManagers = null;
           if (isClientAuthMode()) {
-            builder
-                .loadTrustMaterial(
-                    buildKeyStore(trustStore, TEST_PASSWORD), new TrustSelfSignedStrategy())
-                .build();
+            var tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            tmf.init(buildKeyStore(trustStore, TEST_PASSWORD));
+            trustManagers = trustSelfSignedStrategy(tmf.getTrustManagers());
           }
-          factory.setSslContext(builder.build());
+
+          SSLContext sslContext = SSLContext.getInstance("TLS");
+          sslContext.init(kmf.getKeyManagers(), trustManagers, NotSecurePseudoRandom.INSTANCE);
+          factory.setSslContext(sslContext);
         } catch (Exception e) {
           throw new RuntimeException("ssl context init failure: " + e.getMessage(), e);
         }
@@ -220,6 +229,51 @@ public SslContextFactory.Server createContextFactory() {
     };
   }
 
+  /**
+   * Returns trust managers that accept self-signed certs, delegating all others to {@code
+   * delegates}.
+   */
+  private static TrustManager[] trustSelfSignedStrategy(TrustManager[] delegates) {
+    return new TrustManager[] {
+      new X509TrustManager() {
+        @Override
+        public void checkClientTrusted(X509Certificate[] chain, String authType)
+            throws CertificateException {
+          if (chain.length == 1) return;
+          for (TrustManager tm : delegates) {
+            if (tm instanceof X509TrustManager) {
+              ((X509TrustManager) tm).checkClientTrusted(chain, authType);
+              return;
+            }
+          }
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] chain, String authType)
+            throws CertificateException {
+          if (chain.length == 1) return;
+          for (TrustManager tm : delegates) {
+            if (tm instanceof X509TrustManager) {
+              ((X509TrustManager) tm).checkServerTrusted(chain, authType);
+              return;
+            }
+          }
+        }
+
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+          List<X509Certificate> issuers = new ArrayList<>();
+          for (TrustManager tm : delegates) {
+            if (tm instanceof X509TrustManager) {
+              issuers.addAll(Arrays.asList(((X509TrustManager) tm).getAcceptedIssuers()));
+            }
+          }
+          return issuers.toArray(new X509Certificate[0]);
+        }
+      }
+    };
+  }
+
   public KeyStore defaultKeyStore() {
     if (keyStore == null) {
       return null;

From ba8acfaee79d100ae020615a7b4d86376e88ed6e Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 19 May 2026 11:30:50 -0400
Subject: [PATCH 20/27] New build tests.ssl option to force SSL when supported

---
 gradle/testing/randomization.gradle                           | 1 +
 .../src/java/org/apache/solr/util/RandomizeSSL.java           | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/gradle/testing/randomization.gradle b/gradle/testing/randomization.gradle
index 83d71e7e9079..2bf7d2ae9657 100644
--- a/gradle/testing/randomization.gradle
+++ b/gradle/testing/randomization.gradle
@@ -133,6 +133,7 @@ configure(allprojects.findAll {project -> project.path.startsWith(":solr")}) {
       testOptions += [
           [propName: 'tests.src.home', value: null, description: "See SOLR-14023."],
           [propName: 'solr.tests.use.numeric.points', value: null, description: "Point implementation to use (true=numerics, false=trie)."],
+          [propName: 'tests.ssl', value: false, description: "Force SSL on for all tests that support it (respects @SuppressSSL)."],
       ]
     }
   }
diff --git a/solr/test-framework/src/java/org/apache/solr/util/RandomizeSSL.java b/solr/test-framework/src/java/org/apache/solr/util/RandomizeSSL.java
index 54e192853633..1e8afd0a5064 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/RandomizeSSL.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/RandomizeSSL.java
@@ -126,6 +126,10 @@ public SSLTestConfig createSSLTestConfig() {
                           LuceneTestCase.TEST_NIGHTLY,
                           LuceneTestCase.RANDOM_MULTIPLIER));
 
+      if (Boolean.getBoolean("tests.ssl") && ssl > 0.0D) {
+        return new SSLTestConfig(true, useClientAuth);
+      }
+
       return new SSLTestConfig(useSSL, useClientAuth);
     }
 

From 47943d6df3398510a5f534b6982adbaa231b70d2 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 19 May 2026 01:19:37 -0400
Subject: [PATCH 21/27] Remove package org.apache.solr.client.solrj.apache

---
 .../solrj/apache/CloudLegacySolrClient.java   | 417 ---------
 .../apache/ConcurrentUpdateSolrClient.java    | 886 ------------------
 .../client/solrj/apache/HttpClientUtil.java   | 621 ------------
 .../apache/HttpClusterStateProvider.java      |  57 --
 .../client/solrj/apache/HttpSolrClient.java   | 873 -----------------
 .../client/solrj/apache/LBHttpSolrClient.java | 342 -------
 .../client/solrj/apache/PreemptiveAuth.java   |  61 --
 .../solrj/apache/SolrClientBuilder.java       | 173 ----
 .../solrj/apache/SolrHttpClientBuilder.java   |  86 --
 .../apache/SolrHttpClientContextBuilder.java  | 101 --
 .../apache/SolrHttpRequestRetryHandler.java   | 185 ----
 .../SolrPortAwareCookieSpecFactory.java       | 113 ---
 .../client/solrj/apache/package-info.java     |  20 -
 13 files changed, 3935 deletions(-)
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/PreemptiveAuth.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientBuilder.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientContextBuilder.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpRequestRetryHandler.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.java
 delete mode 100644 solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java

diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.java
deleted file mode 100644
index d6bd73024092..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj.apache;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-import org.apache.http.NoHttpResponseException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.conn.ConnectTimeoutException;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.client.solrj.impl.ClusterStateProvider;
-import org.apache.solr.client.solrj.impl.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.JavaBinRequestWriter;
-import org.apache.solr.client.solrj.request.UpdateRequest;
-import org.apache.solr.client.solrj.response.JavaBinResponseParser;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.cloud.DocCollection;
-import org.apache.solr.common.cloud.DocRouter;
-import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.util.IOUtils;
-import org.apache.solr.common.util.NamedList;
-
-/**
- * SolrJ client class to communicate with SolrCloud. Instances of this class communicate with
- * Zookeeper to discover Solr endpoints for SolrCloud collections, and then use the {@link
- * LBHttpSolrClient} to issue requests.
- *
- * @deprecated Please use {@link CloudSolrClient}
- */
-@Deprecated(since = "9.0")
-public class CloudLegacySolrClient extends CloudSolrClient {
-
-  private final ClusterStateProvider stateProvider;
-  private final LBHttpSolrClient lbClient;
-  private final boolean shutdownLBHttpSolrServer;
-  private HttpClient myClient;
-  private final boolean clientIsInternal;
-
-  public static final String STATE_VERSION = CloudSolrClient.STATE_VERSION;
-
-  /**
-   * Create a new client object that connects to Zookeeper and is always aware of the SolrCloud
-   * state. If there is a fully redundant Zookeeper quorum and SolrCloud has enough replicas for
-   * every shard in a collection, there is no single point of failure. Updates will be sent to shard
-   * leaders by default.
-   *
-   * @param builder a {@link Builder} with the options used to create the client.
-   */
-  protected CloudLegacySolrClient(Builder builder) {
-    super(builder.shardLeadersOnly, builder.parallelUpdates, builder.directUpdatesToLeadersOnly);
-    this.stateProvider = builder.stateProvider;
-    this.retryExpiryTimeNano = builder.retryExpiryTimeNano;
-    this.defaultCollection = builder.defaultCollection;
-    this.collectionStateCache.timeToLiveMs =
-        TimeUnit.MILLISECONDS.convert(builder.timeToLiveSeconds, TimeUnit.SECONDS);
-    this.clientIsInternal = builder.httpClient == null;
-    this.shutdownLBHttpSolrServer = builder.loadBalancedSolrClient == null;
-    if (builder.lbClientBuilder != null) {
-      propagateLBClientConfigOptions(builder);
-      builder.loadBalancedSolrClient = builder.lbClientBuilder.build();
-    }
-    if (builder.loadBalancedSolrClient != null)
-      builder.httpClient = builder.loadBalancedSolrClient.getHttpClient();
-    this.myClient =
-        (builder.httpClient == null) ? HttpClientUtil.createClient(null) : builder.httpClient;
-    if (builder.loadBalancedSolrClient == null)
-      builder.loadBalancedSolrClient = createLBHttpSolrClient(builder, myClient);
-    this.lbClient = builder.loadBalancedSolrClient;
-  }
-
-  private void propagateLBClientConfigOptions(Builder builder) {
-    final LBHttpSolrClient.Builder lbBuilder = builder.lbClientBuilder;
-    lbBuilder.withConnectionTimeout(builder.connectionTimeoutMillis, TimeUnit.MILLISECONDS);
-    lbBuilder.withSocketTimeout(builder.socketTimeoutMillis, TimeUnit.MILLISECONDS);
-  }
-
-  @Override
-  protected Map<String, LBSolrClient.Req> createRoutes(
-      UpdateRequest updateRequest,
-      ModifiableSolrParams routableParams,
-      DocCollection col,
-      DocRouter router,
-      Map<String, List<String>> urlMap,
-      String idField) {
-    return urlMap == null
-        ? null
-        : updateRequest.getRoutesToCollection(router, col, urlMap, routableParams, idField);
-  }
-
-  @Override
-  protected RouteException getRouteException(
-      SolrException.ErrorCode serverError,
-      NamedList<Throwable> exceptions,
-      Map<String, ? extends LBSolrClient.Req> routes) {
-    return new RouteException(serverError, exceptions, routes);
-  }
-
-  @Override
-  public void close() {
-    IOUtils.closeQuietly(stateProvider);
-
-    if (shutdownLBHttpSolrServer) {
-      lbClient.close();
-    }
-
-    if (clientIsInternal && myClient != null) {
-      HttpClientUtil.close(myClient);
-    }
-
-    super.close();
-  }
-
-  @Override
-  public LBHttpSolrClient getLbClient() {
-    return lbClient;
-  }
-
-  public HttpClient getHttpClient() {
-    return myClient;
-  }
-
-  @Override
-  public ClusterStateProvider getClusterStateProvider() {
-    return stateProvider;
-  }
-
-  @Override
-  protected boolean wasCommError(Throwable rootCause) {
-    return super.wasCommError(rootCause)
-        || rootCause instanceof ConnectTimeoutException
-        || rootCause instanceof NoHttpResponseException;
-  }
-
-  private static LBHttpSolrClient createLBHttpSolrClient(
-      Builder cloudSolrClientBuilder, HttpClient httpClient) {
-    final LBHttpSolrClient.Builder lbBuilder = new LBHttpSolrClient.Builder();
-    lbBuilder.withHttpClient(httpClient);
-    lbBuilder.withConnectionTimeout(
-        cloudSolrClientBuilder.connectionTimeoutMillis, TimeUnit.MILLISECONDS);
-    lbBuilder.withSocketTimeout(cloudSolrClientBuilder.socketTimeoutMillis, TimeUnit.MILLISECONDS);
-    lbBuilder.withRequestWriter(new JavaBinRequestWriter());
-    lbBuilder.withResponseParser(new JavaBinResponseParser());
-
-    return lbBuilder.build();
-  }
-
-  /** Constructs {@link CloudLegacySolrClient} instances from provided configuration. */
-  public static class Builder extends SolrClientBuilder<Builder> {
-    protected Collection<String> zkHosts = new ArrayList<>();
-    protected List<String> solrUrls = new ArrayList<>();
-    protected String zkChroot;
-    protected LBHttpSolrClient loadBalancedSolrClient;
-    protected LBHttpSolrClient.Builder lbClientBuilder;
-    protected boolean shardLeadersOnly = true;
-    protected boolean directUpdatesToLeadersOnly = false;
-    protected boolean parallelUpdates = true;
-    protected long retryExpiryTimeNano =
-        TimeUnit.NANOSECONDS.convert(3, TimeUnit.SECONDS); // 3 seconds or 3 million nanos
-    protected ClusterStateProvider stateProvider;
-    private int zkConnectTimeout = SolrZkClientTimeout.DEFAULT_ZK_CONNECT_TIMEOUT;
-    private int zkClientTimeout = SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT;
-    private boolean canUseZkACLs = true;
-
-    /** Constructor for use by subclasses. This constructor was public prior to version 9.0 */
-    protected Builder() {}
-
-    /**
-     * Provide a series of Solr URLs to be used when configuring {@link CloudLegacySolrClient}
-     * instances. The solr client will use these urls to understand the cluster topology, which solr
-     * nodes are active etc.
-     *
-     * <p>Provided Solr URLs are expected to point to the root Solr path
-     * ("http://hostname:8983/solr"); they should not include any collections, cores, or other path
-     * components.
-     *
-     * <p>Usage example:
-     *
-     * <pre>
-     *   final List&lt;String&gt; solrBaseUrls = new ArrayList&lt;String&gt;();
-     *   solrBaseUrls.add("http://solr1:8983/solr"); solrBaseUrls.add("http://solr2:8983/solr"); solrBaseUrls.add("http://solr3:8983/solr");
-     *   final SolrClient client = new CloudSolrClient.Builder(solrBaseUrls).build();
-     * </pre>
-     */
-    public Builder(List<String> solrUrls) {
-      this.solrUrls = solrUrls;
-    }
-
-    /** Provide an already created {@link ClusterStateProvider} instance */
-    public Builder(ClusterStateProvider stateProvider) {
-      this.stateProvider = stateProvider;
-    }
-
-    /**
-     * Provide a series of ZK hosts which will be used when configuring {@link
-     * CloudLegacySolrClient} instances.
-     *
-     * <p>Usage example when Solr stores data at the ZooKeeper root ('/'):
-     *
-     * <pre>
-     *   final List&lt;String&gt; zkServers = new ArrayList&lt;String&gt;();
-     *   zkServers.add("zookeeper1:2181"); zkServers.add("zookeeper2:2181"); zkServers.add("zookeeper3:2181");
-     *   final SolrClient client = new CloudSolrClient.Builder(zkServers, Optional.empty()).build();
-     * </pre>
-     *
-     * Usage example when Solr data is stored in a ZooKeeper chroot:
-     *
-     * <pre>
-     *    final List&lt;String&gt; zkServers = new ArrayList&lt;String&gt;();
-     *    zkServers.add("zookeeper1:2181"); zkServers.add("zookeeper2:2181"); zkServers.add("zookeeper3:2181");
-     *    final SolrClient client = new CloudSolrClient.Builder(zkServers, Optional.of("/solr")).build();
-     *  </pre>
-     *
-     * @param zkHosts a List of at least one ZooKeeper host and port (e.g. "zookeeper1:2181")
-     * @param zkChroot the path to the root ZooKeeper node containing Solr data. Provide {@code
-     *     java.util.Optional.empty()} if no ZK chroot is used.
-     */
-    public Builder(List<String> zkHosts, Optional<String> zkChroot) {
-      this.zkHosts = zkHosts;
-      if (zkChroot.isPresent()) this.zkChroot = zkChroot.get();
-    }
-
-    /** Whether to use the default ZK ACLs when building a ZK Client. */
-    public Builder canUseZkACLs(boolean canUseZkACLs) {
-      this.canUseZkACLs = canUseZkACLs;
-      return this;
-    }
-
-    /** Provides a {@link HttpClient} for the builder to use when creating clients. */
-    public Builder withLBHttpSolrClientBuilder(LBHttpSolrClient.Builder lbHttpSolrClientBuilder) {
-      this.lbClientBuilder = lbHttpSolrClientBuilder;
-      return this;
-    }
-
-    /** Provides a {@link LBHttpSolrClient} for the builder to use when creating clients. */
-    public Builder withLBHttpSolrClient(LBHttpSolrClient loadBalancedSolrClient) {
-      this.loadBalancedSolrClient = loadBalancedSolrClient;
-      return this;
-    }
-
-    /**
-     * Sets the cache ttl for DocCollection Objects cached.
-     *
-     * @param seconds ttl value in seconds
-     */
-    public Builder withCollectionCacheTtl(int seconds) {
-      assert seconds > 0;
-      this.timeToLiveSeconds = seconds;
-      return this;
-    }
-
-    /**
-     * Tells {@link Builder} that created clients should be configured such that {@link
-     * CloudSolrClient#isUpdatesToLeaders} returns <code>true</code>.
-     *
-     * @see #sendUpdatesToAnyReplica
-     * @see CloudSolrClient#isUpdatesToLeaders
-     */
-    public Builder sendUpdatesOnlyToShardLeaders() {
-      shardLeadersOnly = true;
-      return this;
-    }
-
-    /**
-     * Tells {@link Builder} that created clients should be configured such that {@link
-     * CloudSolrClient#isUpdatesToLeaders} returns <code>false</code>.
-     *
-     * @see #sendUpdatesOnlyToShardLeaders
-     * @see CloudSolrClient#isUpdatesToLeaders
-     */
-    public Builder sendUpdatesToAnyReplica() {
-      shardLeadersOnly = false;
-      return this;
-    }
-
-    /**
-     * This method has no effect.
-     *
-     * <p>In older versions of Solr, this method was an incorrectly named equivalent to {@link
-     * #sendUpdatesToAnyReplica}, which had no effect because that setting was ignored in the
-     * created clients. When the underlying {@link CloudSolrClient} behavior was fixed, this method
-     * was modified to be an explicit No-Op, since the implied behavior of sending updates to
-     * <em>all</em> replicas has never been supported, and was never intended to be supported.
-     *
-     * @see #sendUpdatesOnlyToShardLeaders
-     * @see #sendUpdatesToAnyReplica
-     * @see CloudSolrClient#isUpdatesToLeaders
-     * @see <a href="https://issues.apache.org/jira/browse/SOLR-6312">SOLR-6312</a>
-     * @deprecated Never supported
-     */
-    @Deprecated
-    public Builder sendUpdatesToAllReplicasInShard() {
-      return this;
-    }
-
-    /**
-     * Tells {@link Builder} that created clients should send direct updates to shard leaders only.
-     *
-     * <p>UpdateRequests whose leaders cannot be found will "fail fast" on the client side with a
-     * {@link SolrException}
-     *
-     * @see #sendDirectUpdatesToAnyShardReplica
-     * @see CloudSolrClient#isDirectUpdatesToLeadersOnly
-     */
-    public Builder sendDirectUpdatesToShardLeadersOnly() {
-      directUpdatesToLeadersOnly = true;
-      return this;
-    }
-
-    /**
-     * Tells {@link Builder} that created clients can send updates to any shard replica (shard
-     * leaders and non-leaders).
-     *
-     * <p>Shard leaders are still preferred, but the created clients will fall back to using other
-     * replicas if a leader cannot be found.
-     *
-     * @see #sendDirectUpdatesToShardLeadersOnly
-     * @see CloudSolrClient#isDirectUpdatesToLeadersOnly
-     */
-    public Builder sendDirectUpdatesToAnyShardReplica() {
-      directUpdatesToLeadersOnly = false;
-      return this;
-    }
-
-    /**
-     * Tells {@link Builder} whether created clients should send shard updates serially or in
-     * parallel
-     *
-     * <p>When an {@link UpdateRequest} affects multiple shards, {@link CloudLegacySolrClient}
-     * splits it up and sends a request to each affected shard. This setting chooses whether those
-     * sub-requests are sent serially or in parallel.
-     *
-     * <p>If not set, this defaults to 'true' and sends sub-requests in parallel.
-     */
-    public Builder withParallelUpdates(boolean parallelUpdates) {
-      this.parallelUpdates = parallelUpdates;
-      return this;
-    }
-
-    /**
-     * Sets the Zk connection timeout
-     *
-     * @param zkConnectTimeout timeout value
-     * @param unit time unit
-     */
-    public Builder withZkConnectTimeout(int zkConnectTimeout, TimeUnit unit) {
-      this.zkConnectTimeout = Math.toIntExact(unit.toMillis(zkConnectTimeout));
-      return this;
-    }
-
-    /**
-     * Sets the Zk client session timeout
-     *
-     * @param zkClientTimeout timeout value
-     * @param unit time unit
-     */
-    public Builder withZkClientTimeout(int zkClientTimeout, TimeUnit unit) {
-      this.zkClientTimeout = Math.toIntExact(unit.toMillis(zkClientTimeout));
-      return this;
-    }
-
-    /** Create a {@link CloudLegacySolrClient} based on the provided configuration. */
-    public CloudLegacySolrClient build() {
-      if (stateProvider == null) {
-        if (!zkHosts.isEmpty() && !solrUrls.isEmpty()) {
-          throw new IllegalArgumentException(
-              "Both zkHost(s) & solrUrl(s) have been specified. Only specify one.");
-        } else if (!zkHosts.isEmpty()) {
-          this.stateProvider =
-              ClusterStateProvider.newZkClusterStateProvider(zkHosts, zkChroot, canUseZkACLs);
-          if (stateProvider instanceof SolrZkClientTimeoutAware timeoutAware) {
-            timeoutAware.setZkClientTimeout(zkClientTimeout);
-            timeoutAware.setZkConnectTimeout(zkConnectTimeout);
-          }
-        } else if (!this.solrUrls.isEmpty()) {
-          try {
-            stateProvider = new HttpClusterStateProvider(solrUrls, httpClient);
-          } catch (Exception e) {
-            throw new RuntimeException(
-                "Couldn't initialize a HttpClusterStateProvider (is/are the "
-                    + "Solr server(s), "
-                    + solrUrls
-                    + ", down?)",
-                e);
-          }
-        } else {
-          throw new IllegalArgumentException("Both zkHosts and solrUrl cannot be null.");
-        }
-      }
-      return new CloudLegacySolrClient(this);
-    }
-
-    @Override
-    public Builder getThis() {
-      return this;
-    }
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java
deleted file mode 100644
index ecb32476d8a8..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java
+++ /dev/null
@@ -1,886 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj.apache;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.invoke.MethodHandles;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayDeque;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentProducer;
-import org.apache.http.entity.EntityTemplate;
-import org.apache.solr.client.solrj.RemoteSolrException;
-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.ConcurrentUpdateBaseSolrClient;
-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;
-import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.params.UpdateParams;
-import org.apache.solr.common.util.ExecutorUtil;
-import org.apache.solr.common.util.IOUtils;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.SolrNamedThreadFactory;
-import org.apache.solr.common.util.URLUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
-
-/**
- * ConcurrentUpdateSolrClient buffers all added documents and writes them into open HTTP
- * connections. This class is thread safe.
- *
- * <p>Params from {@link UpdateRequest} are converted to http request parameters. When params change
- * between UpdateRequests a new HTTP request is started.
- *
- * <p>Although any SolrClient request can be made with this implementation, it is only recommended
- * to use ConcurrentUpdateSolrClient with /update requests.
- *
- * @deprecated Please use {@link ConcurrentUpdateBaseSolrClient}
- */
-@Deprecated(since = "9.0")
-public class ConcurrentUpdateSolrClient extends SolrClient {
-  private static final long serialVersionUID = 1L;
-  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  private HttpSolrClient client;
-  final BlockingQueue<Update> queue;
-  final ExecutorService scheduler;
-  final Queue<Runner> runners;
-  volatile CountDownLatch lock = null; // used to block everything
-  final int threadCount;
-  boolean shutdownExecutor = false;
-  int pollQueueTimeMillis = 250;
-  private final boolean streamDeletes;
-  private boolean internalHttpClient;
-  private final int connectionTimeout;
-  private final int soTimeout;
-  private volatile boolean closed;
-
-  AtomicInteger pollInterrupts;
-  AtomicInteger pollExits;
-  AtomicInteger blockLoops;
-  AtomicInteger emptyQueueLoops;
-
-  protected StallDetection stallDetection;
-
-  /**
-   * Use builder to construct this class. Uses the supplied HttpClient to send documents to the Solr
-   * server.
-   */
-  protected ConcurrentUpdateSolrClient(Builder builder) {
-    this.internalHttpClient = (builder.httpClient == null);
-    final var httpSolrClientBuilder =
-        (URLUtil.isBaseUrl(builder.baseSolrUrl))
-            ? new HttpSolrClient.Builder(builder.baseSolrUrl)
-            : new HttpSolrClient.Builder(URLUtil.extractBaseUrl(builder.baseSolrUrl))
-                .withDefaultCollection(URLUtil.extractCoreFromCoreUrl(builder.baseSolrUrl));
-    this.client =
-        httpSolrClientBuilder
-            .withHttpClient(builder.httpClient)
-            .withConnectionTimeout(builder.connectionTimeoutMillis, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(builder.socketTimeoutMillis, TimeUnit.MILLISECONDS)
-            .withFollowRedirects(false)
-            .withTheseParamNamesInTheUrl(builder.urlParamNames)
-            .build();
-    this.queue = new LinkedBlockingQueue<>(builder.queueSize);
-    this.threadCount = builder.threadCount;
-    this.runners = new ArrayDeque<>();
-    this.streamDeletes = builder.streamDeletes;
-    this.connectionTimeout = builder.connectionTimeoutMillis;
-    this.soTimeout = builder.socketTimeoutMillis;
-    this.pollQueueTimeMillis = builder.pollQueueTime;
-    this.defaultCollection = builder.defaultCollection;
-
-    // Initialize stall detection
-    int stallTimeMillis = Integer.getInteger("solr.cloud.client.stallTime", 15000);
-
-    // make sure the stall time is larger than the polling time
-    // to give a chance for the queue to change
-    int minimalStallTime = pollQueueTimeMillis * 2;
-    if (minimalStallTime > stallTimeMillis) {
-      stallTimeMillis = minimalStallTime;
-    }
-
-    this.stallDetection = new StallDetection(stallTimeMillis, () -> queue.size());
-
-    if (builder.executorService != null) {
-      this.scheduler = builder.executorService;
-      this.shutdownExecutor = false;
-    } else {
-      this.scheduler =
-          ExecutorUtil.newMDCAwareCachedThreadPool(
-              new SolrNamedThreadFactory("concurrentUpdateScheduler"));
-      this.shutdownExecutor = true;
-    }
-
-    if (log.isDebugEnabled()) {
-      this.pollInterrupts = new AtomicInteger();
-      this.pollExits = new AtomicInteger();
-      this.blockLoops = new AtomicInteger();
-      this.emptyQueueLoops = new AtomicInteger();
-    }
-
-    // processedCount is now managed by StallDetection
-  }
-
-  public Set<String> getUrlParamNames() {
-    return this.client.getUrlParamNames();
-  }
-
-  /** Opens a connection and sends everything... */
-  @SuppressWarnings({"unchecked"})
-  class Runner implements Runnable {
-    volatile Thread thread = null;
-    volatile boolean inPoll = false;
-
-    public Thread getThread() {
-      return thread;
-    }
-
-    @Override
-    public void run() {
-      this.thread = Thread.currentThread();
-      log.debug("starting runner: {}", this);
-      // This loop is so we can continue if an element was added to the queue after the last runner
-      // exited.
-      for (; ; ) {
-        try {
-
-          sendUpdateStream();
-
-        } catch (Throwable e) {
-          if (e instanceof OutOfMemoryError) {
-            throw (OutOfMemoryError) e;
-          }
-          handleError(e);
-        } finally {
-          synchronized (runners) {
-            // check to see if anything else was added to the queue
-            if (runners.size() == 1 && !queue.isEmpty() && !ExecutorUtil.isShutdown(scheduler)) {
-              // If there is something else to process, keep last runner alive by staying in the
-              // loop.
-            } else {
-              runners.remove(this);
-              if (runners.isEmpty()) {
-                // notify anyone waiting in blockUntilFinished
-                runners.notifyAll();
-              }
-              break;
-            }
-          }
-        }
-      }
-
-      log.debug("finished: {}", this);
-    }
-
-    public void interruptPoll() {
-      Thread lthread = thread;
-      if (inPoll && lthread != null) {
-        lthread.interrupt();
-      }
-    }
-
-    //
-    // Pull from the queue multiple times and streams over a single connection.
-    // Exits on exception, interruption, or an empty queue to pull from.
-    //
-    void sendUpdateStream() throws Exception {
-
-      while (!queue.isEmpty()) {
-        HttpPost method = null;
-        HttpResponse response = null;
-
-        InputStream rspBody = null;
-        try {
-          Update update;
-          notifyQueueAndRunnersIfEmptyQueue();
-          try {
-            inPoll = true;
-            update = queue.poll(pollQueueTimeMillis, TimeUnit.MILLISECONDS);
-          } catch (InterruptedException e) {
-            if (log.isDebugEnabled()) pollInterrupts.incrementAndGet();
-            continue;
-          } finally {
-            inPoll = false;
-          }
-          if (update == null) break;
-
-          String contentType = client.requestWriter.getUpdateContentType();
-          final boolean isXml = ClientUtils.TEXT_XML.equals(contentType);
-
-          final ModifiableSolrParams origParams =
-              new ModifiableSolrParams(update.getRequest().getParams());
-          final String origTargetCollection = update.getCollection();
-
-          EntityTemplate template =
-              new EntityTemplate(
-                  new ContentProducer() {
-
-                    @Override
-                    public void writeTo(OutputStream out) throws IOException {
-
-                      if (isXml) {
-                        out.write("<stream>".getBytes(StandardCharsets.UTF_8)); // can be anything
-                      }
-                      Update upd = update;
-                      while (upd != null) {
-                        UpdateRequest req = upd.getRequest();
-                        if (!origParams.equals(req.getParams())
-                            || !Objects.equals(origTargetCollection, upd.getCollection())) {
-                          // Request has different params or destination core/collection, return to
-                          // queue
-                          queue.add(upd);
-                          break;
-                        }
-
-                        client.requestWriter.write(req, out);
-                        if (isXml) {
-                          // check for commit or optimize
-                          SolrParams params = req.getParams();
-                          if (params != null) {
-                            String fmt = null;
-                            if (params.getBool(UpdateParams.OPTIMIZE, false)) {
-                              fmt = "<optimize waitSearcher=\"%s\" />";
-                            } else if (params.getBool(UpdateParams.COMMIT, false)) {
-                              fmt = "<commit waitSearcher=\"%s\" />";
-                            }
-                            if (fmt != null) {
-                              byte[] content =
-                                  String.format(
-                                          Locale.ROOT,
-                                          fmt,
-                                          params.getBool(UpdateParams.WAIT_SEARCHER, false) + "")
-                                      .getBytes(StandardCharsets.UTF_8);
-                              out.write(content);
-                            }
-                          }
-                        }
-                        out.flush();
-
-                        notifyQueueAndRunnersIfEmptyQueue();
-                        inPoll = true;
-                        try {
-                          while (true) {
-                            try {
-                              upd = queue.poll(pollQueueTimeMillis, TimeUnit.MILLISECONDS);
-                              break;
-                            } catch (InterruptedException e) {
-                              if (log.isDebugEnabled()) pollInterrupts.incrementAndGet();
-                              if (!queue.isEmpty()) {
-                                continue;
-                              }
-                              if (log.isDebugEnabled()) pollExits.incrementAndGet();
-                              upd = null;
-                              break;
-                            } finally {
-                              inPoll = false;
-                            }
-                          }
-                        } finally {
-                          inPoll = false;
-                        }
-                      }
-
-                      if (isXml) {
-                        out.write("</stream>".getBytes(StandardCharsets.UTF_8));
-                      }
-                    }
-                  });
-
-          // The parser 'wt=' param is used instead of the original params
-          var addParams = SolrParams.of(CommonParams.WT, client.parser.getWriterType());
-          var requestParams = SolrParams.wrapDefaults(addParams, origParams);
-
-          String basePath = client.getBaseURL();
-          if (update.getCollection() != null) {
-            basePath += "/" + update.getCollection();
-          } else if (client.getDefaultCollection() != null) {
-            basePath += "/" + client.getDefaultCollection();
-          }
-
-          method = new HttpPost(basePath + "/update" + requestParams.toQueryString());
-
-          RequestConfig.Builder requestConfigBuilder =
-              HttpClientUtil.createDefaultRequestConfigBuilder();
-          requestConfigBuilder.setSocketTimeout(soTimeout);
-          requestConfigBuilder.setConnectTimeout(connectionTimeout);
-
-          method.setConfig(requestConfigBuilder.build());
-
-          method.setEntity(template);
-          method.addHeader("User-Agent", HttpSolrClient.USER_AGENT);
-          method.addHeader("Content-Type", contentType);
-
-          response =
-              client
-                  .getHttpClient()
-                  .execute(method, HttpClientUtil.createNewHttpClientRequestContext());
-
-          rspBody = response.getEntity().getContent();
-
-          int statusCode = response.getStatusLine().getStatusCode();
-          if (statusCode != HttpStatus.SC_OK) {
-            StringBuilder msg = new StringBuilder();
-            msg.append(response.getStatusLine().getReasonPhrase());
-            msg.append("\n\n\n\n");
-            msg.append("request: ").append(method.getURI());
-
-            SolrException solrExc;
-            Object remoteError = null;
-            // parse out the metadata from the SolrException
-            try {
-              String encoding = "UTF-8"; // default
-              if (response.getEntity().getContentType().getElements().length > 0) {
-                NameValuePair param =
-                    response
-                        .getEntity()
-                        .getContentType()
-                        .getElements()[0]
-                        .getParameterByName("charset");
-                if (param != null) {
-                  encoding = param.getValue();
-                }
-              }
-              NamedList<Object> resp = client.parser.processResponse(rspBody, encoding);
-              remoteError = resp.get("error");
-            } catch (Exception exc) {
-              // don't want to fail to report error if parsing the response fails
-              log.warn("Failed to parse error response from {} due to: ", client.getBaseURL(), exc);
-            } finally {
-              solrExc = new RemoteSolrException(client.getBaseURL(), statusCode, remoteError);
-            }
-
-            handleError(solrExc);
-          } else {
-            onSuccess(response);
-          }
-          stallDetection.incrementProcessedCount();
-
-        } finally {
-          try {
-            if (response != null) {
-              HttpClientUtil.consumeFully(response.getEntity());
-            }
-          } catch (Exception e) {
-            log.error("Error consuming and closing http response stream.", e);
-          }
-          notifyQueueAndRunnersIfEmptyQueue();
-        }
-      }
-    }
-  }
-
-  private void notifyQueueAndRunnersIfEmptyQueue() {
-    if (queue.size() == 0) {
-      synchronized (queue) {
-        // queue may be empty
-        queue.notifyAll();
-      }
-      synchronized (runners) {
-        // we notify runners too - if there is a high queue poll time and this is the update
-        // that emptied the queue, we make an attempt to avoid the 250ms timeout in
-        // blockUntilFinished
-        runners.notifyAll();
-      }
-    }
-  }
-
-  // *must* be called with runners monitor held, e.g. synchronized(runners){ addRunner() }
-  private void addRunner() {
-    MDC.put("ConcurrentUpdateSolrClient.url", client.getBaseURL());
-    try {
-      Runner r = new Runner();
-      runners.add(r);
-      try {
-        // this can throw an exception if the scheduler has been shutdown, but that should be fine.
-        scheduler.execute(r);
-      } catch (RuntimeException e) {
-        runners.remove(r);
-        throw e;
-      }
-    } finally {
-      MDC.remove("ConcurrentUpdateSolrClient.url");
-    }
-  }
-
-  /** Class representing an UpdateRequest and an optional collection. */
-  static class Update {
-    UpdateRequest request;
-    String collection;
-
-    /**
-     * @param request the update request.
-     * @param collection The collection, can be null.
-     */
-    public Update(UpdateRequest request, String collection) {
-      this.request = request;
-      this.collection = collection;
-    }
-
-    /**
-     * @return the update request.
-     */
-    public UpdateRequest getRequest() {
-      return request;
-    }
-
-    public void setRequest(UpdateRequest request) {
-      this.request = request;
-    }
-
-    /**
-     * @return the collection, can be null.
-     */
-    public String getCollection() {
-      return collection;
-    }
-
-    public void setCollection(String collection) {
-      this.collection = collection;
-    }
-  }
-
-  @Override
-  public NamedList<Object> request(final SolrRequest<?> request, String collection)
-      throws SolrServerException, IOException {
-    if (ClientUtils.shouldApplyDefaultCollection(collection, request))
-      collection = defaultCollection;
-    if (!(request instanceof UpdateRequest req)) {
-      return client.request(request, collection);
-    }
-
-    // this happens for commit...
-    if (streamDeletes) {
-      if ((req.getDocuments() == null || req.getDocuments().isEmpty())
-          && (req.getDeleteById() == null || req.getDeleteById().isEmpty())
-          && (req.getDeleteByIdMap() == null || req.getDeleteByIdMap().isEmpty())) {
-        if (req.getDeleteQuery() == null) {
-          blockUntilFinished();
-          return client.request(request, collection);
-        }
-      }
-    } else {
-      if ((req.getDocuments() == null || req.getDocuments().isEmpty())) {
-        blockUntilFinished();
-        return client.request(request, collection);
-      }
-    }
-
-    SolrParams params = req.getParams();
-    if (params != null) {
-      // check if it is waiting for the searcher
-      if (params.getBool(UpdateParams.WAIT_SEARCHER, false)) {
-        log.info("blocking for commit/optimize");
-        blockUntilFinished(); // empty the queue
-        return client.request(request, collection);
-      }
-    }
-
-    try {
-      CountDownLatch tmpLock = lock;
-      if (tmpLock != null) {
-        tmpLock.await();
-      }
-
-      Update update = new Update(req, collection);
-      boolean success = queue.offer(update);
-
-      for (; ; ) {
-        synchronized (runners) {
-          // see if queue is half full, and we can add more runners
-          // special case: if only using a threadCount of 1 and the queue
-          // is filling up, allow 1 additional runner to help process the queue
-          if (runners.isEmpty()
-              || (queue.remainingCapacity() < queue.size() && runners.size() < threadCount)) {
-            // We need more runners, so start a new one.
-            addRunner();
-          } else {
-            // break out of the retry loop if we added the element to the queue
-            // successfully, *and*
-            // while we are still holding the runners lock to prevent race
-            // conditions.
-            if (success) break;
-          }
-        }
-
-        // Retry to add to the queue w/o the runners lock held (else we risk
-        // temporary deadlock)
-        // This retry could also fail because
-        // 1) existing runners were not able to take off any new elements in the
-        // queue
-        // 2) the queue was filled back up since our last try
-        // If we succeed, the queue may have been completely emptied, and all
-        // runners stopped.
-        // In all cases, we should loop back to the top to see if we need to
-        // start more runners.
-        //
-        if (!success) {
-          success = queue.offer(update, 100, TimeUnit.MILLISECONDS);
-        }
-        if (!success) {
-          stallCheck();
-        }
-      }
-    } catch (InterruptedException e) {
-      log.error("interrupted", e);
-      throw new IOException(e.getLocalizedMessage());
-    }
-
-    // RETURN A DUMMY result
-    NamedList<Object> dummy = new NamedList<>();
-    dummy.add("NOTE", "the request is processed in a background stream");
-    return dummy;
-  }
-
-  void stallCheck() throws IOException {
-    stallDetection.stallCheck();
-  }
-
-  public synchronized void blockUntilFinished() throws IOException {
-    lock = new CountDownLatch(1);
-    try {
-
-      waitForEmptyQueue();
-      interruptRunnerThreadsPolling();
-
-      synchronized (runners) {
-
-        // NOTE: if the executor is shut down, runners may never become empty. A scheduled task may
-        // never be run, which means it would never remove itself from the runners list. This is why
-        // we don't wait forever and periodically check if the scheduler is shutting down.
-        int loopCount = 0;
-        while (!runners.isEmpty()) {
-
-          if (log.isDebugEnabled()) blockLoops.incrementAndGet();
-
-          if (ExecutorUtil.isShutdown(scheduler)) break;
-
-          loopCount++;
-
-          // Need to check if the queue is empty before really considering this is finished
-          // (SOLR-4260)
-          int queueSize = queue.size();
-          // stall prevention - only if queue is not empty
-          if (queueSize > 0) {
-            stallCheck();
-          }
-
-          if (queueSize > 0 && runners.isEmpty()) {
-            // TODO: can this still happen?
-            log.warn(
-                "No more runners, but queue still has {} adding more runners to process remaining requests on queue",
-                queueSize);
-            addRunner();
-          }
-
-          interruptRunnerThreadsPolling();
-
-          // try to avoid the worst case wait timeout
-          // without bad spin
-          int timeout;
-          if (loopCount < 3) {
-            timeout = 10;
-          } else if (loopCount < 10) {
-            timeout = 25;
-          } else {
-            timeout = 250;
-          }
-
-          try {
-            runners.wait(timeout);
-          } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-          }
-        }
-      }
-    } finally {
-      lock.countDown();
-      lock = null;
-    }
-  }
-
-  private void waitForEmptyQueue() throws IOException {
-    boolean threadInterrupted = Thread.currentThread().isInterrupted();
-
-    while (!queue.isEmpty()) {
-      if (log.isDebugEnabled()) emptyQueueLoops.incrementAndGet();
-      if (ExecutorUtil.isTerminated(scheduler)) {
-        log.warn(
-            "The task queue still has elements but the update scheduler {} is terminated. Can't process any more tasks. Queue size: {}, Runners: {}. Current thread Interrupted? {}",
-            scheduler,
-            queue.size(),
-            runners.size(),
-            threadInterrupted);
-        break;
-      }
-
-      synchronized (runners) {
-        int queueSize = queue.size();
-        if (queueSize > 0 && runners.isEmpty()) {
-          log.warn(
-              "No more runners, but queue still has {} adding more runners to process remaining requests on queue",
-              queueSize);
-          addRunner();
-        }
-      }
-      synchronized (queue) {
-        try {
-          queue.wait(250);
-        } catch (InterruptedException e) {
-          // If we set the thread as interrupted again, the next time the wait it's called it's
-          // going to return immediately
-          threadInterrupted = true;
-          log.warn(
-              "Thread interrupted while waiting for update queue to be empty. There are still {} elements in the queue.",
-              queue.size());
-        }
-      }
-
-      // Only check for stalls if the queue is not empty
-      if (!queue.isEmpty()) {
-        stallCheck();
-      }
-    }
-    if (threadInterrupted) {
-      Thread.currentThread().interrupt();
-    }
-  }
-
-  public void handleError(Throwable ex) {
-    log.error("error", ex);
-  }
-
-  /**
-   * Intended to be used as an extension point for doing post-processing after a request completes.
-   */
-  public void onSuccess(HttpResponse resp) {
-    // no-op by design, override to add functionality
-  }
-
-  @Override
-  public synchronized void close() {
-    if (closed) {
-      interruptRunnerThreadsPolling();
-      return;
-    }
-    closed = true;
-
-    try {
-      if (shutdownExecutor) {
-        scheduler.shutdown();
-        interruptRunnerThreadsPolling();
-        try {
-          if (!scheduler.awaitTermination(60, TimeUnit.SECONDS)) {
-            scheduler.shutdownNow();
-            if (!scheduler.awaitTermination(60, TimeUnit.SECONDS))
-              log.error("ExecutorService did not terminate");
-          }
-        } catch (InterruptedException ie) {
-          scheduler.shutdownNow();
-          Thread.currentThread().interrupt();
-        }
-      } else {
-        interruptRunnerThreadsPolling();
-      }
-    } finally {
-      if (internalHttpClient) IOUtils.closeQuietly(client);
-      if (log.isDebugEnabled()) {
-        log.debug(
-            "STATS pollInterrupts={} pollExists={} blockLoops={} emptyQueueLoops={}",
-            pollInterrupts.get(),
-            pollExits.get(),
-            blockLoops.get(),
-            emptyQueueLoops.get());
-      }
-    }
-  }
-
-  private void interruptRunnerThreadsPolling() {
-    synchronized (runners) {
-      for (Runner runner : runners) {
-        runner.interruptPoll();
-      }
-    }
-  }
-
-  public void shutdownNow() {
-    if (closed) {
-      return;
-    }
-    closed = true;
-    try {
-
-      if (shutdownExecutor) {
-        scheduler.shutdown();
-        interruptRunnerThreadsPolling();
-        scheduler.shutdownNow(); // Cancel currently executing tasks
-        try {
-          if (!scheduler.awaitTermination(30, TimeUnit.SECONDS))
-            log.error("ExecutorService did not terminate");
-        } catch (InterruptedException ie) {
-          scheduler.shutdownNow();
-          Thread.currentThread().interrupt();
-        }
-      } else {
-        interruptRunnerThreadsPolling();
-      }
-    } finally {
-      if (internalHttpClient) IOUtils.closeQuietly(client);
-    }
-  }
-
-  /** Constructs {@link ConcurrentUpdateSolrClient} instances from provided configuration. */
-  public static class Builder extends SolrClientBuilder<Builder> {
-    protected String baseSolrUrl;
-    protected int queueSize = 10;
-    protected int threadCount;
-    protected int pollQueueTime = 250;
-    protected ExecutorService executorService;
-    protected boolean streamDeletes;
-
-    /**
-     * Initialize a Builder object, based on the provided Solr URL.
-     *
-     * <p>The provided URL must point to the root Solr path ("/solr"), for example:
-     *
-     * <pre>
-     *   SolrClient client = new ConcurrentUpdateSolrClient.Builder("http://my-solr-server:8983/solr")
-     *       .withDefaultCollection("core1")
-     *       .build();
-     *   QueryResponse resp = client.query(new SolrQuery("*:*"));
-     * </pre>
-     */
-    public Builder(String baseSolrUrl) {
-      this.baseSolrUrl = baseSolrUrl;
-    }
-
-    /**
-     * The maximum number of requests buffered by the SolrClient's internal queue before being
-     * processed by background threads.
-     *
-     * <p>This value should be carefully paired with the number of queue-consumer threads. A queue
-     * with a maximum size set too high may require more memory. A queue with a maximum size set too
-     * low may suffer decreased throughput as {@link
-     * ConcurrentUpdateSolrClient#request(SolrRequest)} calls block waiting to add requests to the
-     * queue.
-     *
-     * <p>If not set, this defaults to 10.
-     *
-     * @see #withThreadCount(int)
-     */
-    public Builder withQueueSize(int queueSize) {
-      if (queueSize <= 0) {
-        throw new IllegalArgumentException("queueSize must be a positive integer.");
-      }
-      this.queueSize = queueSize;
-      return this;
-    }
-
-    /**
-     * The maximum number of threads used to empty {@link ConcurrentUpdateSolrClient}s queue.
-     *
-     * <p>Threads are created when documents are added to the client's internal queue and exit when
-     * no updates remain in the queue.
-     *
-     * <p>This value should be carefully paired with the maximum queue capacity. A client with too
-     * few threads may suffer decreased throughput as the queue fills up and {@link
-     * ConcurrentUpdateSolrClient#request(SolrRequest)} calls block waiting to add requests to the
-     * queue.
-     */
-    public Builder withThreadCount(int threadCount) {
-      if (threadCount <= 0) {
-        throw new IllegalArgumentException("threadCount must be a positive integer.");
-      }
-
-      this.threadCount = threadCount;
-      return this;
-    }
-
-    public Builder withPollQueueTime(int pollQueueTime) {
-      this.pollQueueTime = pollQueueTime;
-      return this;
-    }
-
-    /**
-     * Provides the {@link ExecutorService} for the created client to use when servicing the
-     * update-request queue.
-     */
-    public Builder withExecutorService(ExecutorService executorService) {
-      this.executorService = executorService;
-      return this;
-    }
-
-    /**
-     * Configures created clients to always stream delete requests.
-     *
-     * <p>Streamed deletes are put into the update-queue and executed like any other update request.
-     */
-    public Builder alwaysStreamDeletes() {
-      this.streamDeletes = true;
-      return this;
-    }
-
-    /**
-     * Configures created clients to not stream delete requests.
-     *
-     * <p>With this option set when the created ConcurrentUpdateSolrClient sends a delete request it
-     * will first will lock the queue and block until all queued updates have been sent, and then
-     * send the delete request.
-     */
-    public Builder neverStreamDeletes() {
-      this.streamDeletes = false;
-      return this;
-    }
-
-    /** Create a {@link ConcurrentUpdateSolrClient} based on the provided configuration options. */
-    public ConcurrentUpdateSolrClient build() {
-      if (baseSolrUrl == null) {
-        throw new IllegalArgumentException(
-            "Cannot create HttpSolrClient without a valid baseSolrUrl!");
-      }
-
-      return new ConcurrentUpdateSolrClient(this);
-    }
-
-    @Override
-    public Builder getThis() {
-      return this;
-    }
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java
deleted file mode 100644
index 59eea17c280c..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java
+++ /dev/null
@@ -1,621 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj.apache;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.invoke.MethodHandles;
-import java.lang.reflect.InvocationTargetException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.InflaterInputStream;
-import org.apache.http.Header;
-import org.apache.http.HeaderElement;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseInterceptor;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.config.RequestConfig.Builder;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.entity.HttpEntityWrapper;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpRequestExecutor;
-import org.apache.http.ssl.SSLContexts;
-import org.apache.http.util.EntityUtils;
-import org.apache.solr.client.solrj.impl.SolrHttpConstants;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.IOUtils;
-import org.apache.solr.common.util.ObjectReleaseTracker;
-import org.apache.solr.common.util.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Utility class for creating/configuring Apache {@link HttpClient} instances.
- *
- * <p>This class can touch internal HttpClient details and is subject to change.
- *
- * @lucene.experimental
- * @deprecated Used to configure the Apache HTTP client. Please use another client
- */
-@Deprecated(since = "9.0")
-public class HttpClientUtil implements SolrHttpConstants {
-
-  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-  private static final int VALIDATE_AFTER_INACTIVITY_DEFAULT = 3000;
-  private static final int EVICT_IDLE_CONNECTIONS_DEFAULT = 50000;
-  private static final String VALIDATE_AFTER_INACTIVITY = "validateAfterInactivity";
-  private static final String EVICT_IDLE_CONNECTIONS = "evictIdleConnections";
-
-  // Retry http requests on error
-  public static final String PROP_USE_RETRY = "retry";
-  // Allow compression (deflate,gzip) if server supports it
-  public static final String PROP_ALLOW_COMPRESSION = "allowCompression";
-
-  // * NOTE* The following params configure the default request config and this
-  // is overridden by SolrJ clients. Use the setters on the SolrJ clients
-  // to configure these settings if that is the intent.
-
-  // Follow redirects
-  public static final String PROP_FOLLOW_REDIRECTS = "followRedirects";
-
-  /**
-   * A Java system property to select the {@linkplain SocketFactoryRegistryProvider} used for
-   * configuring the Apache HTTP clients.
-   */
-  public static final String SYS_PROP_SOCKET_FACTORY_REGISTRY_PROVIDER =
-      "solr.httpclient.socketFactory.registry.provider";
-
-  static final DefaultHttpRequestRetryHandler NO_RETRY =
-      new DefaultHttpRequestRetryHandler(0, false);
-
-  private static volatile SolrHttpClientBuilder httpClientBuilder;
-
-  private static SolrHttpClientContextBuilder httpClientRequestContextBuilder =
-      new SolrHttpClientContextBuilder();
-
-  private static volatile SocketFactoryRegistryProvider socketFactoryRegistryProvider;
-  private static volatile String cookiePolicy;
-  private static final List<HttpRequestInterceptor> interceptors = new CopyOnWriteArrayList<>();
-
-  static {
-    resetHttpClientBuilder();
-
-    // Configure the SocketFactoryRegistryProvider if user has specified the provider type.
-    String socketFactoryRegistryProviderClassName =
-        System.getProperty(SYS_PROP_SOCKET_FACTORY_REGISTRY_PROVIDER);
-    if (socketFactoryRegistryProviderClassName != null) {
-      log.debug("Using {}", socketFactoryRegistryProviderClassName);
-      try {
-        socketFactoryRegistryProvider =
-            Class.forName(socketFactoryRegistryProviderClassName)
-                .asSubclass(SocketFactoryRegistryProvider.class)
-                .getDeclaredConstructor()
-                .newInstance();
-      } catch (InstantiationException
-          | IllegalAccessException
-          | ClassNotFoundException
-          | InvocationTargetException
-          | NoSuchMethodException e) {
-        throw new RuntimeException("Unable to instantiate Solr SocketFactoryRegistryProvider", e);
-      }
-    }
-  }
-
-  public static <T> T executeGET(
-      HttpClient client, String url, Utils.InputStreamConsumer<T> consumer) throws SolrException {
-    return executeHttpMethod(client, url, consumer, new HttpGet(url));
-  }
-
-  public static <T> T executeHttpMethod(
-      HttpClient client,
-      String url,
-      Utils.InputStreamConsumer<T> consumer,
-      HttpRequestBase httpMethod) {
-    T result = null;
-    HttpResponse rsp;
-    try {
-      rsp = client.execute(httpMethod);
-    } catch (IOException e) {
-      log.error("Error in request to url : {}", url, e);
-      throw new SolrException(SolrException.ErrorCode.UNKNOWN, "Error sending request");
-    }
-    int statusCode = rsp.getStatusLine().getStatusCode();
-    if (statusCode != 200) {
-      try {
-        log.error(
-            "Failed a request to: {}, status: {}, body: {}",
-            url,
-            rsp.getStatusLine(),
-            EntityUtils.toString(rsp.getEntity(), StandardCharsets.UTF_8)); // nowarn
-      } catch (IOException e) {
-        log.error("could not print error", e);
-      }
-      throw new SolrException(SolrException.ErrorCode.getErrorCode(statusCode), "Unknown error");
-    }
-    HttpEntity entity = rsp.getEntity();
-    try {
-      InputStream is = entity.getContent();
-      if (consumer != null) {
-
-        result = consumer.accept(is);
-      }
-    } catch (IOException e) {
-      throw new SolrException(SolrException.ErrorCode.UNKNOWN, e);
-    } finally {
-      consumeFully(entity);
-    }
-    return result;
-  }
-
-  /**
-   * If the passed entity has content, make sure it is fully read and closed.
-   *
-   * @param entity to consume or null
-   */
-  public static void consumeFully(HttpEntity entity) {
-    if (entity != null) {
-      try {
-        // make sure the stream is full read
-        Utils.readFully(entity.getContent());
-      } catch (UnsupportedOperationException e) {
-        // nothing to do then
-      } catch (IOException e) {
-        // quiet
-      } finally {
-        // close the stream
-        EntityUtils.consumeQuietly(entity);
-      }
-    }
-  }
-
-  public abstract static class SocketFactoryRegistryProvider {
-    /** Must be non-null */
-    public abstract Registry<ConnectionSocketFactory> getSocketFactoryRegistry();
-  }
-
-  private static class DynamicInterceptor implements HttpRequestInterceptor {
-
-    @Override
-    public void process(HttpRequest request, HttpContext context)
-        throws HttpException, IOException {
-      // don't synchronize traversal - can lead to deadlock - CopyOnWriteArrayList is critical
-      // we also do not want to have to acquire the mutex when the list is empty or put a global
-      // mutex around the process calls
-      interceptors.forEach(
-          new Consumer<HttpRequestInterceptor>() {
-
-            @Override
-            public void accept(HttpRequestInterceptor interceptor) {
-              try {
-                interceptor.process(request, context);
-              } catch (Exception e) {
-                log.error("", e);
-              }
-            }
-          });
-    }
-  }
-
-  public static void setHttpClientBuilder(SolrHttpClientBuilder newHttpClientBuilder) {
-    httpClientBuilder = newHttpClientBuilder;
-  }
-
-  public static void setHttpClientProvider(SolrHttpClientBuilder newHttpClientBuilder) {
-    httpClientBuilder = newHttpClientBuilder;
-  }
-
-  /**
-   * @see #SYS_PROP_CHECK_PEER_NAME
-   */
-  public static void setSocketFactoryRegistryProvider(
-      SocketFactoryRegistryProvider newRegistryProvider) {
-    socketFactoryRegistryProvider = newRegistryProvider;
-  }
-
-  public static SolrHttpClientBuilder getHttpClientBuilder() {
-    return httpClientBuilder;
-  }
-
-  /**
-   * @see #SYS_PROP_CHECK_PEER_NAME
-   */
-  public static SocketFactoryRegistryProvider getSocketFactoryRegistryProvider() {
-    return socketFactoryRegistryProvider;
-  }
-
-  public static void resetHttpClientBuilder() {
-    socketFactoryRegistryProvider = new DefaultSocketFactoryRegistryProvider();
-    httpClientBuilder = SolrHttpClientBuilder.create();
-  }
-
-  private static final class DefaultSocketFactoryRegistryProvider
-      extends SocketFactoryRegistryProvider {
-    @Override
-    public Registry<ConnectionSocketFactory> getSocketFactoryRegistry() {
-      // this mimics PoolingHttpClientConnectionManager's default behavior,
-      // except that we explicitly use SSLConnectionSocketFactory.getSystemSocketFactory()
-      // to pick up the system level default SSLContext (where javax.net.ssl.* properties
-      // related to keystore & truststore are specified)
-      RegistryBuilder<ConnectionSocketFactory> builder =
-          RegistryBuilder.<ConnectionSocketFactory>create();
-      builder.register("http", PlainConnectionSocketFactory.getSocketFactory());
-
-      // logic to turn off peer host check
-      SSLConnectionSocketFactory sslConnectionSocketFactory = null;
-      boolean sslCheckPeerName =
-          toBooleanDefaultIfNull(
-              toBooleanObject(System.getProperty(HttpClientUtil.SYS_PROP_CHECK_PEER_NAME)), true);
-      if (sslCheckPeerName) {
-        sslConnectionSocketFactory = SSLConnectionSocketFactory.getSystemSocketFactory();
-      } else {
-        sslConnectionSocketFactory =
-            new SSLConnectionSocketFactory(
-                SSLContexts.createSystemDefault(), NoopHostnameVerifier.INSTANCE);
-        log.debug(
-            "{} is false, hostname checks disabled.", HttpClientUtil.SYS_PROP_CHECK_PEER_NAME);
-      }
-      builder.register("https", sslConnectionSocketFactory);
-
-      return builder.build();
-    }
-  }
-
-  /**
-   * Creates new http client by using the provided configuration.
-   *
-   * @param params http client configuration, if null a client with default configuration (no
-   *     additional configuration) is created.
-   */
-  public static CloseableHttpClient createClient(SolrParams params) {
-    return createClient(params, createPoolingConnectionManager());
-  }
-
-  /** test usage subject to change @lucene.experimental */
-  static PoolingHttpClientConnectionManager createPoolingConnectionManager() {
-    return new PoolingHttpClientConnectionManager(
-        socketFactoryRegistryProvider.getSocketFactoryRegistry());
-  }
-
-  public static CloseableHttpClient createClient(
-      SolrParams params, PoolingHttpClientConnectionManager cm) {
-    if (params == null) {
-      params = new ModifiableSolrParams();
-    }
-
-    return createClient(params, cm, false);
-  }
-
-  public static CloseableHttpClient createClient(
-      final SolrParams params,
-      PoolingHttpClientConnectionManager cm,
-      boolean sharedConnectionManager,
-      HttpRequestExecutor httpRequestExecutor) {
-    final ModifiableSolrParams config = new ModifiableSolrParams(params);
-    if (log.isDebugEnabled()) {
-      log.debug("Creating new http client, config: {}", config);
-    }
-
-    cm.setMaxTotal(params.getInt(HttpClientUtil.PROP_MAX_CONNECTIONS, 10000));
-    cm.setDefaultMaxPerRoute(params.getInt(HttpClientUtil.PROP_MAX_CONNECTIONS_PER_HOST, 10000));
-    cm.setValidateAfterInactivity(
-        Integer.getInteger(VALIDATE_AFTER_INACTIVITY, VALIDATE_AFTER_INACTIVITY_DEFAULT));
-
-    HttpClientBuilder newHttpClientBuilder = HttpClientBuilder.create();
-
-    if (sharedConnectionManager) {
-      newHttpClientBuilder.setConnectionManagerShared(true);
-    } else {
-      newHttpClientBuilder.setConnectionManagerShared(false);
-    }
-
-    ConnectionKeepAliveStrategy keepAliveStrat =
-        new ConnectionKeepAliveStrategy() {
-          @Override
-          public long getKeepAliveDuration(HttpResponse response, HttpContext context) {
-            // we only close connections based on idle time, not ttl expiration
-            return -1;
-          }
-        };
-
-    if (httpClientBuilder.getAuthSchemeRegistryProvider() != null) {
-      newHttpClientBuilder.setDefaultAuthSchemeRegistry(
-          httpClientBuilder.getAuthSchemeRegistryProvider().getAuthSchemeRegistry());
-    }
-    if (httpClientBuilder.getCookieSpecRegistryProvider() != null) {
-      newHttpClientBuilder.setDefaultCookieSpecRegistry(
-          httpClientBuilder.getCookieSpecRegistryProvider().getCookieSpecRegistry());
-    }
-    if (httpClientBuilder.getCredentialsProviderProvider() != null) {
-      newHttpClientBuilder.setDefaultCredentialsProvider(
-          httpClientBuilder.getCredentialsProviderProvider().getCredentialsProvider());
-    }
-
-    newHttpClientBuilder.addInterceptorLast(new DynamicInterceptor());
-
-    newHttpClientBuilder =
-        newHttpClientBuilder
-            .setKeepAliveStrategy(keepAliveStrat)
-            .evictIdleConnections(
-                (long) Integer.getInteger(EVICT_IDLE_CONNECTIONS, EVICT_IDLE_CONNECTIONS_DEFAULT),
-                TimeUnit.MILLISECONDS);
-
-    if (httpRequestExecutor != null) {
-      newHttpClientBuilder.setRequestExecutor(httpRequestExecutor);
-    }
-
-    HttpClientBuilder builder = setupBuilder(newHttpClientBuilder, params);
-
-    HttpClient httpClient = builder.setConnectionManager(cm).build();
-
-    assert ObjectReleaseTracker.track(httpClient);
-    return (CloseableHttpClient) httpClient;
-  }
-
-  /** Creates new http client by using the provided configuration. */
-  public static CloseableHttpClient createClient(
-      final SolrParams params,
-      PoolingHttpClientConnectionManager cm,
-      boolean sharedConnectionManager) {
-    return createClient(params, cm, sharedConnectionManager, null);
-  }
-
-  private static HttpClientBuilder setupBuilder(HttpClientBuilder builder, SolrParams config) {
-
-    Builder requestConfigBuilder =
-        RequestConfig.custom()
-            .setRedirectsEnabled(config.getBool(HttpClientUtil.PROP_FOLLOW_REDIRECTS, false))
-            .setDecompressionEnabled(false)
-            .setConnectTimeout(
-                config.getInt(HttpClientUtil.PROP_CONNECTION_TIMEOUT, DEFAULT_CONNECT_TIMEOUT))
-            .setSocketTimeout(config.getInt(HttpClientUtil.PROP_SO_TIMEOUT, DEFAULT_SO_TIMEOUT));
-
-    String cpolicy = cookiePolicy;
-    if (cpolicy != null) {
-      requestConfigBuilder.setCookieSpec(cpolicy);
-    }
-
-    RequestConfig requestConfig = requestConfigBuilder.build();
-
-    HttpClientBuilder retBuilder = builder.setDefaultRequestConfig(requestConfig);
-
-    if (config.getBool(HttpClientUtil.PROP_USE_RETRY, true)) {
-      retBuilder =
-          retBuilder.setRetryHandler(
-              new SolrHttpRequestRetryHandler(Integer.getInteger("solr.httpclient.retries", 3)));
-
-    } else {
-      retBuilder = retBuilder.setRetryHandler(NO_RETRY);
-    }
-
-    final String basicAuthUser = config.get(HttpClientUtil.PROP_BASIC_AUTH_USER);
-    final String basicAuthPass = config.get(HttpClientUtil.PROP_BASIC_AUTH_PASS);
-
-    if (basicAuthUser != null && basicAuthPass != null) {
-      CredentialsProvider credsProvider = new BasicCredentialsProvider();
-      credsProvider.setCredentials(
-          AuthScope.ANY, new UsernamePasswordCredentials(basicAuthUser, basicAuthPass));
-      retBuilder.setDefaultCredentialsProvider(credsProvider);
-    }
-
-    if (config.getBool(HttpClientUtil.PROP_ALLOW_COMPRESSION, false)) {
-      retBuilder.addInterceptorFirst(new UseCompressionRequestInterceptor());
-      retBuilder.addInterceptorFirst(new UseCompressionResponseInterceptor());
-    } else {
-      retBuilder.disableContentCompression();
-    }
-
-    retBuilder.useSystemProperties();
-    return retBuilder;
-  }
-
-  public static void close(HttpClient httpClient) {
-
-    IOUtils.closeQuietly((CloseableHttpClient) httpClient);
-
-    assert ObjectReleaseTracker.release(httpClient);
-  }
-
-  public static void addRequestInterceptor(HttpRequestInterceptor interceptor) {
-    interceptors.add(interceptor);
-  }
-
-  public static void removeRequestInterceptor(HttpRequestInterceptor interceptor) {
-    interceptors.remove(interceptor);
-  }
-
-  public static void clearRequestInterceptors() {
-    interceptors.clear();
-  }
-
-  private static class UseCompressionRequestInterceptor implements HttpRequestInterceptor {
-
-    @Override
-    public void process(HttpRequest request, HttpContext context)
-        throws HttpException, IOException {
-      if (!request.containsHeader("Accept-Encoding")) {
-        request.addHeader("Accept-Encoding", "gzip, deflate");
-      }
-    }
-  }
-
-  private static class UseCompressionResponseInterceptor implements HttpResponseInterceptor {
-
-    @Override
-    public void process(final HttpResponse response, final HttpContext context)
-        throws HttpException, IOException {
-
-      HttpEntity entity = response.getEntity();
-      Header ceheader = entity.getContentEncoding();
-      if (ceheader != null) {
-        HeaderElement[] codecs = ceheader.getElements();
-        for (int i = 0; i < codecs.length; i++) {
-          if (codecs[i].getName().equalsIgnoreCase("gzip")) {
-            response.setEntity(new GzipDecompressingEntity(response.getEntity()));
-            return;
-          }
-          if (codecs[i].getName().equalsIgnoreCase("deflate")) {
-            response.setEntity(new DeflateDecompressingEntity(response.getEntity()));
-            return;
-          }
-        }
-      }
-    }
-  }
-
-  protected static class GzipDecompressingEntity extends HttpEntityWrapper {
-    private boolean gzipInputStreamCreated = false;
-    private InputStream gzipInputStream = null;
-
-    public GzipDecompressingEntity(final HttpEntity entity) {
-      super(entity);
-    }
-
-    /**
-     * Return a InputStream of uncompressed data. If there is an issue with the compression of the
-     * data, a null InputStream will be returned, and the underlying compressed InputStream will be
-     * closed.
-     *
-     * <p>The same input stream will be returned if the underlying entity is not repeatable. If the
-     * underlying entity is repeatable, then a new input stream will be created.
-     */
-    @Override
-    public InputStream getContent() throws IOException, IllegalStateException {
-      if (!gzipInputStreamCreated || wrappedEntity.isRepeatable()) {
-        gzipInputStreamCreated = true;
-        InputStream wrappedContent = wrappedEntity.getContent();
-        if (wrappedContent != null) {
-          try {
-            gzipInputStream = new GZIPInputStream(wrappedContent);
-          } catch (IOException ioException) {
-            try (wrappedContent) {
-              Utils.readFully(wrappedContent);
-            } catch (IOException ignored) {
-            }
-            throw new IOException("Cannot open GZipInputStream for response", ioException);
-          }
-        }
-      }
-      return gzipInputStream;
-    }
-
-    @Override
-    public long getContentLength() {
-      return -1;
-    }
-  }
-
-  private static class DeflateDecompressingEntity extends GzipDecompressingEntity {
-    public DeflateDecompressingEntity(final HttpEntity entity) {
-      super(entity);
-    }
-
-    @Override
-    public InputStream getContent() throws IOException, IllegalStateException {
-      // InflaterInputStream does not throw a ZipException in the constructor,
-      // so it does not need the same checks as the GZIPInputStream.
-      return new InflaterInputStream(wrappedEntity.getContent());
-    }
-  }
-
-  public static void setHttpClientRequestContextBuilder(
-      SolrHttpClientContextBuilder httpClientContextBuilder) {
-    httpClientRequestContextBuilder = httpClientContextBuilder;
-  }
-
-  /**
-   * Create a HttpClientContext object and {@link HttpClientContext#setUserToken(Object)} to an
-   * internal singleton. It allows reusing underlying {@link HttpClient} in connection pools if
-   * client authentication is enabled.
-   */
-  public static HttpClientContext createNewHttpClientRequestContext() {
-    HttpClientContext context =
-        httpClientRequestContextBuilder.createContext(HttpSolrClient.cacheKey);
-
-    return context;
-  }
-
-  public static Builder createDefaultRequestConfigBuilder() {
-    String cpolicy = cookiePolicy;
-    Builder builder = RequestConfig.custom();
-
-    builder
-        .setSocketTimeout(DEFAULT_SO_TIMEOUT)
-        .setConnectTimeout(DEFAULT_CONNECT_TIMEOUT)
-        .setRedirectsEnabled(false)
-        .setDecompressionEnabled(false); // we do our own compression / decompression
-    if (cpolicy != null) {
-      builder.setCookieSpec(cpolicy);
-    }
-    return builder;
-  }
-
-  public static void setCookiePolicy(String policyName) {
-    cookiePolicy = policyName;
-  }
-
-  /**
-   * @lucene.internal
-   */
-  static boolean toBooleanDefaultIfNull(Boolean bool, boolean valueIfNull) {
-    if (bool == null) {
-      return valueIfNull;
-    }
-    return bool.booleanValue() ? true : false;
-  }
-
-  /**
-   * @lucene.internal
-   */
-  static Boolean toBooleanObject(String str) {
-    if ("true".equalsIgnoreCase(str)) {
-      return Boolean.TRUE;
-    } else if ("false".equalsIgnoreCase(str)) {
-      return Boolean.FALSE;
-    }
-    // no match
-    return null;
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.java
deleted file mode 100644
index 099cf7ca148c..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClusterStateProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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;
-
-/**
- * Retrieves cluster state via Solr HTTP APIs
- *
- * @deprecated Please use {@link org.apache.solr.client.solrj.impl.HttpClusterStateProvider}
- */
-@Deprecated(since = "9.0")
-public class HttpClusterStateProvider extends BaseHttpClusterStateProvider {
-
-  private final HttpClient httpClient;
-  private final boolean clientIsInternal;
-
-  public HttpClusterStateProvider(List<String> solrUrls, HttpClient httpClient) throws Exception {
-    this.httpClient = httpClient == null ? HttpClientUtil.createClient(null) : httpClient;
-    this.clientIsInternal = httpClient == null;
-    initConfiguredNodes(solrUrls);
-  }
-
-  @Override
-  protected SolrClient getSolrClient(String baseUrl) {
-    return new HttpSolrClient.Builder()
-        .withBaseSolrUrl(baseUrl)
-        .withHttpClient(httpClient)
-        .build();
-  }
-
-  @Override
-  public void close() throws IOException {
-    if (this.clientIsInternal && this.httpClient != null) {
-      HttpClientUtil.close(httpClient);
-    }
-    super.close();
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java
deleted file mode 100644
index 76bcd7749a3f..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java
+++ /dev/null
@@ -1,873 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj.apache;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.invoke.MethodHandles;
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
-import java.net.URLDecoder;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.stream.Collectors;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpMessage;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.InputStreamEntity;
-import org.apache.http.entity.mime.FormBodyPart;
-import org.apache.http.entity.mime.HttpMultipartMode;
-import org.apache.http.entity.mime.MultipartEntity;
-import org.apache.http.entity.mime.content.InputStreamBody;
-import org.apache.http.entity.mime.content.StringBody;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.solr.client.api.util.SolrVersion;
-import org.apache.solr.client.solrj.RemoteSolrException;
-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.HttpJdkSolrClient;
-import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
-import org.apache.solr.client.solrj.request.JavaBinRequestWriter;
-import org.apache.solr.client.solrj.request.RequestWriter;
-import org.apache.solr.client.solrj.response.InputStreamResponseParser;
-import org.apache.solr.client.solrj.response.JavaBinResponseParser;
-import org.apache.solr.client.solrj.response.ResponseParser;
-import org.apache.solr.client.solrj.util.ClientUtils;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.ContentStream;
-import org.apache.solr.common.util.ExecutorUtil;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.SolrNamedThreadFactory;
-import org.slf4j.MDC;
-
-/**
- * A SolrClient implementation that talks directly to a Solr server via Apache HTTP client
- *
- * @deprecated Please use {@link HttpJettySolrClient} or {@link HttpJdkSolrClient}
- */
-@Deprecated(since = "9.0")
-public class HttpSolrClient extends SolrClient {
-
-  private static final Charset FALLBACK_CHARSET = StandardCharsets.UTF_8;
-  private static final long serialVersionUID = -946812319974801896L;
-
-  protected static final Set<Integer> UNMATCHED_ACCEPTED_ERROR_CODES = Set.of(429);
-
-  static final String USER_AGENT =
-      "Solr[" + MethodHandles.lookup().lookupClass().getName() + "] " + SolrVersion.LATEST_STRING;
-
-  static final Class<HttpSolrClient> cacheKey = HttpSolrClient.class;
-
-  /** The URL of the Solr server. */
-  protected volatile String baseUrl;
-
-  /**
-   * Default value: null / empty.
-   *
-   * <p>Parameters that are added to every request regardless. This may be a place to add something
-   * like an authentication token.
-   */
-  protected ModifiableSolrParams invariantParams;
-
-  /**
-   * Default response parser is BinaryResponseParser
-   *
-   * <p>This parser represents the default Response Parser chosen to parse the response if the
-   * parser were not specified as part of the request.
-   *
-   * @see JavaBinResponseParser
-   */
-  protected volatile ResponseParser parser;
-
-  /**
-   * The RequestWriter used to write all requests to Solr
-   *
-   * @see org.apache.solr.client.solrj.request.RequestWriter
-   */
-  protected volatile RequestWriter requestWriter = new JavaBinRequestWriter();
-
-  private final HttpClient httpClient;
-
-  private volatile Boolean followRedirects = false;
-
-  private volatile boolean useMultiPartPost;
-  private final boolean internalClient;
-
-  private volatile Set<String> urlParamNames = Set.of();
-  private final int connectionTimeout;
-  private final int soTimeout;
-
-  protected HttpSolrClient(Builder builder) {
-    this.baseUrl = builder.baseSolrUrl;
-    if (baseUrl.endsWith("/")) {
-      baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
-    }
-
-    if (baseUrl.indexOf('?') >= 0) {
-      throw new RuntimeException(
-          "Invalid base url for solrj.  The base URL must not contain parameters: " + baseUrl);
-    }
-
-    if (builder.httpClient != null) {
-      this.internalClient = false;
-      this.followRedirects = builder.followRedirects;
-      this.httpClient = builder.httpClient;
-    } else {
-      this.internalClient = true;
-      this.followRedirects = builder.followRedirects;
-      ModifiableSolrParams params = new ModifiableSolrParams();
-      params.set(HttpClientUtil.PROP_FOLLOW_REDIRECTS, followRedirects);
-      params.set(HttpClientUtil.PROP_ALLOW_COMPRESSION, builder.compression);
-      params.set(HttpClientUtil.PROP_CONNECTION_TIMEOUT, builder.connectionTimeoutMillis);
-      params.set(HttpClientUtil.PROP_SO_TIMEOUT, builder.socketTimeoutMillis);
-      httpClient = HttpClientUtil.createClient(params);
-    }
-
-    if (builder.requestWriter != null) {
-      this.requestWriter = builder.requestWriter;
-    }
-
-    this.parser = builder.responseParser;
-    this.invariantParams = builder.invariantParams;
-    this.connectionTimeout = builder.connectionTimeoutMillis;
-    this.soTimeout = builder.socketTimeoutMillis;
-    this.useMultiPartPost = builder.useMultiPartPost;
-    this.urlParamNames = builder.urlParamNames;
-    this.defaultCollection = builder.defaultCollection;
-  }
-
-  public Set<String> getUrlParamNames() {
-    return urlParamNames;
-  }
-
-  /**
-   * Returns the connection timeout, and should be based on httpClient overriding the solrClient.
-   * For unit testing.
-   *
-   * @return the connection timeout
-   */
-  int getConnectionTimeout() {
-    return this.connectionTimeout;
-  }
-
-  /**
-   * Returns the socket timeout, and should be based on httpClient overriding the solrClient. For
-   * unit testing.
-   *
-   * @return the socket timeout
-   */
-  int getSocketTimeout() {
-    return this.soTimeout;
-  }
-
-  /**
-   * Process the request. If {@link org.apache.solr.client.solrj.SolrRequest#getResponseParser()} is
-   * null, then use {@link #getParser()}
-   *
-   * @param request The {@link org.apache.solr.client.solrj.SolrRequest} to process
-   * @return The {@link org.apache.solr.common.util.NamedList} result
-   * @throws IOException If there is a low-level I/O error.
-   * @see #request(org.apache.solr.client.solrj.SolrRequest,
-   *     org.apache.solr.client.solrj.response.ResponseParser)
-   */
-  @Override
-  public NamedList<Object> request(final SolrRequest<?> request, String collection)
-      throws SolrServerException, IOException {
-    ResponseParser responseParser = request.getResponseParser();
-    if (responseParser == null) {
-      responseParser = parser;
-    }
-    return request(request, responseParser, collection);
-  }
-
-  public NamedList<Object> request(final SolrRequest<?> request, final ResponseParser processor)
-      throws SolrServerException, IOException {
-    return request(request, processor, null);
-  }
-
-  public NamedList<Object> request(
-      final SolrRequest<?> request, final ResponseParser processor, String collection)
-      throws SolrServerException, IOException {
-    if (ClientUtils.shouldApplyDefaultCollection(collection, request))
-      collection = defaultCollection;
-    HttpRequestBase method = createMethod(request, collection);
-    setBasicAuthHeader(request, method);
-    if (request.getHeaders() != null) {
-      Map<String, String> headers = request.getHeaders();
-      for (Map.Entry<String, String> entry : headers.entrySet()) {
-        method.setHeader(entry.getKey(), entry.getValue());
-      }
-    }
-    return executeMethod(method, request.getUserPrincipal(), processor, isV2ApiRequest(request));
-  }
-
-  private boolean isV2ApiRequest(final SolrRequest<?> request) {
-    return request.getApiVersion() == SolrRequest.ApiVersion.V2;
-  }
-
-  private void setBasicAuthHeader(SolrRequest<?> request, HttpRequestBase method)
-      throws UnsupportedEncodingException {
-    if (request.getBasicAuthUser() != null && request.getBasicAuthPassword() != null) {
-      String userPass = request.getBasicAuthUser() + ":" + request.getBasicAuthPassword();
-      String encoded = Base64.getEncoder().encodeToString(userPass.getBytes(FALLBACK_CHARSET));
-      method.setHeader(new BasicHeader("Authorization", "Basic " + encoded));
-    }
-  }
-
-  /**
-   * @lucene.experimental
-   */
-  public static class HttpUriRequestResponse {
-    public HttpUriRequest httpUriRequest;
-    public Future<NamedList<Object>> future;
-  }
-
-  /**
-   * @lucene.experimental
-   */
-  public HttpUriRequestResponse httpUriRequest(final SolrRequest<?> request)
-      throws SolrServerException, IOException {
-    ResponseParser responseParser = request.getResponseParser();
-    if (responseParser == null) {
-      responseParser = parser;
-    }
-    return httpUriRequest(request, responseParser);
-  }
-
-  /**
-   * @lucene.experimental
-   */
-  public HttpUriRequestResponse httpUriRequest(
-      final SolrRequest<?> request, final ResponseParser processor)
-      throws SolrServerException, IOException {
-    HttpUriRequestResponse mrr = new HttpUriRequestResponse();
-    final HttpRequestBase method = createMethod(request, defaultCollection);
-    ExecutorService pool =
-        ExecutorUtil.newMDCAwareFixedThreadPool(1, new SolrNamedThreadFactory("httpUriRequest"));
-    try {
-      MDC.put("HttpSolrClient.url", baseUrl);
-      mrr.future =
-          pool.submit(
-              () ->
-                  executeMethod(
-                      method, request.getUserPrincipal(), processor, isV2ApiRequest(request)));
-
-    } finally {
-      pool.shutdown();
-      MDC.remove("HttpSolrClient.url");
-    }
-    assert method != null;
-    mrr.httpUriRequest = method;
-    return mrr;
-  }
-
-  protected ModifiableSolrParams calculateQueryParams(
-      Set<String> queryParamNames, ModifiableSolrParams wparams) {
-    ModifiableSolrParams queryModParams = new ModifiableSolrParams();
-    if (queryParamNames != null) {
-      for (String param : queryParamNames) {
-        String[] value = wparams.getParams(param);
-        if (value != null) {
-          for (String v : value) {
-            queryModParams.add(param, v);
-          }
-          wparams.remove(param);
-        }
-      }
-    }
-    return queryModParams;
-  }
-
-  protected HttpRequestBase createMethod(SolrRequest<?> request, String collection)
-      throws IOException, SolrServerException {
-    SolrParams params = request.getParams();
-    RequestWriter.ContentWriter contentWriter = requestWriter.getContentWriter(request);
-    Collection<ContentStream> streams =
-        contentWriter == null ? requestWriter.getContentStreams(request) : null;
-
-    final String requestUrlBeforeParams = ClientUtils.buildRequestUrl(request, baseUrl, collection);
-
-    ResponseParser parser = request.getResponseParser();
-    if (parser == null) {
-      parser = this.parser;
-    }
-
-    Header[] contextHeaders = buildRequestSpecificHeaders(request);
-
-    // The parser 'wt=' param is used instead of the original params
-    ModifiableSolrParams wparams = new ModifiableSolrParams(params);
-    if (parser != null) {
-      wparams.set(CommonParams.WT, parser.getWriterType());
-    }
-    if (invariantParams != null) {
-      wparams.add(invariantParams);
-    }
-
-    if (SolrRequest.METHOD.GET == request.getMethod()) {
-      if (streams != null || contentWriter != null) {
-        throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "GET can't send streams!");
-      }
-
-      HttpGet result = new HttpGet(requestUrlBeforeParams + wparams.toQueryString());
-
-      populateHeaders(result, contextHeaders);
-      return result;
-    }
-
-    if (SolrRequest.METHOD.DELETE == request.getMethod()) {
-      return new HttpDelete(requestUrlBeforeParams + wparams.toQueryString());
-    }
-
-    if (SolrRequest.METHOD.POST == request.getMethod()
-        || SolrRequest.METHOD.PUT == request.getMethod()) {
-
-      boolean hasNullStreamName = false;
-      if (streams != null) {
-        for (ContentStream cs : streams) {
-          if (cs.getName() == null) {
-            hasNullStreamName = true;
-            break;
-          }
-        }
-      }
-      boolean isMultipart =
-          ((this.useMultiPartPost && SolrRequest.METHOD.POST == request.getMethod())
-                  || (streams != null && streams.size() > 1))
-              && !hasNullStreamName;
-
-      List<NameValuePair> postOrPutParams = new ArrayList<>();
-
-      if (contentWriter != null) {
-        String fullQueryUrl = requestUrlBeforeParams + wparams.toQueryString();
-        HttpEntityEnclosingRequestBase postOrPut =
-            SolrRequest.METHOD.POST == request.getMethod()
-                ? new HttpPost(fullQueryUrl)
-                : new HttpPut(fullQueryUrl);
-        postOrPut.addHeader("Content-Type", contentWriter.getContentType());
-        postOrPut.setEntity(
-            new BasicHttpEntity() {
-              @Override
-              public boolean isStreaming() {
-                return true;
-              }
-
-              @Override
-              public void writeTo(OutputStream outstream) throws IOException {
-                contentWriter.write(outstream);
-              }
-            });
-
-        populateHeaders(postOrPut, contextHeaders);
-
-        return postOrPut;
-
-      } else if (streams == null || isMultipart) {
-        // send server list and request list as query string params
-        ModifiableSolrParams queryParams = calculateQueryParams(this.urlParamNames, wparams);
-        queryParams.add(calculateQueryParams(request.getQueryParams(), wparams));
-        String fullQueryUrl = requestUrlBeforeParams + queryParams.toQueryString();
-        HttpEntityEnclosingRequestBase postOrPut =
-            fillContentStream(
-                request, streams, wparams, isMultipart, postOrPutParams, fullQueryUrl);
-        return postOrPut;
-      }
-      // It is has one stream, it is the post body, put the params in the URL
-      else {
-        String fullQueryUrl = requestUrlBeforeParams + wparams.toQueryString();
-        HttpEntityEnclosingRequestBase postOrPut =
-            SolrRequest.METHOD.POST == request.getMethod()
-                ? new HttpPost(fullQueryUrl)
-                : new HttpPut(fullQueryUrl);
-        fillSingleContentStream(streams, postOrPut);
-
-        return postOrPut;
-      }
-    }
-
-    throw new SolrServerException("Unsupported method: " + request.getMethod());
-  }
-
-  private void fillSingleContentStream(
-      Collection<ContentStream> streams, HttpEntityEnclosingRequestBase postOrPut)
-      throws IOException {
-    // Single stream as body
-    // Using a loop just to get the first one
-    final ContentStream[] contentStream = new ContentStream[1];
-    for (ContentStream content : streams) {
-      contentStream[0] = content;
-      break;
-    }
-    Long size = contentStream[0].getSize();
-    postOrPut.setEntity(
-        new InputStreamEntity(contentStream[0].getStream(), size == null ? -1 : size) {
-          @Override
-          public Header getContentType() {
-            return new BasicHeader("Content-Type", contentStream[0].getContentType());
-          }
-
-          @Override
-          public boolean isRepeatable() {
-            return false;
-          }
-        });
-  }
-
-  private HttpEntityEnclosingRequestBase fillContentStream(
-      SolrRequest<?> request,
-      Collection<ContentStream> streams,
-      ModifiableSolrParams wparams,
-      boolean isMultipart,
-      List<NameValuePair> postOrPutParams,
-      String fullQueryUrl)
-      throws IOException {
-    HttpEntityEnclosingRequestBase postOrPut =
-        SolrRequest.METHOD.POST == request.getMethod()
-            ? new HttpPost(fullQueryUrl)
-            : new HttpPut(fullQueryUrl);
-
-    if (!isMultipart) {
-      postOrPut.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
-    }
-
-    List<FormBodyPart> parts = new ArrayList<>();
-    Iterator<String> iter = wparams.getParameterNamesIterator();
-    while (iter.hasNext()) {
-      String p = iter.next();
-      String[] vals = wparams.getParams(p);
-      if (vals != null) {
-        for (String v : vals) {
-          if (isMultipart) {
-            parts.add(new FormBodyPart(p, new StringBody(v, StandardCharsets.UTF_8)));
-          } else {
-            postOrPutParams.add(new BasicNameValuePair(p, v));
-          }
-        }
-      }
-    }
-
-    // TODO: remove deprecated - first simple attempt failed, see {@link MultipartEntityBuilder}
-    if (isMultipart && streams != null) {
-      for (ContentStream content : streams) {
-        String contentType = content.getContentType();
-        if (contentType == null) {
-          contentType = "multipart/form-data"; // default
-        }
-        String name = content.getName();
-        if (name == null) {
-          name = "";
-        }
-        parts.add(
-            new FormBodyPart(
-                name,
-                new InputStreamBody(
-                    content.getStream(), ContentType.parse(contentType), content.getName())));
-      }
-    }
-
-    if (parts.size() > 0) {
-      MultipartEntity entity = new MultipartEntity(HttpMultipartMode.STRICT);
-      for (FormBodyPart p : parts) {
-        entity.addPart(p);
-      }
-      postOrPut.setEntity(entity);
-    } else {
-      // not using multipart
-      postOrPut.setEntity(new UrlEncodedFormEntity(postOrPutParams, StandardCharsets.UTF_8));
-    }
-    return postOrPut;
-  }
-
-  // Utils.getObjectByPath(err, false,"metadata/error-class")
-  private static final List<String> errPath = Arrays.asList("metadata", "error-class");
-
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  protected NamedList<Object> executeMethod(
-      HttpRequestBase method,
-      Principal userPrincipal,
-      final ResponseParser processor,
-      final boolean isV2Api)
-      throws SolrServerException {
-    method.addHeader("User-Agent", USER_AGENT);
-
-    RequestConfig.Builder requestConfigBuilder = HttpClientUtil.createDefaultRequestConfigBuilder();
-    requestConfigBuilder.setSocketTimeout(soTimeout);
-    requestConfigBuilder.setConnectTimeout(connectionTimeout);
-
-    if (followRedirects != null) {
-      requestConfigBuilder.setRedirectsEnabled(followRedirects);
-    }
-
-    method.setConfig(requestConfigBuilder.build());
-
-    HttpEntity entity = null;
-    boolean shouldClose = true;
-    try {
-      // Execute the method.
-      HttpClientContext httpClientRequestContext =
-          HttpClientUtil.createNewHttpClientRequestContext();
-      if (userPrincipal != null) {
-        // Normally the context contains a static userToken to enable reuse resources. However, if a
-        // personal Principal object exists, we use that instead, also as a means to transfer
-        // authentication information to Auth plugins that wish to intercept the request later
-        httpClientRequestContext.setUserToken(userPrincipal);
-      }
-      final HttpResponse response = httpClient.execute(method, httpClientRequestContext);
-
-      int httpStatus = response.getStatusLine().getStatusCode();
-
-      // Read the contents
-      entity = response.getEntity();
-      String mimeType = null;
-      Charset charset = null;
-      String charsetName = null;
-
-      ContentType contentType = ContentType.get(entity);
-      if (contentType != null) {
-        mimeType = contentType.getMimeType().trim().toLowerCase(Locale.ROOT);
-        charset = contentType.getCharset();
-
-        if (charset != null) {
-          charsetName = charset.name();
-        }
-      }
-
-      // handle some http level checks before trying to parse the response
-      switch (httpStatus) {
-        case HttpStatus.SC_OK:
-        case HttpStatus.SC_BAD_REQUEST:
-        case HttpStatus.SC_CONFLICT: // 409
-          break;
-        case HttpStatus.SC_MOVED_PERMANENTLY:
-        case HttpStatus.SC_MOVED_TEMPORARILY:
-          if (!followRedirects) {
-            throw new SolrServerException(
-                "Server at " + getBaseURL() + " sent back a redirect (" + httpStatus + ").");
-          }
-          break;
-        default:
-          if (processor == null || contentType == null) {
-            throw new RemoteSolrException(
-                baseUrl,
-                httpStatus,
-                "non ok status: "
-                    + httpStatus
-                    + ", message:"
-                    + response.getStatusLine().getReasonPhrase(),
-                null);
-          }
-      }
-
-      InputStream respBody =
-          (entity == null ? new ByteArrayInputStream(new byte[0]) : entity.getContent());
-      if (processor == null || processor instanceof InputStreamResponseParser) {
-        // no processor specified, return raw stream
-        final var rsp =
-            InputStreamResponseParser.createInputStreamNamedList(
-                response.getStatusLine().getStatusCode(), respBody);
-        rsp.add("closeableResponse", response);
-        // Only case where stream should not be closed
-        shouldClose = false;
-        return rsp;
-      }
-
-      final Collection<String> processorSupportedContentTypes = processor.getContentTypes();
-      if (!processorSupportedContentTypes.isEmpty()) {
-        final Collection<String> processorMimeTypes =
-            processorSupportedContentTypes.stream()
-                .map(ct -> ContentType.parse(ct).getMimeType().trim().toLowerCase(Locale.ROOT))
-                .collect(Collectors.toSet());
-        if (!processorMimeTypes.contains(mimeType)) {
-          if (isUnmatchedErrorCode(mimeType, httpStatus)) {
-            throw new RemoteSolrException(
-                baseUrl,
-                httpStatus,
-                "non ok status: "
-                    + httpStatus
-                    + ", message:"
-                    + response.getStatusLine().getReasonPhrase(),
-                null);
-          }
-
-          // unexpected mime type
-          final String combinedMimeTypes = String.join(", ", processorMimeTypes);
-          String prefix =
-              "Expected mime type in [" + combinedMimeTypes + "] but got " + mimeType + ". ";
-          Charset exceptionCharset = charset != null ? charset : FALLBACK_CHARSET;
-          try {
-            ByteArrayOutputStream body = new ByteArrayOutputStream();
-            respBody.transferTo(body);
-            throw new RemoteSolrException(
-                baseUrl, httpStatus, prefix + body.toString(exceptionCharset), null);
-          } catch (IOException e) {
-            throw new RemoteSolrException(
-                baseUrl,
-                httpStatus,
-                "Could not parse response with encoding " + exceptionCharset,
-                e);
-          }
-        }
-      }
-
-      NamedList<Object> rsp = null;
-      try {
-        rsp = processor.processResponse(respBody, charsetName);
-      } catch (Exception e) {
-        throw new RemoteSolrException(baseUrl, httpStatus, e.getMessage(), e);
-      }
-      Object error = rsp == null ? null : rsp.get("error");
-      if (error != null && isV2Api) {
-        throw new RemoteSolrException(baseUrl, httpStatus, error, true);
-      }
-      if (httpStatus != 200 && !isV2Api) {
-        if (error == null) {
-          StringBuilder msg = new StringBuilder();
-          msg.append(response.getStatusLine().getReasonPhrase())
-              .append("\n\n")
-              .append("request: ")
-              .append(method.getURI());
-          String reason = URLDecoder.decode(msg.toString(), FALLBACK_CHARSET);
-          throw new RemoteSolrException(baseUrl, httpStatus, reason, null);
-        } else {
-          throw new RemoteSolrException(baseUrl, httpStatus, error);
-        }
-      }
-      return rsp;
-    } catch (ConnectException e) {
-      throw new SolrServerException("Server refused connection at: " + getBaseURL(), e);
-    } catch (SocketTimeoutException e) {
-      throw new SolrServerException(
-          "Timeout occurred while waiting response from server at: " + getBaseURL(), e);
-    } catch (IOException e) {
-      throw new SolrServerException(
-          "IOException occurred when talking to server at: " + getBaseURL(), e);
-    } finally {
-      if (shouldClose) {
-        HttpClientUtil.consumeFully(entity);
-      }
-    }
-  }
-
-  // When raising an error using HTTP sendError, mime types can be mismatched. This is specifically
-  // true when SolrServlet uses the sendError mechanism since the expected MIME type of
-  // response is not HTML but HTTP sendError generates an HTML output, which can lead to mismatch
-  private boolean isUnmatchedErrorCode(String mimeType, int httpStatus) {
-    if (mimeType == null) {
-      return false;
-    }
-
-    if (mimeType.equalsIgnoreCase("text/html")
-        && UNMATCHED_ACCEPTED_ERROR_CODES.contains(httpStatus)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  private Header[] buildRequestSpecificHeaders(final SolrRequest<?> request) {
-    Header[] contextHeaders = new Header[2];
-
-    // TODO: validate request context here: https://issues.apache.org/jira/browse/SOLR-14720
-    contextHeaders[0] =
-        new BasicHeader(CommonParams.SOLR_REQUEST_CONTEXT_PARAM, getContext().toString());
-
-    contextHeaders[1] =
-        new BasicHeader(CommonParams.SOLR_REQUEST_TYPE_PARAM, request.getRequestType().toString());
-
-    return contextHeaders;
-  }
-
-  private void populateHeaders(HttpMessage message, Header[] contextHeaders) {
-    message.addHeader(contextHeaders[0]);
-    message.addHeader(contextHeaders[1]);
-  }
-
-  // -------------------------------------------------------------------
-  // -------------------------------------------------------------------
-
-  /**
-   * Retrieve the default list of parameters are added to every request regardless.
-   *
-   * @see #invariantParams
-   */
-  public ModifiableSolrParams getInvariantParams() {
-    return invariantParams;
-  }
-
-  /** Typically looks like {@code http://localhost:8983/solr} (no core or collection) */
-  public String getBaseURL() {
-    return baseUrl;
-  }
-
-  public ResponseParser getParser() {
-    return parser;
-  }
-
-  /** Return the HttpClient this instance uses. */
-  public HttpClient getHttpClient() {
-    return httpClient;
-  }
-
-  /** Close the {@link HttpClientConnectionManager} from the internal client. */
-  @Override
-  public void close() throws IOException {
-    if (httpClient != null && internalClient) {
-      HttpClientUtil.close(httpClient);
-    }
-  }
-
-  public boolean isUseMultiPartPost() {
-    return useMultiPartPost;
-  }
-
-  /**
-   * Constructs {@link HttpSolrClient} instances from provided configuration.
-   *
-   * @deprecated Please use {@link HttpJettySolrClient}
-   */
-  @Deprecated(since = "9.0")
-  public static class Builder extends SolrClientBuilder<Builder> {
-    protected String baseSolrUrl;
-    protected boolean compression;
-    protected ModifiableSolrParams invariantParams = new ModifiableSolrParams();
-
-    public Builder() {
-      this.responseParser = new JavaBinResponseParser();
-    }
-
-    /**
-     * Specify the base-url for the created client to use when sending requests to Solr.
-     *
-     * <p>The provided URL must point to the root Solr path ("/solr"), for example:
-     *
-     * <pre>
-     *   SolrClient client = new HttpSolrClient.Builder()
-     *       .withBaseSolrUrl("http://my-solr-server:8983/solr")
-     *       .withDefaultCollection("core1")
-     *       .build();
-     *   QueryResponse resp = client.query(new SolrQuery("*:*"));
-     * </pre>
-     */
-    public Builder withBaseSolrUrl(String baseSolrUrl) {
-      this.baseSolrUrl = baseSolrUrl;
-      return this;
-    }
-
-    /**
-     * Initialize a Builder object, based on the provided Solr URL.
-     *
-     * <p>The provided URL must point to the root Solr path ("/solr"), for example:
-     *
-     * <pre>
-     *   SolrClient client = new HttpSolrClient.Builder("http://my-solr-server:8983/solr")
-     *       .withDefaultCollection("core1")
-     *       .build();
-     *   QueryResponse resp = client.query(new SolrQuery("*:*"));
-     * </pre>
-     *
-     * <p>By default, compression is not enabled on created HttpSolrClient objects. By default,
-     * redirects are not followed in created HttpSolrClient objects. By default, {@link
-     * JavaBinRequestWriter} is used for composing requests. By default, {@link
-     * JavaBinResponseParser} is used for parsing responses.
-     *
-     * @param baseSolrUrl a URL to the root Solr path (i.e. "/solr") that will be targeted by any
-     *     created clients.
-     */
-    public Builder(String baseSolrUrl) {
-      this.baseSolrUrl = baseSolrUrl;
-      this.responseParser = new JavaBinResponseParser();
-    }
-
-    /** Chooses whether created clients use compression by default. */
-    public Builder allowCompression(boolean compression) {
-      this.compression = compression;
-      return this;
-    }
-
-    /**
-     * Adds to the set of params that the created client will add on all requests
-     *
-     * @param params a set of parameters to add to the invariant-params list. These params must be
-     *     unique and may not duplicate a param already in the invariant list.
-     */
-    public Builder withInvariantParams(ModifiableSolrParams params) {
-      Objects.requireNonNull(params, "params must be non null!");
-
-      for (String name : params.getParameterNames()) {
-        if (this.invariantParams.get(name) != null) {
-          throw new IllegalStateException("parameter " + name + " is redefined.");
-        }
-      }
-
-      this.invariantParams.add(params);
-      return this;
-    }
-
-    /** Create a {@link HttpSolrClient} based on provided configuration. */
-    public HttpSolrClient build() {
-      if (baseSolrUrl == null) {
-        throw new IllegalArgumentException(
-            "Cannot create HttpSolrClient without a valid baseSolrUrl!");
-      }
-
-      return new HttpSolrClient(this);
-    }
-
-    @Override
-    public Builder getThis() {
-      return this;
-    }
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
deleted file mode 100644
index 8aeab1065cbe..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj.apache;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import org.apache.http.client.HttpClient;
-import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.client.solrj.impl.LBSolrClient;
-import org.apache.solr.client.solrj.response.JavaBinResponseParser;
-import org.apache.solr.common.params.ModifiableSolrParams;
-
-/**
- * LBHttpSolrClient or "LoadBalanced HttpSolrClient" is a load balancing wrapper around {@link
- * HttpSolrClient}. This is useful when you have multiple Solr servers (also called endpoints)
- * and requests need to be Load Balanced among them.
- *
- * <p>Do <b>NOT</b> use this class for indexing in leader/follower scenarios since documents must be
- * sent to the correct leader; no inter-node routing is done.
- *
- * <p>In SolrCloud (leader/replica) scenarios, it is usually better to use {@link CloudSolrClient},
- * but this class may be used for updates because the server will forward them to the appropriate
- * leader.
- *
- * <p>It offers automatic failover when a server goes down, and it detects when the server comes
- * back up.
- *
- * <p>Load balancing is done using a simple round-robin on the list of endpoints. Endpoint URLs are
- * expected to point to the Solr "root" path (i.e. "/solr").
- *
- * <blockquote>
- *
- * <pre>
- * SolrClient lbHttpSolrClient = new LBHttpSolrClient.Builder()
- *     .withBaseEndpoints("http://host1:8080/solr", "http://host2:8080/solr", "http://host3:8080/solr")
- *     .build();
- * </pre>
- *
- * </blockquote>
- *
- * Users who wish to balance traffic across a specific set of replicas or cores may specify each
- * endpoint as a root-URL and core-name pair. For example:
- *
- * <blockquote>
- *
- * <pre>
- * SolrClient lbHttpSolrClient = new LBHttpSolrClient.Builder()
- *     .withCollectionEndpoint("http://host1:8080/solr", "coreA")
- *     .withCollectionEndpoint("http://host2:8080/solr", "coreB")
- *     .withCollectionEndpoint("http://host3:8080/solr", "coreC")
- *     .build();
- * // Or, if you wish to provide all endpoints together:
- * lbHttpSolrClient = new LBHttpSolrClient.Builder()
- *     .withCollectionEndpoints(
- *         new LBSolrClient.Endpoint("http://host1:8080/solr", "coreA"),
- *         new LBSolrClient.Endpoint("http://host2:8080/solr", "coreB"),
- *         new LBSolrClient.Endpoint("http://host3:8080/solr", "coreC"))
- *     .build();
- * </pre>
- *
- * </blockquote>
- *
- * <p>If a request to an endpoint fails by an IOException due to a connection timeout or read
- * timeout then the host is taken off the list of live endpoints and moved to a 'dead endpoint list'
- * and the request is resent to the next live endpoint. This process is continued till it tries all
- * the live endpoints. If at least one endpoint is alive, the request succeeds, and if not it fails.
- *
- * <p>Dead endpoints are periodically healthchecked on a fixed interval controlled by {@link
- * LBHttpSolrClient.Builder#setAliveCheckInterval(int)}. The default is set to one minute.
- *
- * <p><b>When to use this?</b><br>
- * This can be used as a software load balancer when you do not wish to set up an external load
- * balancer. Alternatives to this code are to use a dedicated hardware load balancer or using Apache
- * httpd with mod_proxy_balancer as a load balancer. See <a
- * href="http://en.wikipedia.org/wiki/Load_balancing_(computing)">Load balancing on Wikipedia</a>
- *
- * @since solr 1.4
- * @deprecated Not supporting Apache HttpClient based implementations anymore
- */
-@Deprecated(since = "9.0")
-public class LBHttpSolrClient extends LBSolrClient {
-
-  private final HttpClient httpClient;
-  private final boolean clientIsInternal;
-  private final ConcurrentHashMap<String, HttpSolrClient> urlToClient =
-      new ConcurrentHashMap<>();
-  private final HttpSolrClient.Builder httpSolrClientBuilder;
-  private volatile Set<String> urlParamNames = new HashSet<>();
-
-  final int connectionTimeoutMillis;
-  final int soTimeoutMillis;
-
-  /** The provided httpClient should use a multi-threaded connection manager */
-  protected LBHttpSolrClient(Builder builder) {
-    super(builder.solrEndpoints);
-    this.clientIsInternal = builder.httpClient == null;
-    this.httpSolrClientBuilder = builder.httpSolrClientBuilder;
-    this.httpClient =
-        builder.httpClient == null ? constructClient(builder.solrEndpoints) : builder.httpClient;
-    this.defaultCollection = builder.defaultCollection;
-    if (httpSolrClientBuilder != null && this.defaultCollection != null) {
-      httpSolrClientBuilder.defaultCollection = this.defaultCollection;
-    }
-    this.connectionTimeoutMillis = builder.connectionTimeoutMillis;
-    this.soTimeoutMillis = builder.socketTimeoutMillis;
-    this.parser = builder.responseParser;
-    this.aliveCheckIntervalMillis = builder.aliveCheckInterval;
-    for (Endpoint endpoint : builder.solrEndpoints) {
-      urlToClient.put(endpoint.toString(), makeSolrClient(endpoint));
-    }
-  }
-
-  private HttpClient constructClient(List<Endpoint> solrEndpoints) {
-    ModifiableSolrParams params = new ModifiableSolrParams();
-    if (solrEndpoints != null && solrEndpoints.size() > 1) {
-      // we prefer retrying another server
-      params.set(HttpClientUtil.PROP_USE_RETRY, false);
-    } else {
-      params.set(HttpClientUtil.PROP_USE_RETRY, true);
-    }
-    return HttpClientUtil.createClient(params);
-  }
-
-  protected HttpSolrClient makeSolrClient(Endpoint server) {
-    HttpSolrClient client;
-    if (httpSolrClientBuilder != null) {
-      synchronized (this) {
-        httpSolrClientBuilder
-            .withBaseSolrUrl(server.getBaseUrl())
-            .withDefaultCollection(server.getCore())
-            .withHttpClient(httpClient)
-            .withConnectionTimeout(connectionTimeoutMillis, TimeUnit.MILLISECONDS)
-            .withSocketTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS);
-        if (defaultCollection != null) {
-          httpSolrClientBuilder.withDefaultCollection(defaultCollection);
-        }
-        if (requestWriter != null) {
-          httpSolrClientBuilder.withRequestWriter(requestWriter);
-        }
-        if (urlParamNames != null) {
-          httpSolrClientBuilder.withTheseParamNamesInTheUrl(urlParamNames);
-        }
-        client = httpSolrClientBuilder.build();
-      }
-    } else {
-      final var clientBuilder =
-          new HttpSolrClient.Builder(server.getBaseUrl())
-              .withDefaultCollection(server.getCore())
-              .withHttpClient(httpClient)
-              .withResponseParser(parser)
-              .withConnectionTimeout(connectionTimeoutMillis, TimeUnit.MILLISECONDS)
-              .withSocketTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS);
-      if (defaultCollection != null) {
-        clientBuilder.withDefaultCollection(defaultCollection);
-      }
-      if (requestWriter != null) {
-        clientBuilder.withRequestWriter(requestWriter);
-      }
-      if (urlParamNames != null) {
-        clientBuilder.withTheseParamNamesInTheUrl(urlParamNames);
-      }
-      client = clientBuilder.build();
-    }
-
-    return client;
-  }
-
-  @Override
-  protected SolrClient getClient(Endpoint endpoint) {
-    SolrClient client = urlToClient.get(endpoint.toString());
-    if (client == null) {
-      return makeSolrClient(endpoint);
-    } else {
-      return client;
-    }
-  }
-
-  @Override
-  public synchronized String removeSolrServer(Endpoint server) {
-    urlToClient.remove(server.toString());
-    return super.removeSolrServer(server);
-  }
-
-  @Override
-  public void close() {
-    super.close();
-    if (clientIsInternal) {
-      HttpClientUtil.close(httpClient);
-    }
-  }
-
-  /** Return the HttpClient this instance uses. */
-  public HttpClient getHttpClient() {
-    return httpClient;
-  }
-
-  /** Constructs {@link LBHttpSolrClient} instances from provided configuration. */
-  public static class Builder extends SolrClientBuilder<Builder> {
-
-    public static final int CHECK_INTERVAL = 60 * 1000; // 1 minute between checks
-    protected final List<Endpoint> solrEndpoints;
-    protected HttpSolrClient.Builder httpSolrClientBuilder;
-    private int aliveCheckInterval = CHECK_INTERVAL;
-
-    public Builder() {
-      this.solrEndpoints = new ArrayList<>();
-      this.responseParser = new JavaBinResponseParser();
-    }
-
-    public HttpSolrClient.Builder getHttpSolrClientBuilder() {
-      return httpSolrClientBuilder;
-    }
-
-    /**
-     * Provide a "base" Solr URL to be used when configuring {@link LBHttpSolrClient} instances.
-     *
-     * <p>Method may be called multiple times. All provided values will be used. However, all
-     * endpoints must be of the same type: providing a mix of"base" endpoints via this method and
-     * core/collection endpoints via {@link #withCollectionEndpoint(String, String)} is prohibited.
-     *
-     * <p>Users who use this method to provide base Solr URLs may specify a "default collection" for
-     * their requests using {@link #withDefaultCollection(String)} if they wish to avoid needing to
-     * specify a collection or core on relevant requests.
-     *
-     * @param baseSolrUrl the base URL for a Solr node, in the form "http[s]://hostname:port/solr"
-     */
-    public Builder withBaseEndpoint(String baseSolrUrl) {
-      solrEndpoints.add(new Endpoint(baseSolrUrl));
-      return this;
-    }
-
-    /**
-     * Provide multiple "base" Solr URLs to be used when configuring {@link LBHttpSolrClient}
-     * instances.
-     *
-     * <p>Method may be called multiple times. All provided values will be used. However, all
-     * endpoints must be of the same type: providing a mix of"base" endpoints via this method and
-     * core/collection endpoints via {@link #withCollectionEndpoint(String, String)} is prohibited.
-     *
-     * <p>Users who use this method to provide base Solr URLs may specify a "default collection" for
-     * their requests using {@link #withDefaultCollection(String)} if they wish to avoid needing to
-     * specify a collection or core on relevant requests.
-     *
-     * @param baseSolrUrls Solr base URLs, in the form "http[s]://hostname:port/solr"
-     */
-    public Builder withBaseEndpoints(String... baseSolrUrls) {
-      for (String baseSolrUrl : baseSolrUrls) {
-        solrEndpoints.add(new Endpoint(baseSolrUrl));
-      }
-      return this;
-    }
-
-    /**
-     * Provide a core/collection Solr endpoint to be used when configuring {@link LBHttpSolrClient}
-     * instances.
-     *
-     * <p>Method may be called multiple times. All provided values will be used. However, all
-     * endpoints must be of the same type: providing a mix of "core" endpoints via this method and
-     * base endpoints via {@link #withBaseEndpoint(String)} is prohibited.
-     *
-     * @param baseSolrUrl the base URL for a Solr node, in the form "http[s]://hostname:port/solr"
-     * @param core the Solr core or collection to target
-     */
-    public Builder withCollectionEndpoint(String baseSolrUrl, String core) {
-      solrEndpoints.add(new Endpoint(baseSolrUrl, core));
-      return this;
-    }
-
-    /**
-     * Provide multiple core/collection endpoints to be used when configuring {@link
-     * LBHttpSolrClient} instances.
-     *
-     * <p>Method may be called multiple times. All provided values will be used. However, all
-     * endpoints must be of the same type: providing a mix of "core" endpoints via this method and
-     * base endpoints via {@link #withBaseEndpoint(String)} is prohibited.
-     *
-     * @param endpoints endpoint instances pointing to distinct cores/collections
-     */
-    public Builder withCollectionEndpoints(Endpoint... endpoints) {
-      if (endpoints != null) {
-        for (Endpoint e : endpoints) {
-          solrEndpoints.add(e);
-        }
-      }
-
-      return this;
-    }
-
-    /**
-     * LBHttpSolrServer keeps pinging the dead servers at fixed interval to find if it is alive. Use
-     * this to set that interval
-     *
-     * @param aliveCheckInterval time in milliseconds
-     */
-    public Builder setAliveCheckInterval(int aliveCheckInterval) {
-      if (aliveCheckInterval <= 0) {
-        throw new IllegalArgumentException(
-            "Alive check interval must be " + "positive, specified value = " + aliveCheckInterval);
-      }
-      this.aliveCheckInterval = aliveCheckInterval;
-      return this;
-    }
-
-    /**
-     * Provides a {@link HttpSolrClient.Builder} to be used for building the internally used
-     * clients.
-     */
-    public Builder withHttpSolrClientBuilder(HttpSolrClient.Builder builder) {
-      this.httpSolrClientBuilder = builder;
-      return this;
-    }
-
-    /** Create a {@link LBHttpSolrClient} based on provided configuration. */
-    public LBHttpSolrClient build() {
-      return new LBHttpSolrClient(this);
-    }
-
-    @Override
-    public Builder getThis() {
-      return this;
-    }
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/PreemptiveAuth.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/PreemptiveAuth.java
deleted file mode 100644
index 26d02e20b07d..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/PreemptiveAuth.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.solr.client.solrj.apache;
-
-import java.io.IOException;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.AuthState;
-import org.apache.http.auth.Credentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.protocol.ClientContext;
-import org.apache.http.protocol.HttpContext;
-
-/**
- * This HTTP request interceptor adds HTTP authentication credentials to every outgoing request.
- * This implementation is required since Solr client is not capable of performing non preemptive
- * authentication. By adding the Http authentication credentials to every request, this interceptor
- * enables "preemptive" authentication.
- *
- * @deprecated Please look into using Solr's new Http2 clients
- */
-@Deprecated(since = "9.0")
-public class PreemptiveAuth implements HttpRequestInterceptor {
-  private AuthScheme authScheme = null;
-
-  public PreemptiveAuth(AuthScheme authScheme) {
-    this.authScheme = authScheme;
-  }
-
-  @Override
-  public void process(final HttpRequest request, final HttpContext context)
-      throws HttpException, IOException {
-
-    AuthState authState = (AuthState) context.getAttribute(ClientContext.TARGET_AUTH_STATE);
-    // If no auth scheme available yet, try to initialize it preemptively
-    if (authState.getAuthScheme() == null) {
-      CredentialsProvider credsProvider =
-          (CredentialsProvider) context.getAttribute(ClientContext.CREDS_PROVIDER);
-      Credentials creds = credsProvider.getCredentials(AuthScope.ANY);
-      authState.update(authScheme, creds);
-    }
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java
deleted file mode 100644
index c12bafd88e36..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj.apache;
-
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.Configurable;
-import org.apache.solr.client.solrj.apache.HttpSolrClient.Builder;
-import org.apache.solr.client.solrj.request.RequestWriter;
-import org.apache.solr.client.solrj.response.ResponseParser;
-
-/**
- * @deprecated Please look into using Solr's new Http2 clients
- */
-@Deprecated(since = "9.0")
-public abstract class SolrClientBuilder<B extends SolrClientBuilder<B>> {
-
-  protected int timeToLiveSeconds = 60;
-  protected HttpClient httpClient;
-  protected ResponseParser responseParser;
-  protected RequestWriter requestWriter;
-  protected boolean useMultiPartPost;
-  protected int connectionTimeoutMillis = 15000; // 15 seconds
-  private boolean connectionTimeoutMillisUpdate = false;
-  protected int socketTimeoutMillis = 120000; // 120 seconds
-  private boolean socketTimeoutMillisUpdate = false;
-  protected boolean followRedirects = false;
-  protected String defaultCollection;
-  protected Set<String> urlParamNames;
-
-  /** The solution for the unchecked cast warning. */
-  public abstract B getThis();
-
-  /** Provides a {@link HttpClient} for the builder to use when creating clients. */
-  public B withHttpClient(HttpClient httpClient) {
-    this.httpClient = httpClient;
-
-    if (this.httpClient instanceof Configurable) {
-      RequestConfig conf = ((Configurable) httpClient).getConfig();
-      // only update values that were not already manually changed
-      if (!connectionTimeoutMillisUpdate && conf.getConnectTimeout() > 0) {
-        this.connectionTimeoutMillis = conf.getConnectTimeout();
-      }
-      if (!socketTimeoutMillisUpdate && conf.getSocketTimeout() > 0) {
-        this.socketTimeoutMillis = conf.getSocketTimeout();
-      }
-    }
-    return getThis();
-  }
-
-  /** Provides a {@link ResponseParser} for created clients to use when handling requests. */
-  public B withResponseParser(ResponseParser responseParser) {
-    this.responseParser = responseParser;
-    return getThis();
-  }
-
-  /** Provides a {@link RequestWriter} for created clients to use when handing requests. */
-  public B withRequestWriter(RequestWriter requestWriter) {
-    this.requestWriter = requestWriter;
-    return getThis();
-  }
-
-  /** Enables or disables splitting POST requests into pieces. */
-  public B allowMultiPartPost(Boolean useMultiPartPost) {
-    this.useMultiPartPost = useMultiPartPost;
-    return getThis();
-  }
-
-  /**
-   * Provides a set of keys which the created client will send as a part of the query string.
-   *
-   * @param queryParams set of param keys to only send via the query string Note that the param will
-   *     be sent as a query string if the key is part of this Set or the SolrRequest's query params.
-   */
-  public B withTheseParamNamesInTheUrl(Set<String> queryParams) {
-    this.urlParamNames = queryParams;
-    return getThis();
-  }
-
-  public B withFollowRedirects(boolean followRedirects) {
-    this.followRedirects = followRedirects;
-    return getThis();
-  }
-
-  /** Sets a default for core or collection based requests. */
-  public B withDefaultCollection(String defaultCoreOrCollection) {
-    this.defaultCollection = defaultCoreOrCollection;
-    return getThis();
-  }
-
-  /**
-   * Tells {@link Builder} that created clients should obey the following timeout when connecting to
-   * Solr servers.
-   *
-   * <p>For valid values see {@link org.apache.http.client.config.RequestConfig#getConnectTimeout()}
-   *
-   * @deprecated Please use {@link #withConnectionTimeout(int, TimeUnit)}
-   */
-  @Deprecated(since = "9.2")
-  public B withConnectionTimeout(int connectionTimeoutMillis) {
-    withConnectionTimeout(connectionTimeoutMillis, TimeUnit.MILLISECONDS);
-    return getThis();
-  }
-
-  /**
-   * Tells {@link Builder} that created clients should obey the following timeout when connecting to
-   * Solr servers.
-   *
-   * <p>For valid values see {@link org.apache.http.client.config.RequestConfig#getConnectTimeout()}
-   */
-  public B withConnectionTimeout(int connectionTimeout, TimeUnit unit) {
-    if (connectionTimeout < 0) {
-      throw new IllegalArgumentException("connectionTimeout must be a non-negative integer.");
-    }
-    this.connectionTimeoutMillis =
-        Math.toIntExact(TimeUnit.MILLISECONDS.convert(connectionTimeout, unit));
-    connectionTimeoutMillisUpdate = true;
-    return getThis();
-  }
-
-  public int getConnectionTimeoutMillis() {
-    return this.connectionTimeoutMillis;
-  }
-
-  /**
-   * Tells {@link Builder} that created clients should set the following read timeout on all
-   * sockets.
-   *
-   * <p>For valid values see {@link org.apache.http.client.config.RequestConfig#getSocketTimeout()}
-   *
-   * <p>* @deprecated Please use {@link #withSocketTimeout(int, TimeUnit)}
-   */
-  @Deprecated(since = "9.2")
-  public B withSocketTimeout(int socketTimeoutMillis) {
-    withSocketTimeout(socketTimeoutMillis, TimeUnit.MILLISECONDS);
-    return getThis();
-  }
-
-  /**
-   * Tells {@link Builder} that created clients should set the following read timeout on all
-   * sockets.
-   *
-   * <p>For valid values see {@link org.apache.http.client.config.RequestConfig#getSocketTimeout()}
-   */
-  public B withSocketTimeout(int socketTimeout, TimeUnit unit) {
-    if (socketTimeout < 0) {
-      throw new IllegalArgumentException("socketTimeout must be a non-negative integer.");
-    }
-    this.socketTimeoutMillis = Math.toIntExact(TimeUnit.MILLISECONDS.convert(socketTimeout, unit));
-    socketTimeoutMillisUpdate = true;
-    return getThis();
-  }
-
-  public int getSocketTimeoutMillis() {
-    return this.socketTimeoutMillis;
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientBuilder.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientBuilder.java
deleted file mode 100644
index 6139c8d19b8b..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientBuilder.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj.apache;
-
-import org.apache.http.auth.AuthSchemeProvider;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.config.Lookup;
-import org.apache.http.cookie.CookieSpecProvider;
-
-/**
- * Builder class for configuring internal HttpClients. This relies on the internal HttpClient
- * implementation and is subject to change.
- *
- * @lucene.experimental
- * @deprecated Please look into using Solr's new Http2 clients
- */
-@Deprecated(since = "9.0")
-public class SolrHttpClientBuilder {
-  public static SolrHttpClientBuilder create() {
-    return new SolrHttpClientBuilder();
-  }
-
-  public interface CredentialsProviderProvider {
-    CredentialsProvider getCredentialsProvider();
-  }
-
-  public interface AuthSchemeRegistryProvider {
-    Lookup<AuthSchemeProvider> getAuthSchemeRegistry();
-  }
-
-  public interface CookieSpecRegistryProvider {
-    Lookup<CookieSpecProvider> getCookieSpecRegistry();
-  }
-
-  private CookieSpecRegistryProvider cookieSpecRegistryProvider;
-  private AuthSchemeRegistryProvider authSchemeRegistryProvider;
-  private CredentialsProviderProvider credentialsProviderProvider;
-
-  protected SolrHttpClientBuilder() {
-    super();
-  }
-
-  public final SolrHttpClientBuilder setCookieSpecRegistryProvider(
-      final CookieSpecRegistryProvider cookieSpecRegistryProvider) {
-    this.cookieSpecRegistryProvider = cookieSpecRegistryProvider;
-    return this;
-  }
-
-  public final SolrHttpClientBuilder setDefaultCredentialsProvider(
-      final CredentialsProviderProvider credentialsProviderProvider) {
-    this.credentialsProviderProvider = credentialsProviderProvider;
-    return this;
-  }
-
-  public final SolrHttpClientBuilder setAuthSchemeRegistryProvider(
-      final AuthSchemeRegistryProvider authSchemeRegistryProvider) {
-    this.authSchemeRegistryProvider = authSchemeRegistryProvider;
-    return this;
-  }
-
-  public AuthSchemeRegistryProvider getAuthSchemeRegistryProvider() {
-    return authSchemeRegistryProvider;
-  }
-
-  public CookieSpecRegistryProvider getCookieSpecRegistryProvider() {
-    return cookieSpecRegistryProvider;
-  }
-
-  public CredentialsProviderProvider getCredentialsProviderProvider() {
-    return credentialsProviderProvider;
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientContextBuilder.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientContextBuilder.java
deleted file mode 100644
index 5f50d309cc38..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpClientContextBuilder.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj.apache;
-
-import org.apache.http.auth.AuthSchemeProvider;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.config.Lookup;
-import org.apache.http.cookie.CookieSpecProvider;
-
-/**
- * @deprecated Please look into using Solr's new Http2 clients
- */
-@Deprecated(since = "9.0")
-public class SolrHttpClientContextBuilder {
-  public static SolrHttpClientContextBuilder create() {
-    return new SolrHttpClientContextBuilder();
-  }
-
-  public abstract static class CredentialsProviderProvider {
-    public abstract CredentialsProvider getCredentialsProvider();
-  }
-
-  public abstract static class AuthSchemeRegistryProvider {
-    public abstract Lookup<AuthSchemeProvider> getAuthSchemeRegistry();
-  }
-
-  public abstract static class CookieSpecRegistryProvider {
-    public abstract Lookup<CookieSpecProvider> getCookieSpecRegistry();
-  }
-
-  private CookieSpecRegistryProvider cookieSpecRegistryProvider;
-  private AuthSchemeRegistryProvider authSchemeRegistryProvider;
-  private CredentialsProviderProvider credentialsProviderProvider;
-
-  public SolrHttpClientContextBuilder() {
-    super();
-  }
-
-  public final SolrHttpClientContextBuilder setCookieSpecRegistryProvider(
-      final CookieSpecRegistryProvider cookieSpecRegistryProvider) {
-    this.cookieSpecRegistryProvider = cookieSpecRegistryProvider;
-    return this;
-  }
-
-  public final SolrHttpClientContextBuilder setDefaultCredentialsProvider(
-      final CredentialsProviderProvider credentialsProviderProvider) {
-    this.credentialsProviderProvider = credentialsProviderProvider;
-    return this;
-  }
-
-  public final SolrHttpClientContextBuilder setAuthSchemeRegistryProvider(
-      final AuthSchemeRegistryProvider authSchemeRegistryProvider) {
-    this.authSchemeRegistryProvider = authSchemeRegistryProvider;
-    return this;
-  }
-
-  public AuthSchemeRegistryProvider getAuthSchemeRegistryProvider() {
-    return authSchemeRegistryProvider;
-  }
-
-  public CookieSpecRegistryProvider getCookieSpecRegistryProvider() {
-    return cookieSpecRegistryProvider;
-  }
-
-  public CredentialsProviderProvider getCredentialsProviderProvider() {
-    return credentialsProviderProvider;
-  }
-
-  public HttpClientContext createContext(Object userToken) {
-    HttpClientContext context = new HttpClientContext();
-    if (getCredentialsProviderProvider() != null) {
-      context.setCredentialsProvider(getCredentialsProviderProvider().getCredentialsProvider());
-    }
-    if (getAuthSchemeRegistryProvider() != null) {
-      context.setAuthSchemeRegistry(getAuthSchemeRegistryProvider().getAuthSchemeRegistry());
-    }
-
-    if (getCookieSpecRegistryProvider() != null) {
-      context.setCookieSpecRegistry(getCookieSpecRegistryProvider().getCookieSpecRegistry());
-    }
-
-    context.setUserToken(userToken);
-
-    return context;
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpRequestRetryHandler.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpRequestRetryHandler.java
deleted file mode 100644
index b3bb70a014ca..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrHttpRequestRetryHandler.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj.apache;
-
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.lang.invoke.MethodHandles;
-import java.net.ConnectException;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import javax.net.ssl.SSLException;
-import org.apache.http.HttpRequest;
-import org.apache.http.client.HttpRequestRetryHandler;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.RequestWrapper;
-import org.apache.http.protocol.HttpContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @deprecated Please look into using Solr's new Http2 clients
- */
-@Deprecated(since = "9.0")
-public class SolrHttpRequestRetryHandler implements HttpRequestRetryHandler {
-
-  private static final String GET = "GET";
-
-  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-  public static final SolrHttpRequestRetryHandler INSTANCE = new SolrHttpRequestRetryHandler();
-
-  /** the number of times a method will be retried */
-  private final int retryCount;
-
-  private final Set<Class<? extends IOException>> nonRetryableClasses;
-
-  /**
-   * Create the request retry handler using the specified IOException classes
-   *
-   * @param retryCount how many times to retry; 0 means no retries true if it's OK to retry requests
-   *     that have been sent
-   * @param clazzes the IOException types that should not be retried
-   */
-  protected SolrHttpRequestRetryHandler(
-      final int retryCount, final Collection<Class<? extends IOException>> clazzes) {
-    super();
-    this.retryCount = retryCount;
-    this.nonRetryableClasses = new HashSet<>();
-    for (final Class<? extends IOException> clazz : clazzes) {
-      this.nonRetryableClasses.add(clazz);
-    }
-  }
-
-  /**
-   * Create the request retry handler using the following list of non-retryable IOException classes:
-   * <br>
-   *
-   * <ul>
-   *   <li>InterruptedIOException
-   *   <li>UnknownHostException
-   *   <li>ConnectException
-   *   <li>SSLException
-   * </ul>
-   *
-   * @param retryCount how many times to retry; 0 means no retries true if it's OK to retry
-   *     non-idempotent requests that have been sent
-   */
-  public SolrHttpRequestRetryHandler(final int retryCount) {
-    this(
-        retryCount,
-        Arrays.asList(
-            InterruptedIOException.class,
-            UnknownHostException.class,
-            ConnectException.class,
-            SSLException.class));
-  }
-
-  /**
-   * Create the request retry handler with a retry count of 3, requestSentRetryEnabled false and
-   * using the following list of non-retryable IOException classes: <br>
-   *
-   * <ul>
-   *   <li>InterruptedIOException
-   *   <li>UnknownHostException
-   *   <li>ConnectException
-   *   <li>SSLException
-   * </ul>
-   */
-  public SolrHttpRequestRetryHandler() {
-    this(3);
-  }
-
-  @Override
-  public boolean retryRequest(
-      final IOException exception, final int executionCount, final HttpContext context) {
-    log.debug("Retry http request {} out of {}", executionCount, this.retryCount);
-    if (executionCount > this.retryCount) {
-      log.debug("Do not retry, over max retry count");
-      return false;
-    }
-
-    if (!isRetryable(exception)) {
-      if (log.isDebugEnabled()) {
-        log.debug("Do not retry, non retryable class {}", exception.getClass().getName());
-      }
-      return false;
-    }
-
-    final HttpClientContext clientContext = HttpClientContext.adapt(context);
-    final HttpRequest request = clientContext.getRequest();
-
-    if (requestIsAborted(request)) {
-      log.debug("Do not retry, request was aborted");
-      return false;
-    }
-
-    if (handleAsIdempotent(clientContext)) {
-      log.debug("Retry, request should be idempotent");
-      return true;
-    }
-
-    log.debug("Do not retry, no allow rules matched");
-    return false;
-  }
-
-  private boolean isRetryable(IOException exception) {
-    // Workaround for "recv failed" issue on hard-aborted sockets on Windows
-    // (and other operating systems, possibly).
-    // https://issues.apache.org/jira/browse/SOLR-13778
-    if (exception instanceof SSLException
-        && Arrays.stream(exception.getSuppressed()).anyMatch((t) -> t instanceof SocketException)) {
-      return true;
-    }
-
-    // Fast check for exact class followed by slow-check with instanceof.
-    if (nonRetryableClasses.contains(exception.getClass())
-        || nonRetryableClasses.stream()
-            .anyMatch(rejectException -> rejectException.isInstance(exception))) {
-      return false;
-    }
-
-    return true;
-  }
-
-  public int getRetryCount() {
-    return retryCount;
-  }
-
-  protected boolean handleAsIdempotent(final HttpClientContext context) {
-    String method = context.getRequest().getRequestLine().getMethod();
-    // do not retry admin requests, even if they are GET requests as they are not idempotent
-    if (context.getRequest().getRequestLine().getUri().startsWith("/admin/")) {
-      log.debug("Do not retry, this is an admin request");
-      return false;
-    }
-    return method.equals(GET);
-  }
-
-  protected boolean requestIsAborted(final HttpRequest request) {
-    HttpRequest req = request;
-    if (request instanceof RequestWrapper) { // does not forward request to original
-      req = ((RequestWrapper) request).getOriginal();
-    }
-    return (req instanceof HttpUriRequest && ((HttpUriRequest) req).isAborted());
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.java
deleted file mode 100644
index aadcf2ad9ac3..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrPortAwareCookieSpecFactory.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj.apache;
-
-import java.util.Collection;
-import org.apache.http.cookie.ClientCookie;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.CookieSpec;
-import org.apache.http.cookie.CookieSpecFactory;
-import org.apache.http.cookie.CookieSpecProvider;
-import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.cookie.params.CookieSpecPNames;
-import org.apache.http.impl.cookie.NetscapeDomainHandler;
-import org.apache.http.impl.cookie.NetscapeDraftSpec;
-import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.HttpContext;
-
-@SuppressWarnings("deprecation")
-@Deprecated
-public class SolrPortAwareCookieSpecFactory implements CookieSpecFactory, CookieSpecProvider {
-  public static final String POLICY_NAME = "solr-portaware";
-  private final CookieSpec cookieSpec;
-
-  public SolrPortAwareCookieSpecFactory(final String[] datepatterns) {
-    super();
-    this.cookieSpec = new PortAwareCookieSpec(datepatterns);
-  }
-
-  public SolrPortAwareCookieSpecFactory() {
-    this(null);
-  }
-
-  @Override
-  public CookieSpec newInstance(final HttpParams params) {
-    if (params != null) {
-      String[] patterns = null;
-      final Collection<?> param =
-          (Collection<?>) params.getParameter(CookieSpecPNames.DATE_PATTERNS);
-      if (param != null) {
-        patterns = new String[param.size()];
-        patterns = param.toArray(patterns);
-      }
-      return new PortAwareCookieSpec(patterns);
-    } else {
-      return new PortAwareCookieSpec(null);
-    }
-  }
-
-  @Override
-  public CookieSpec create(final HttpContext context) {
-    return this.cookieSpec;
-  }
-
-  public static class PortAwareCookieSpec extends NetscapeDraftSpec {
-    public PortAwareCookieSpec(String patterns[]) {
-      super(patterns);
-      super.registerAttribHandler(ClientCookie.DOMAIN_ATTR, new PortAwareDomainHandler());
-    }
-
-    public PortAwareCookieSpec() {
-      this(null);
-    }
-  }
-
-  /**
-   * A domain handler to validate and match cookies based on the domain and origin. The domain is
-   * tested against host and port both, and if it doesn't match, it delegates the handling to the
-   * base class' matching/validation logic.
-   */
-  public static class PortAwareDomainHandler extends NetscapeDomainHandler {
-
-    @Override
-    public void validate(final Cookie cookie, final CookieOrigin origin)
-        throws MalformedCookieException {
-      if (origin != null && origin.getHost() != null && cookie != null) {
-        String hostPort = origin.getHost() + ":" + origin.getPort();
-        String domain = cookie.getDomain();
-
-        if (hostPort.equals(domain)) {
-          return;
-        }
-      }
-      super.validate(cookie, origin);
-    }
-
-    @Override
-    public boolean match(final Cookie cookie, final CookieOrigin origin) {
-      if (origin != null && origin.getHost() != null && cookie != null) {
-        String hostPort = origin.getHost() + ":" + origin.getPort();
-        String domain = cookie.getDomain();
-        if (hostPort.equals(domain)) {
-          return true;
-        }
-      }
-      return super.match(cookie, origin);
-    }
-  }
-}
diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java
deleted file mode 100644
index 31cd26e17ead..000000000000
--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** Apache HttpClient based {@link org.apache.solr.client.solrj.SolrClient} implementations */
-@Deprecated
-package org.apache.solr.client.solrj.apache;

From 1c46d684df41cb457c7a6bbdf11e6e10ba4f9676 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 19 May 2026 09:16:01 -0400
Subject: [PATCH 22/27] Drop dependencies

---
 solr/api/gradle.lockfile                     |  43 +-
 solr/benchmark/gradle.lockfile               |  43 +-
 solr/core/build.gradle                       |   1 -
 solr/core/gradle.lockfile                    |  43 +-
 solr/cross-dc-manager/gradle.lockfile        |  43 +-
 solr/licenses/httpclient-LICENSE-ASL.txt     |   4 +-
 solr/licenses/httpclient-NOTICE.txt          |   2 +-
 solr/licenses/httpcore-LICENSE-ASL.txt       |   4 +-
 solr/licenses/httpcore-NOTICE.txt            |   2 +-
 solr/licenses/httpmime-4.5.14.jar.sha1       |   1 -
 solr/licenses/httpmime-LICENSE-ASL.txt       | 182 --------
 solr/licenses/httpmime-NOTICE.txt            |   8 -
 solr/modules/analysis-extras/gradle.lockfile |  43 +-
 solr/modules/clustering/gradle.lockfile      |  43 +-
 solr/modules/cross-dc/gradle.lockfile        |  43 +-
 solr/modules/cuvs/gradle.lockfile            |  43 +-
 solr/modules/extraction/gradle.lockfile      |  43 +-
 solr/modules/gcs-repository/gradle.lockfile  |  41 +-
 solr/modules/jwt-auth/gradle.lockfile        |  43 +-
 solr/modules/langid/gradle.lockfile          |  43 +-
 solr/modules/language-models/gradle.lockfile |  43 +-
 solr/modules/ltr/gradle.lockfile             |  43 +-
 solr/modules/opentelemetry/gradle.lockfile   |  43 +-
 solr/modules/s3-repository/gradle.lockfile   |  41 +-
 solr/modules/scripting/gradle.lockfile       |  43 +-
 solr/modules/sql/gradle.lockfile             |  43 +-
 solr/server/gradle.lockfile                  |  40 +-
 solr/solr-ref-guide/gradle.lockfile          |  43 +-
 solr/solrj-jetty/gradle.lockfile             |  43 +-
 solr/solrj-streaming/build.gradle            |   1 +
 solr/solrj-streaming/gradle.lockfile         |  43 +-
 solr/solrj-zookeeper/gradle.lockfile         |  43 +-
 solr/solrj/gradle.lockfile                   |  43 +-
 solr/test-framework/build.gradle             |   7 -
 solr/test-framework/gradle.lockfile          |  45 +-
 solr/ui/gradle.lockfile                      | 444 -------------------
 solr/webapp/gradle.lockfile                  |  40 +-
 37 files changed, 528 insertions(+), 1238 deletions(-)
 delete mode 100644 solr/licenses/httpmime-4.5.14.jar.sha1
 delete mode 100644 solr/licenses/httpmime-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/httpmime-NOTICE.txt
 delete mode 100644 solr/ui/gradle.lockfile

diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile
index b3671bdd38a7..1e43f423567f 100644
--- a/solr/api/gradle.lockfile
+++ b/solr/api/gradle.lockfile
@@ -15,22 +15,22 @@ com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.21.2=swagger
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,swaggerBuild,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath
 com.sun.activation:jakarta.activation:2.0.1=swaggerBuild
@@ -40,8 +40,8 @@ commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
 io.github.classgraph:classgraph:4.8.165=swaggerBuild
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -84,7 +84,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspa
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=swaggerBuild
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspath
@@ -93,9 +93,6 @@ 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=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.25.3=jarValidation,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,testRuntimeClasspath
 org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=jarValidation,testRuntimeClasspath
@@ -158,7 +155,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,testRun
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,swaggerBuild,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,swaggerBuild,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -167,7 +164,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile
index 17d788a364b5..cb5139a1f2b7 100644
--- a/solr/benchmark/gradle.lockfile
+++ b/solr/benchmark/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,testRuntimeClasspa
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -73,7 +73,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,testRun
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.sf.jopt-simple:jopt-simple:5.0.4=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -83,9 +83,6 @@ org.apache.commons:commons-math3:3.6.1=annotationProcessor,compileClasspath,jarV
 org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.curator:curator-test:5.9.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -149,7 +146,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,testRuntime
 org.hamcrest:hamcrest:3.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.jctools:jctools-core:4.0.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -160,7 +157,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,runtimeClasspath,testRuntimeClassp
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.quicktheories:quicktheories:0.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,testRuntimeClasspath
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 5d801a99ece8..e5f0d3034dac 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -200,7 +200,6 @@ dependencies {
   testRuntimeOnly(libs.mockito.subclass, {
     exclude group: "net.bytebuddy", module: "byte-buddy-agent"
   })
-  testImplementation libs.apache.httpcomponents.httpclient
 
   testImplementation libs.opentelemetry.sdk.testing
 }
diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile
index 7267ab45b84a..bab7c3ef1f42 100644
--- a/solr/core/gradle.lockfile
+++ b/solr/core/gradle.lockfile
@@ -12,24 +12,24 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=compileClasspat
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyHelper,compileOnlyHelperTest,testCompileClasspath
 com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,compileOnlyHelper,jarValidation
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.ibm.icu:icu4j:77.1=jarValidation,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -39,8 +39,8 @@ commons-cli:commons-cli:1.11.0=compileClasspath,jarValidation,runtimeClasspath,r
 commons-codec:commons-codec:1.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -80,7 +80,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=compileClasspath,jarValidation,r
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -90,9 +90,6 @@ 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=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.25.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -168,7 +165,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=compileClasspath,jarV
 org.glassfish.jersey:jersey-bom:4.0.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.junit:junit-bom:5.14.0=compileOnlyHelper,compileOnlyHelperTest
@@ -185,7 +182,7 @@ org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,testCompileClassp
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile
index 1a4c1b3845e1..cf53d1708205 100644
--- a/solr/cross-dc-manager/gradle.lockfile
+++ b/solr/cross-dc-manager/gradle.lockfile
@@ -15,27 +15,27 @@ com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=j
 com.fasterxml.jackson.module:jackson-module-scala_2.13:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.github.luben:zstd-jni:1.5.6-4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.google.android:annotations:4.1.1.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 com.google.api.grpc:proto-google-common-protos:2.63.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
 com.google.code.gson:gson:2.13.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java-util:3.25.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -55,8 +55,8 @@ commons-digester:commons-digester:2.1=jarValidation,runtimeClasspath,runtimeLibs
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 commons-validator:commons-validator:1.10.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:4.1.12.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.grpc:grpc-api:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.grpc:grpc-context:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.grpc:grpc-core:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -116,7 +116,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,jarValidation,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy-agent:1.18.8-jdk5=jarValidation,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testRuntimeClasspath
@@ -129,9 +129,6 @@ 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,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.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-group-coordinator-api:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.apache.kafka:kafka-group-coordinator:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -219,7 +216,7 @@ org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspat
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:2.2.21=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -230,7 +227,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
+org.pcollections:pcollections:4.0.1=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
 org.rocksdb:rocksdbjni:7.9.2=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 org.scala-lang.modules:scala-collection-compat_2.13:2.10.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.scala-lang.modules:scala-java8-compat_2.13:1.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
diff --git a/solr/licenses/httpclient-LICENSE-ASL.txt b/solr/licenses/httpclient-LICENSE-ASL.txt
index 2c41ec88f61c..cba62b38a7c8 100644
--- a/solr/licenses/httpclient-LICENSE-ASL.txt
+++ b/solr/licenses/httpclient-LICENSE-ASL.txt
@@ -174,9 +174,9 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-   
+
 This project contains annotations derived from JCIP-ANNOTATIONS
 Copyright (c) 2005 Brian Goetz and Tim Peierls.
-See http://www.jcip.net and the Creative Commons Attribution License 
+See http://www.jcip.net and the Creative Commons Attribution License
 (http://creativecommons.org/licenses/by/2.5)
 
diff --git a/solr/licenses/httpclient-NOTICE.txt b/solr/licenses/httpclient-NOTICE.txt
index 3a98f4542f51..4b40ea05719f 100644
--- a/solr/licenses/httpclient-NOTICE.txt
+++ b/solr/licenses/httpclient-NOTICE.txt
@@ -5,4 +5,4 @@ This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
 This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
\ No newline at end of file
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
diff --git a/solr/licenses/httpcore-LICENSE-ASL.txt b/solr/licenses/httpcore-LICENSE-ASL.txt
index 2c41ec88f61c..cba62b38a7c8 100644
--- a/solr/licenses/httpcore-LICENSE-ASL.txt
+++ b/solr/licenses/httpcore-LICENSE-ASL.txt
@@ -174,9 +174,9 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-   
+
 This project contains annotations derived from JCIP-ANNOTATIONS
 Copyright (c) 2005 Brian Goetz and Tim Peierls.
-See http://www.jcip.net and the Creative Commons Attribution License 
+See http://www.jcip.net and the Creative Commons Attribution License
 (http://creativecommons.org/licenses/by/2.5)
 
diff --git a/solr/licenses/httpcore-NOTICE.txt b/solr/licenses/httpcore-NOTICE.txt
index 3a98f4542f51..4b40ea05719f 100644
--- a/solr/licenses/httpcore-NOTICE.txt
+++ b/solr/licenses/httpcore-NOTICE.txt
@@ -5,4 +5,4 @@ This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
 This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
\ No newline at end of file
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
diff --git a/solr/licenses/httpmime-4.5.14.jar.sha1 b/solr/licenses/httpmime-4.5.14.jar.sha1
deleted file mode 100644
index 3c37fe334ef5..000000000000
--- a/solr/licenses/httpmime-4.5.14.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6662758a1f1cb1149cf916bdac28332e0902ec44
diff --git a/solr/licenses/httpmime-LICENSE-ASL.txt b/solr/licenses/httpmime-LICENSE-ASL.txt
deleted file mode 100644
index 2c41ec88f61c..000000000000
--- a/solr/licenses/httpmime-LICENSE-ASL.txt
+++ /dev/null
@@ -1,182 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-   
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls.
-See http://www.jcip.net and the Creative Commons Attribution License 
-(http://creativecommons.org/licenses/by/2.5)
-
diff --git a/solr/licenses/httpmime-NOTICE.txt b/solr/licenses/httpmime-NOTICE.txt
deleted file mode 100644
index 3a98f4542f51..000000000000
--- a/solr/licenses/httpmime-NOTICE.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache HttpComponents Client
-Copyright 1999-2011 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
\ No newline at end of file
diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile
index 959fe0e15429..62dee8652b7c 100644
--- a/solr/modules/analysis-extras/gradle.lockfile
+++ b/solr/modules/analysis-extras/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=apiHelper,jarVa
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.ibm.icu:icu4j:77.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -37,8 +37,8 @@ commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeL
 commons-codec:commons-codec:1.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -75,7 +75,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,jarValidation,runtimeClasspa
 jakarta.validation:jakarta.validation-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -85,9 +85,6 @@ 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=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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -163,7 +160,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=apiHelper,jarValidati
 org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -175,7 +172,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile
index 793882edea38..af716411716f 100644
--- a/solr/modules/clustering/gradle.lockfile
+++ b/solr/modules/clustering/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -73,7 +73,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -82,9 +82,6 @@ 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,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -151,7 +148,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -160,7 +157,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile
index 52fe93a58be2..44e89451356d 100644
--- a/solr/modules/cross-dc/gradle.lockfile
+++ b/solr/modules/cross-dc/gradle.lockfile
@@ -12,23 +12,23 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=apiHelper,jarVa
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.github.luben:zstd-jni:1.5.6-4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -37,8 +37,8 @@ commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeL
 commons-codec:commons-codec:1.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -75,7 +75,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,jarValidation,runtimeClasspa
 jakarta.validation:jakarta.validation-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy-agent:1.18.8-jdk5=jarValidation,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testRuntimeClasspath
@@ -86,9 +86,6 @@ 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=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.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 org.apache.logging.log4j:log4j-1.2-api:2.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -155,7 +152,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=apiHelper,jarValidati
 org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -166,7 +163,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfile
index 933980dbc1a6..4c44d008dcec 100644
--- a/solr/modules/cuvs/gradle.lockfile
+++ b/solr/modules/cuvs/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -37,8 +37,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -75,7 +75,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -84,9 +84,6 @@ 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,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -152,7 +149,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -161,7 +158,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile
index d59161cf3509..d47d25516dcc 100644
--- a/solr/modules/extraction/gradle.lockfile
+++ b/solr/modules/extraction/gradle.lockfile
@@ -11,25 +11,25 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
 com.github.docker-java:docker-java-api:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 com.github.docker-java:docker-java-transport-zerodep:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 com.github.docker-java:docker-java-transport:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -38,8 +38,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -76,7 +76,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.18.1=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -87,9 +87,6 @@ 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,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -157,7 +154,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.jetbrains:annotations:26.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -166,7 +163,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.rnorth.duct-tape:duct-tape:1.0.8=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile
index eb04f041e5d9..9c0d661905cc 100644
--- a/solr/modules/gcs-repository/gradle.lockfile
+++ b/solr/modules/gcs-repository/gradle.lockfile
@@ -13,8 +13,8 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2=compileClasspath,j
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 com.google.api-client:google-api-client:2.7.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:gapic-google-cloud-storage-v2:2.67.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -29,9 +29,9 @@ com.google.api:gax:2.79.0=compileClasspath,jarValidation,runtimeClasspath,runtim
 com.google.apis:google-api-services-storage:v1-rev20260204-2.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.46.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.46.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
 com.google.cloud:google-cloud-bom:0.261.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-core-grpc:2.69.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-core-http:2.69.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -39,25 +39,25 @@ com.google.cloud:google-cloud-core:2.69.0=compileClasspath,jarValidation,runtime
 com.google.cloud:google-cloud-nio:0.131.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-storage:2.67.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.13.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.45.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-apache-v2:2.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-appengine:2.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-gson:2.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-jackson2:2.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client:2.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client:1.39.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java-util:4.33.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.google.protobuf:protobuf-java:4.33.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.re2j:re2j:1.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -68,8 +68,8 @@ commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeL
 commons-codec:commons-codec:1.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.grpc:grpc-alts:1.80.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-api:1.80.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-auth:1.80.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -127,7 +127,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,jarValidation,runtimeClasspa
 jakarta.validation:jakarta.validation-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -138,7 +138,6 @@ org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidat
 org.apache.curator:curator-test:5.9.0=jarValidation,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -206,7 +205,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=apiHelper,jarValidati
 org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -215,7 +214,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile
index 63071e565760..6b89b5d3fa4e 100644
--- a/solr/modules/jwt-auth/gradle.lockfile
+++ b/solr/modules/jwt-auth/gradle.lockfile
@@ -12,23 +12,23 @@ com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=j
 com.fasterxml.jackson.module:jackson-module-kotlin:2.21.2=jarValidation,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,constraintsOnly,jarValidation,permitTestUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.github.stephenc.jcip:jcip-annotations:1.0-1=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -45,8 +45,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.github.microutils:kotlin-logging-jvm:3.0.5=jarValidation,testRuntimeClasspath
 io.github.microutils:kotlin-logging:3.0.5=jarValidation,testRuntimeClasspath
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -87,7 +87,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,jarValidation,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.minidev:accessors-smart:2.4.9=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -100,9 +100,6 @@ 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,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -182,7 +179,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20=jarValidation,testCompileClasspat
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:2.3.20=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:annotations:26.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -194,7 +191,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile
index 3514bb148bf5..9f7b2a21beaa 100644
--- a/solr/modules/langid/gradle.lockfile
+++ b/solr/modules/langid/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -36,8 +36,8 @@ commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,so
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
 io.github.azagniotov:language-detection:12.5.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -74,7 +74,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -83,9 +83,6 @@ 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,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -152,7 +149,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -161,7 +158,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfile
index fb79289383dd..1eaa0b4dd360 100644
--- a/solr/modules/language-models/gradle.lockfile
+++ b/solr/modules/language-models/gradle.lockfile
@@ -11,23 +11,23 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,compileOnlyHelper,jarValidation
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.knuddels:jtokkit:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -50,8 +50,8 @@ dev.langchain4j:langchain4j-hugging-face:1.9.1-beta17=jarValidation,runtimeClass
 dev.langchain4j:langchain4j-mistral-ai:1.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 dev.langchain4j:langchain4j-open-ai:1.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -88,7 +88,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -97,9 +97,6 @@ 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,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -169,7 +166,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20=jarValidation,runtimeClasspath,ru
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:2.3.20=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -178,7 +175,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile
index 44d8e58774ae..e3b2d90b2752 100644
--- a/solr/modules/ltr/gradle.lockfile
+++ b/solr/modules/ltr/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -73,7 +73,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -83,9 +83,6 @@ 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,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -151,7 +148,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -163,7 +160,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile
index 9c11765122b4..b1915bb00970 100644
--- a/solr/modules/opentelemetry/gradle.lockfile
+++ b/solr/modules/opentelemetry/gradle.lockfile
@@ -11,25 +11,25 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 com.google.api.grpc:proto-google-common-protos:2.63.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
 com.google.code.gson:gson:2.13.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -42,8 +42,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.grpc:grpc-api:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.grpc:grpc-context:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.grpc:grpc-core:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -104,7 +104,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -113,9 +113,6 @@ 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,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -184,7 +181,7 @@ org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspat
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:2.2.21=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -193,7 +190,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile
index 3725a0dc9be5..f96a4ef84cce 100644
--- a/solr/modules/s3-repository/gradle.lockfile
+++ b/solr/modules/s3-repository/gradle.lockfile
@@ -23,22 +23,22 @@ com.fasterxml.jackson.module:jackson-module-parameter-names:2.21.2=jarValidation
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs
 com.fasterxml.woodstox:woodstox-core:7.1.1=testCompileClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -48,8 +48,8 @@ commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeL
 commons-codec:commons-codec:1.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.micrometer:micrometer-commons:1.13.3=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.micrometer:micrometer-core:1.13.3=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.micrometer:micrometer-jakarta9:1.13.3=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -96,7 +96,7 @@ jakarta.websocket:jakarta.websocket-api:2.1.1=jarValidation,testCompileClasspath
 jakarta.websocket:jakarta.websocket-client-api:2.1.1=jarValidation,testCompileClasspath,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 joda-time:joda-time:2.14.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -109,7 +109,6 @@ org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidat
 org.apache.curator:curator-test:5.9.0=jarValidation,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -197,7 +196,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,r
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.2.2=jarValidation,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -210,7 +209,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.reactivestreams:reactive-streams:1.0.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile
index 889234e4e0fd..52bf529bf57e 100644
--- a/solr/modules/scripting/gradle.lockfile
+++ b/solr/modules/scripting/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -73,7 +73,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -82,9 +82,6 @@ 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,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -150,7 +147,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -159,7 +156,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile
index 3af24e910d8a..3f0833bb1325 100644
--- a/solr/modules/sql/gradle.lockfile
+++ b/solr/modules/sql/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.ibm.icu:icu4j:77.1=jarValidation,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -38,8 +38,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -76,7 +76,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.calcite.avatica:avatica-core:1.25.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -93,9 +93,6 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath
 org.apache.httpcomponents.client5:httpclient5:5.2.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.apache.httpcomponents.core5:httpcore5-h2:5.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.apache.httpcomponents.core5:httpcore5:5.2.3=jarValidation,runtimeClasspath,runtimeLibs,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.25.3=solrPlatformLibs
 org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -175,7 +172,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.immutables:value-annotations:2.12.1=compileClasspath,compileOnlyHelper,jarValidation
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -187,7 +184,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile
index 708f40862b34..8b50620c6f18 100644
--- a/solr/server/gradle.lockfile
+++ b/solr/server/gradle.lockfile
@@ -10,22 +10,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,solrCore
 com.fasterxml.jackson:jackson-bom:2.21.2=jarValidation,runtimeClasspath,solrCore
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,solrCore
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=jarValidation,runtimeClasspath,solrCore
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
-com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+com.google.guava:guava:33.5.0-jre=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,solrCore
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,solrCore
 com.lmax:disruptor:4.0.0=jarValidation,libExt,runtimeClasspath
@@ -33,8 +33,8 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,solrCore
 commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,solrCore
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,solrCore
 commons-io:commons-io:2.21.0=jarValidation,runtimeClasspath,solrCore
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=jarValidation,runtimeClasspath,solrCore
 io.netty:netty-codec-base:4.2.12.Final=jarValidation,runtimeClasspath,solrCore
 io.netty:netty-common:4.2.12.Final=jarValidation,runtimeClasspath,solrCore
@@ -71,7 +71,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,serverL
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,solrCore
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,solrCore
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,solrCore
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,solrCore
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,solrCore
 org.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,solrCore
@@ -147,12 +147,12 @@ org.glassfish.jersey.inject:jersey-hk2:4.0.2=jarValidation,runtimeClasspath,solr
 org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtimeClasspath,solrCore
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,solrCore
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,solrCore
-org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+org.jspecify:jspecify:1.0.0=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
 org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,solrCore
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,solrCore
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,solrCore
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,solrCore
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,solrCore
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,libExt,runtimeClasspath,solrCore
 org.slf4j:jul-to-slf4j:2.0.17=jarValidation,libExt,runtimeClasspath
diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile
index 35a6de3f6353..ba743052ad89 100644
--- a/solr/solr-ref-guide/gradle.lockfile
+++ b/solr/solr-ref-guide/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=testRuntimeClas
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor,testRuntimeClasspath
 com.googlecode.json-simple:json-simple:1.1.1=testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=testRuntimeClasspath
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=testRuntimeClasspath
 commons-io:commons-io:2.21.0=testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=testCompileClasspath,testRuntimeClasspath
@@ -73,7 +73,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=testRuntimeClasspath
 jakarta.validation:jakarta.validation-api:3.1.0=testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=testRuntimeClasspath
 org.apache.calcite.avatica:avatica-core:1.25.0=testRuntimeClasspath
@@ -90,9 +90,6 @@ org.apache.curator:curator-test:5.9.0=testRuntimeClasspath
 org.apache.httpcomponents.client5:httpclient5:5.2.1=testRuntimeClasspath
 org.apache.httpcomponents.core5:httpcore5-h2:5.2=testRuntimeClasspath
 org.apache.httpcomponents.core5:httpcore5:5.2.3=testRuntimeClasspath
-org.apache.httpcomponents:httpclient:4.5.14=testRuntimeClasspath
-org.apache.httpcomponents:httpcore:4.4.16=testRuntimeClasspath
-org.apache.httpcomponents:httpmime:4.5.14=testRuntimeClasspath
 org.apache.logging.log4j:log4j-api:2.25.3=testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=testRuntimeClasspath
 org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=testRuntimeClasspath
@@ -159,7 +156,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=testRuntimeClasspath
 org.glassfish.jersey:jersey-bom:4.0.2=testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=testRuntimeClasspath
 org.junit:junit-bom:5.6.2=testRuntimeClasspath
@@ -171,7 +168,7 @@ org.opentest4j:opentest4j:1.2.0=testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
 org.ow2.asm:asm:9.8=testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=testCompileClasspath,testRuntimeClasspath
diff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfile
index ee611917aaec..4342df31fd95 100644
--- a/solr/solrj-jetty/gradle.lockfile
+++ b/solr/solrj-jetty/gradle.lockfile
@@ -11,23 +11,23 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,t
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,compileOnlyHelper,jarValidation
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 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
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -74,7 +74,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspa
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspath
@@ -83,9 +83,6 @@ 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=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.25.3=jarValidation,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,testRuntimeClasspath
 org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=jarValidation,testRuntimeClasspath
@@ -148,7 +145,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,testRun
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -157,7 +154,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/solrj-streaming/build.gradle b/solr/solrj-streaming/build.gradle
index 93bf46f788cd..2495dae42716 100644
--- a/solr/solrj-streaming/build.gradle
+++ b/solr/solrj-streaming/build.gradle
@@ -30,6 +30,7 @@ dependencies {
   testImplementation project(':solr:core')
   testImplementation project(':solr:solrj-zookeeper')
 
+  testRuntimeOnly project(':solr:solrj-jetty')
   testRuntimeOnly project(':solr:modules:sql')
   testRuntimeOnly libs.hsqldb.hsqldb // runtime because via JDBC reflection
 
diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile
index e0b32df6d924..f86902b02b29 100644
--- a/solr/solrj-streaming/gradle.lockfile
+++ b/solr/solrj-streaming/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,t
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
 com.googlecode.json-simple:json-simple:1.1.1=jarValidation,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -74,7 +74,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspa
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
 org.apache.calcite.avatica:avatica-core:1.25.0=jarValidation,testRuntimeClasspath
@@ -91,9 +91,6 @@ 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,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.25.3=jarValidation,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,testRuntimeClasspath
 org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=jarValidation,testRuntimeClasspath
@@ -160,7 +157,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.hsqldb:hsqldb:2.7.4=jarValidation,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -172,7 +169,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile
index f0f9c46d494c..3b12416096da 100644
--- a/solr/solrj-zookeeper/gradle.lockfile
+++ b/solr/solrj-zookeeper/gradle.lockfile
@@ -11,27 +11,27 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,t
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyHelper
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.18.0=apiHelper
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
 com.google.guava:failureaccess:1.0.1=apiHelper
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.guava:guava:32.0.0-jre=apiHelper
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:2.8=apiHelper
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 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
@@ -40,8 +40,8 @@ commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.17.0=apiHelper
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.1.119.Final=apiHelper
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -90,7 +90,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspa
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspath
@@ -99,9 +99,6 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,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
 org.apache.curator:curator-test:5.9.0=jarValidation,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.25.3=jarValidation,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,testRuntimeClasspath
 org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=jarValidation,testRuntimeClasspath
@@ -165,7 +162,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,testRun
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.14.0=compileOnlyHelper
@@ -175,7 +172,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.13=apiHelper
diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile
index 449d53a460d7..09a691463099 100644
--- a/solr/solrj/gradle.lockfile
+++ b/solr/solrj/gradle.lockfile
@@ -11,23 +11,23 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,t
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,compileOnlyHelper,jarValidation
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 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
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -74,7 +74,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspa
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
@@ -84,9 +84,6 @@ 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=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.25.3=jarValidation,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,testRuntimeClasspath
 org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=jarValidation,testRuntimeClasspath
@@ -152,7 +149,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,testRun
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -164,7 +161,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index c116e384469c..a871997786ee 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -64,8 +64,6 @@ dependencies {
   implementation libs.apache.log4j.api
   implementation libs.apache.log4j.core
   implementation libs.commonscli.commonscli
-  implementation libs.apache.httpcomponents.httpclient
-  implementation libs.apache.httpcomponents.httpcore
   implementation libs.opentelemetry.api
   implementation(libs.opentelemetry.exporter.prometheus) {
     transitive = false // most things don't want or already have
@@ -97,9 +95,4 @@ 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"
-  })
 }
diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile
index e55bbe89b7fb..e0700899c3a5 100644
--- a/solr/test-framework/gradle.lockfile
+++ b/solr/test-framework/gradle.lockfile
@@ -12,32 +12,32 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=apiHelper,jarVa
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyHelper
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 commons-cli:commons-cli:1.11.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-commons-codec:commons-codec:1.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+commons-codec:commons-codec:1.21.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -74,7 +74,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,compileClasspath,jarValidati
 jakarta.validation:jakarta.validation-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 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.6.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -83,9 +83,6 @@ 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=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.25.3=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.25.3=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -148,7 +145,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=apiHelper,jarValidati
 org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit:junit-bom:5.14.0=compileOnlyHelper
@@ -162,7 +159,7 @@ org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,testCompileClassp
 org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/ui/gradle.lockfile b/solr/ui/gradle.lockfile
deleted file mode 100644
index 521d5efe58d0..000000000000
--- a/solr/ui/gradle.lockfile
+++ /dev/null
@@ -1,444 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-androidx.annotation:annotation-jvm:1.9.1=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.annotation:annotation-wasm-js:1.9.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.annotation:annotation:1.9.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.arch.core:core-common:2.2.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.collection:collection-jvm:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.collection:collection-wasm-js:1.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.collection:collection:1.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.compose.runtime:runtime-annotation-jvm:1.10.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.compose.runtime:runtime-annotation-jvm:1.9.0=composeHotReloadDevTools
-androidx.compose.runtime:runtime-annotation-wasm-js:1.10.5=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.compose.runtime:runtime-annotation:1.10.5=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.compose.runtime:runtime-annotation:1.9.0=composeHotReloadDevTools
-androidx.compose.runtime:runtime-desktop:1.10.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.compose.runtime:runtime-desktop:1.9.0=composeHotReloadDevTools
-androidx.compose.runtime:runtime-retain-desktop:1.10.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.compose.runtime:runtime-retain-wasm-js:1.10.5=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.compose.runtime:runtime-retain:1.10.5=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.compose.runtime:runtime-saveable-desktop:1.10.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.compose.runtime:runtime-saveable-wasm-js:1.10.5=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.compose.runtime:runtime-saveable:1.10.5=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.compose.runtime:runtime-wasm-js:1.10.5=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.compose.runtime:runtime:1.10.5=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.compose.runtime:runtime:1.9.0=composeHotReloadDevTools
-androidx.graphics:graphics-shapes-desktop:1.1.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.graphics:graphics-shapes-wasm-js:1.1.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.graphics:graphics-shapes:1.1.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.lifecycle:lifecycle-common-jvm:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common-jvm:2.9.2=composeHotReloadDevTools
-androidx.lifecycle:lifecycle-common-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.lifecycle:lifecycle-common:2.9.2=composeHotReloadDevTools
-androidx.lifecycle:lifecycle-runtime-compose-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.lifecycle:lifecycle-runtime-compose-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.lifecycle:lifecycle-runtime-compose:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.lifecycle:lifecycle-runtime-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.lifecycle:lifecycle-runtime-desktop:2.9.2=composeHotReloadDevTools
-androidx.lifecycle:lifecycle-runtime-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.lifecycle:lifecycle-runtime:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.lifecycle:lifecycle-runtime:2.9.2=composeHotReloadDevTools
-androidx.lifecycle:lifecycle-viewmodel-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.lifecycle:lifecycle-viewmodel-desktop:2.9.2=composeHotReloadDevTools
-androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop:2.9.2=composeHotReloadDevTools
-androidx.lifecycle:lifecycle-viewmodel-savedstate-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2=composeHotReloadDevTools
-androidx.lifecycle:lifecycle-viewmodel-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.lifecycle:lifecycle-viewmodel:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.lifecycle:lifecycle-viewmodel:2.9.2=composeHotReloadDevTools
-androidx.navigation3:navigation3-runtime-desktop:1.1.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.navigation3:navigation3-runtime-wasm-js:1.1.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.navigation3:navigation3-runtime:1.1.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.navigationevent:navigationevent-desktop:1.0.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.navigationevent:navigationevent-wasm-js:1.0.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.navigationevent:navigationevent:1.0.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.savedstate:savedstate-compose-desktop:1.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.savedstate:savedstate-compose-wasm-js:1.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.savedstate:savedstate-compose:1.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.savedstate:savedstate-desktop:1.3.1=composeHotReloadDevTools
-androidx.savedstate:savedstate-desktop:1.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.savedstate:savedstate-wasm-js:1.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.savedstate:savedstate:1.3.1=composeHotReloadDevTools
-androidx.savedstate:savedstate:1.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-androidx.window:window-core-jvm:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-androidx.window:window-core-wasm-js:1.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-androidx.window:window-core:1.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.arkivanov.decompose:decompose-jvm:3.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.decompose:decompose-wasm-js:3.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.decompose:decompose:3.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.arkivanov.decompose:extensions-compose-jvm:3.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.decompose:extensions-compose-wasm-js:3.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.decompose:extensions-compose:3.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.arkivanov.essenty:back-handler-jvm:2.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.essenty:back-handler-wasm-js:2.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.essenty:back-handler:2.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.arkivanov.essenty:instance-keeper-jvm:2.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.essenty:instance-keeper-wasm-js:2.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.essenty:instance-keeper:2.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.arkivanov.essenty:lifecycle-jvm:2.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.essenty:lifecycle-wasm-js:2.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.essenty:lifecycle:2.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.arkivanov.essenty:state-keeper-jvm:2.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.essenty:state-keeper-wasm-js:2.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.essenty:state-keeper:2.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.arkivanov.essenty:utils-internal-jvm:2.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
-com.arkivanov.essenty:utils-internal-wasm-js:2.5.0=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.essenty:utils-internal:2.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines-jvm:4.3.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines-wasm-js:4.3.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines:4.3.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.arkivanov.mvikotlin:mvikotlin-jvm:4.3.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.mvikotlin:mvikotlin-logging-jvm:4.3.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.mvikotlin:mvikotlin-logging-wasm-js:4.3.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.mvikotlin:mvikotlin-logging:4.3.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.arkivanov.mvikotlin:mvikotlin-main-jvm:4.3.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.mvikotlin:mvikotlin-main-wasm-js:4.3.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.mvikotlin:mvikotlin-main:4.3.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.arkivanov.mvikotlin:mvikotlin-wasm-js:4.3.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.mvikotlin:mvikotlin:4.3.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.google.auto.value:auto-value-annotations:1.11.0=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.41.0=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
-com.google.guava:failureaccess:1.0.3=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
-com.google.truth:truth:1.0.1=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
-com.googlecode.java-diff-utils:diffutils:1.3.0=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
-com.squareup.okio:okio-jvm:3.16.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.squareup.okio:okio-wasm-js:3.16.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.squareup.okio:okio:3.16.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-com.typesafe:config:1.4.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
-io.github.oshai:kotlin-logging-jvm:8.0.01=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.github.oshai:kotlin-logging-wasm-js:8.0.01=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.github.oshai:kotlin-logging:8.0.01=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-bom:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-client-auth-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-client-auth-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-client-auth:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-client-cio-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-client-cio-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-client-cio:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-client-content-negotiation-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-client-content-negotiation-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-client-content-negotiation:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-client-core-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-client-core-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-client-core:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-client-mock-jvm:3.4.2=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-client-mock-wasm-js:3.4.2=wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-client-mock:3.4.2=allTestSourceSetsCompileDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webTestResolvableDependenciesMetadata
-io.ktor:ktor-events-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-events-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-events:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-http-cio-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-http-cio-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-http-cio:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-http-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-http-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-http:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-io-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-io-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-io:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-network-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-network-tls-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-network-tls-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-network-tls:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-network-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-network:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-serialization-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-serialization-kotlinx-json-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-serialization-kotlinx-json-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-serialization-kotlinx-json:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-serialization-kotlinx-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-serialization-kotlinx-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-serialization-kotlinx:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-serialization-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-serialization:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-server-cio-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-server-cio:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
-io.ktor:ktor-server-core-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-server-core:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
-io.ktor:ktor-server-html-builder-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-server-html-builder:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
-io.ktor:ktor-sse-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-sse-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-sse:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-utils-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-utils-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-utils:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-websocket-serialization-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-websocket-serialization-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-websocket-serialization:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.ktor:ktor-websockets-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.ktor:ktor-websockets-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-io.ktor:ktor-websockets:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-io.sellmair:evas-compose-jvm:1.3.0=composeHotReloadDevTools
-io.sellmair:evas-compose:1.3.0=composeHotReloadDevTools
-io.sellmair:evas-jvm:1.3.0=composeHotReloadDevTools
-io.sellmair:evas:1.3.0=composeHotReloadDevTools
-junit:junit:4.13.2=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.checkerframework:checker-compat-qual:2.5.5=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
-org.fusesource.jansi:jansi:2.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
-org.hamcrest:hamcrest-core:1.3=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.javassist:javassist:3.30.2-GA=composeHotReloadAgent
-org.jetbrains.androidx.lifecycle:lifecycle-common-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.lifecycle:lifecycle-common:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.4=composeHotReloadDevTools
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop:2.9.4=composeHotReloadDevTools
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.4=composeHotReloadDevTools
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.4=composeHotReloadDevTools
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4=composeHotReloadDevTools
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.4=composeHotReloadDevTools
-org.jetbrains.androidx.navigation3:navigation3-ui-desktop:1.1.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.androidx.navigation3:navigation3-ui-wasm-js:1.1.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.navigation3:navigation3-ui:1.1.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop:1.0.1=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.androidx.navigationevent:navigationevent-compose-wasm-js:1.0.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.androidx.savedstate:savedstate-compose-desktop:1.3.4=composeHotReloadDevTools
-org.jetbrains.androidx.savedstate:savedstate-compose-desktop:1.3.6=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.androidx.savedstate:savedstate-compose-wasm-js:1.3.6=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.savedstate:savedstate-compose:1.3.4=composeHotReloadDevTools
-org.jetbrains.androidx.savedstate:savedstate-compose:1.3.6=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.androidx.savedstate:savedstate-wasm-js:1.3.6=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.savedstate:savedstate:1.3.4=composeHotReloadDevTools
-org.jetbrains.androidx.savedstate:savedstate:1.3.6=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.androidx.window:window-core-desktop:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.androidx.window:window-core-wasm-js:1.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.androidx.window:window-core:1.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.animation:animation-core-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.animation:animation-core-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.animation:animation-core-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.animation:animation-core:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.animation:animation-core:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.animation:animation-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.animation:animation-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.animation:animation-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.animation:animation:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.animation:animation:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.annotation-internal:annotation-wasm-js:1.10.3=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.annotation-internal:annotation:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.annotation-internal:annotation:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.collection-internal:collection-wasm-js:1.10.3=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.collection-internal:collection:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.collection-internal:collection:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.components:components-resources-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.components:components-resources-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.components:components-resources-wasmJs:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.components:components-resources:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.components:components-resources:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.desktop:desktop-jvm:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.desktop:desktop-jvm:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.desktop:desktop:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
-org.jetbrains.compose.desktop:desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.foundation:foundation-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.foundation:foundation-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.foundation:foundation-layout-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.foundation:foundation-layout-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.foundation:foundation-layout-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.foundation:foundation-layout:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.foundation:foundation-layout:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.foundation:foundation-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.foundation:foundation:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.foundation:foundation:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.hot-reload:hot-reload-agent:1.0.0=composeHotReloadAgent
-org.jetbrains.compose.hot-reload:hot-reload-analysis:1.0.0=composeHotReloadAgent
-org.jetbrains.compose.hot-reload:hot-reload-annotations-jvm:1.0.0=composeHotReloadAgent,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,composeHotReloadRuntime,desktopDevCompileClasspath,desktopDevRuntimeClasspath
-org.jetbrains.compose.hot-reload:hot-reload-annotations:1.0.0=allDevSourceSetsCompileDependenciesMetadata,composeHotReloadAgent,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,composeHotReloadRuntime,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath
-org.jetbrains.compose.hot-reload:hot-reload-core:1.0.0=composeHotReloadAgent,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,composeHotReloadRuntime
-org.jetbrains.compose.hot-reload:hot-reload-devtools-api:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,composeHotReloadRuntime
-org.jetbrains.compose.hot-reload:hot-reload-devtools:1.0.0=composeHotReloadDevTools
-org.jetbrains.compose.hot-reload:hot-reload-orchestration:1.0.0=composeHotReloadAgent,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,composeHotReloadRuntime
-org.jetbrains.compose.hot-reload:hot-reload-runtime-api-jvm:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevTools,desktopDevCompileClasspath,desktopDevRuntimeClasspath
-org.jetbrains.compose.hot-reload:hot-reload-runtime-api:1.0.0=allDevSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevTools,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath
-org.jetbrains.compose.hot-reload:hot-reload-runtime-jvm:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadRuntime
-org.jetbrains.compose.material3.adaptive:adaptive-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.material3.adaptive:adaptive-layout-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.material3.adaptive:adaptive-layout-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.material3.adaptive:adaptive-layout:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.material3.adaptive:adaptive-navigation-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.material3.adaptive:adaptive-navigation-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.material3.adaptive:adaptive-navigation3-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.material3.adaptive:adaptive-navigation3-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.material3.adaptive:adaptive-navigation3:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.material3.adaptive:adaptive-navigation:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.material3.adaptive:adaptive-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.material3.adaptive:adaptive:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.material3:material3-desktop:1.10.0-alpha05=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.material3:material3-desktop:1.8.2=composeHotReloadDevTools
-org.jetbrains.compose.material3:material3-wasm-js:1.10.0-alpha05=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.material3:material3:1.10.0-alpha05=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.material3:material3:1.8.2=composeHotReloadDevTools
-org.jetbrains.compose.material:material-icons-core-desktop:1.7.3=composeHotReloadDevTools
-org.jetbrains.compose.material:material-icons-core:1.7.3=composeHotReloadDevTools
-org.jetbrains.compose.material:material-ripple-desktop:1.8.2=composeHotReloadDevTools
-org.jetbrains.compose.material:material-ripple-desktop:1.9.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.material:material-ripple-wasm-js:1.9.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.material:material-ripple:1.8.2=composeHotReloadDevTools
-org.jetbrains.compose.material:material-ripple:1.9.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.runtime:runtime-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.runtime:runtime-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.runtime:runtime-saveable-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.runtime:runtime-saveable-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.runtime:runtime-saveable-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.runtime:runtime-saveable:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.runtime:runtime-saveable:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.runtime:runtime-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.runtime:runtime:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.runtime:runtime:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-backhandler-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-backhandler-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-backhandler-wasm-js:1.10.3=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-backhandler:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.ui:ui-backhandler:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-geometry-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-geometry-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-geometry-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-geometry:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.ui:ui-geometry:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-graphics-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-graphics-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-graphics-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-graphics:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.ui:ui-graphics:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-test-desktop:1.10.3=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-test-wasm-js:1.10.3=wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-test:1.10.3=allTestSourceSetsCompileDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.ui:ui-text-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-text-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-text-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-text:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.ui:ui-text:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-tooling-preview-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-tooling-preview-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-tooling-preview-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-tooling-preview:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.ui:ui-tooling-preview:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-uikit:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,desktopDevResolvableDependenciesMetadata,desktopMainResolvableDependenciesMetadata,desktopTestResolvableDependenciesMetadata,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsTestResolvableDependenciesMetadata,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.ui:ui-unit-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-unit-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-unit-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-unit:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.ui:ui-unit:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-util-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-util-desktop:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-util-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.ui:ui-util:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.ui:ui-util:1.9.0=composeHotReloadDevTools
-org.jetbrains.compose.ui:ui-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.compose.ui:ui:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.compose.ui:ui:1.9.0=composeHotReloadDevTools
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-reflect:2.3.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
-org.jetbrains.kotlin:kotlin-serialization-compiler-plugin-embeddable:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
-org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21=composeHotReloadDevTools
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21=composeHotReloadDevTools
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21=composeHotReloadDevTools
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-wasm-js:2.3.20=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.1.21=composeHotReloadDevTools,composeHotReloadRuntime
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.kotlin:kotlin-test-junit:2.3.20=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-test-wasm-js:2.3.20=wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-test:2.3.20=allTestSourceSetsCompileDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webTestResolvableDependenciesMetadata
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlinx:atomicfu-jvm:0.23.2=composeHotReloadDevTools
-org.jetbrains.kotlinx:atomicfu-jvm:0.31.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:atomicfu-wasm-js:0.32.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:atomicfu:0.23.2=composeHotReloadDevTools
-org.jetbrains.kotlinx:atomicfu:0.31.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsTestResolvableDependenciesMetadata,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.kotlinx:atomicfu:0.32.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-browser-wasm-js:0.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-browser:0.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-wasm-js:1.10.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.10.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.10.2=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-test-wasm-js:1.10.2=wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2=allTestSourceSetsCompileDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webTestResolvableDependenciesMetadata
-org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.7.1=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-datetime-wasm-js:0.7.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-datetime:0.7.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.kotlinx:kotlinx-html-jvm:0.12.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-html:0.12.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.8.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-io-bytestring-wasm-js:0.8.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-io-bytestring:0.8.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.8.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-io-core-wasm-js:0.8.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-io-core:0.8.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.kotlinx:kotlinx-serialization-bom:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=composeHotReloadDevTools
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=composeHotReloadDevTools
-org.jetbrains.kotlinx:kotlinx-serialization-core-wasm-js:1.11.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-serialization-core:1.11.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=composeHotReloadDevTools
-org.jetbrains.kotlinx:kotlinx-serialization-json-io-jvm:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-serialization-json-io-wasm-js:1.9.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-serialization-json-io:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-serialization-json-io:1.9.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,desktopDevResolvableDependenciesMetadata,desktopMainResolvableDependenciesMetadata,desktopTestResolvableDependenciesMetadata,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-serialization-json-wasm-js:1.11.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains.runtime:jbr-api:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
-org.jetbrains.skiko:skiko-awt:0.9.22.2=composeHotReloadDevTools
-org.jetbrains.skiko:skiko-awt:0.9.37.4=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.skiko:skiko-js-wasm-runtime:0.9.37.4=COMPOSE_SKIKO_JS_WASM_RUNTIME,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.skiko:skiko-wasm-js:0.9.37.4=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-org.jetbrains.skiko:skiko:0.9.22.2=composeHotReloadDevTools
-org.jetbrains.skiko:skiko:0.9.37.4=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-org.jetbrains:annotations:13.0=composeHotReloadRuntime,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains:annotations:23.0.0=composeHotReloadDevTools
-org.jetbrains:annotations:26.0.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jspecify:jspecify:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.ow2.asm:asm-tree:9.8=composeHotReloadAgent
-org.ow2.asm:asm:9.8=composeHotReloadAgent
-org.slf4j:slf4j-api:2.0.17=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
-empty=commonMainImplementationDependenciesMetadata,commonTestImplementationDependenciesMetadata,desktopDevAnnotationProcessor,desktopDevImplementationDependenciesMetadata,desktopMainAnnotationProcessor,desktopMainImplementationDependenciesMetadata,desktopTestAnnotationProcessor,desktopTestImplementationDependenciesMetadata,devKotlinScriptDefExtensions,jarValidation,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,testKotlinScriptDefExtensions,wasmJsMainImplementationDependenciesMetadata,wasmJsTestImplementationDependenciesMetadata,webMainImplementationDependenciesMetadata,webTestImplementationDependenciesMetadata
diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile
index d0eab79b171a..34f45c7394c0 100644
--- a/solr/webapp/gradle.lockfile
+++ b/solr/webapp/gradle.lockfile
@@ -10,22 +10,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=solrCore
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=solrCore
 com.fasterxml.jackson:jackson-bom:2.21.2=solrCore
 com.fasterxml.woodstox:woodstox-core:7.0.0=solrCore
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,solrCore,testAnnotationProcessor
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=solrCore
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
-com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,solrCore,testAnnotationProcessor
+com.google.guava:guava:33.5.0-jre=annotationProcessor,solrCore,testAnnotationProcessor
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,solrCore,testAnnotationProcessor
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,solrCore,testAnnotationProcessor
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=solrCore
 com.jayway.jsonpath:json-path:2.9.0=solrCore
 com.lmax:disruptor:4.0.0=serverLib
@@ -33,8 +33,8 @@ com.tdunning:t-digest:3.3=solrCore
 commons-cli:commons-cli:1.11.0=solrCore
 commons-codec:commons-codec:1.21.0=solrCore
 commons-io:commons-io:2.21.0=solrCore
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=solrCore
 io.netty:netty-codec-base:4.2.12.Final=solrCore
 io.netty:netty-common:4.2.12.Final=solrCore
@@ -71,7 +71,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=serverLib,solrCore
 jakarta.validation:jakarta.validation-api:3.1.0=solrCore
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=solrCore
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=solrCore
-javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
 org.antlr:antlr4-runtime:4.13.2=solrCore
 org.apache.commons:commons-exec:1.6.0=solrCore
 org.apache.commons:commons-lang3:3.20.0=solrCore
@@ -146,12 +146,12 @@ org.glassfish.jersey.inject:jersey-hk2:4.0.2=solrCore
 org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=solrCore
 org.glassfish.jersey:jersey-bom:4.0.2=solrCore
 org.javassist:javassist:3.30.2-GA=solrCore
-org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
+org.jspecify:jspecify:1.0.0=annotationProcessor,solrCore,testAnnotationProcessor
 org.locationtech.spatial4j:spatial4j:0.8=solrCore
 org.ow2.asm:asm-commons:9.8=solrCore
 org.ow2.asm:asm-tree:9.8=solrCore
 org.ow2.asm:asm:9.8=solrCore
-org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=solrCore
 org.slf4j:jcl-over-slf4j:2.0.17=serverLib,solrCore
 org.slf4j:jul-to-slf4j:2.0.17=serverLib

From 75f8dfb3ae896d3a45fbc46a4626e895e32d27a3 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 19 May 2026 11:26:08 -0400
Subject: [PATCH 23/27] Fix BasicDistributedZk2Test TransactionLog leak after
 session expiry

The race condition was that chaosMonkey.expireSession() starts a background
coreZkRegister thread, but waitForRecoveriesToFinish() returned immediately
because the node hadn't re-joined live_nodes yet (non-live replicas in DOWN
state are ignored). The fix increases blockUntilConnected from 50ms to 30s
and replaces waitForRecoveriesToFinish with a waitForState that explicitly
waits for the expired node to be back in live_nodes and all live replicas
to be ACTIVE.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../solr/cloud/BasicDistributedZk2Test.java   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
index 88b991f9dd2b..295344d57d9c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
@@ -33,6 +33,7 @@
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.params.CommonParams;
@@ -158,11 +159,25 @@ public void test() throws Exception {
           .getZkController()
           .getZkClient()
           .getCuratorFramework()
-          .blockUntilConnected(50, TimeUnit.MILLISECONDS);
+          .blockUntilConnected(30, TimeUnit.SECONDS);
 
       indexr("id", docId + 1, t1, "slip this doc in");
 
-      waitForRecoveriesToFinish(false);
+      // Wait for the session-expired node to fully re-register its replica as ACTIVE.
+      // waitForRecoveriesToFinish alone is insufficient because it ignores replicas on nodes
+      // not yet back in live_nodes, which can race with teardown.
+      String expiredNodeName = cloudJetty.jetty.getNodeName();
+      ZkStateReader.from(cloudClient)
+          .waitForState(
+              DEFAULT_COLLECTION,
+              60,
+              TimeUnit.SECONDS,
+              (liveNodes, collectionState) ->
+                  liveNodes.contains(expiredNodeName)
+                      && collectionState.getSlices().stream()
+                          .flatMap(s -> s.getReplicas().stream())
+                          .filter(r -> liveNodes.contains(r.getNodeName()))
+                          .allMatch(r -> r.getState() == Replica.State.ACTIVE));
 
       checkShardConsistency(SHARD1);
       checkShardConsistency(SHARD2);

From b14e3ff0d150f6050d9402e3a1ad396a1c2a83e1 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 19 May 2026 11:59:23 -0400
Subject: [PATCH 24/27] changelog

---
 ...R-18188-testsStopUsingApacheHttpClient.yml | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 changelog/unreleased/SOLR-18188-testsStopUsingApacheHttpClient.yml

diff --git a/changelog/unreleased/SOLR-18188-testsStopUsingApacheHttpClient.yml b/changelog/unreleased/SOLR-18188-testsStopUsingApacheHttpClient.yml
new file mode 100644
index 000000000000..59bf5682fff9
--- /dev/null
+++ b/changelog/unreleased/SOLR-18188-testsStopUsingApacheHttpClient.yml
@@ -0,0 +1,33 @@
+# (DELETE ALL COMMENTS UP HERE AFTER FILLING THIS IN
+
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+
+# If the change is minor, don't bother adding a changelog entry.
+# For `other` type entries, the threshold to bother with a changelog entry should be even higher.
+
+# title:
+#  * The audience is end-users and administrators, not committers.
+#  * Be short and focused on the user impact.  Multiple sentences is fine!
+#  * For technical/geeky details, prefer the commit message instead of changelog.
+#  * Reference JIRA issues like `SOLR-12345`, or if no JIRA but have a GitHub PR then `PR#12345`.
+
+# type:
+#  `added` for new features/improvements, opt-in by the user typically documented in the ref guide
+#  `changed` for improvements; not opt-in
+#  `fixed` for improvements that are deemed to have fixed buggy behavior
+#  `deprecated` for marking things deprecated
+#  `removed` for code removed
+#  `dependency_update` for updates to dependencies
+#  `other` for anything else, like large/significant refactorings, build changes,
+#    test infrastructure, or documentation.
+#    Most such changes are too small/minor to bother with a changelog entry.
+
+title: >
+  Tests updated to NOT use org.apache.solr.client.solrj.apache which is now also removed.
+  solr-test-framework doesn't use/depend on Apache HttpClient/httpcomponents anymore.
+type: other
+authors:
+  - name: David Smiley
+links:
+  - name: SOLR-18188
+    url: https://issues.apache.org/jira/browse/SOLR-18188

From b76222f5c4b7f1add741311a3331792cb19a2888 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 19 May 2026 21:40:48 -0400
Subject: [PATCH 25/27] revert httpclient/httpcore LICENSE & NOTICE

---
 solr/licenses/httpclient-LICENSE-ASL.txt | 4 ++--
 solr/licenses/httpclient-NOTICE.txt      | 2 +-
 solr/licenses/httpcore-LICENSE-ASL.txt   | 4 ++--
 solr/licenses/httpcore-NOTICE.txt        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/solr/licenses/httpclient-LICENSE-ASL.txt b/solr/licenses/httpclient-LICENSE-ASL.txt
index cba62b38a7c8..2c41ec88f61c 100644
--- a/solr/licenses/httpclient-LICENSE-ASL.txt
+++ b/solr/licenses/httpclient-LICENSE-ASL.txt
@@ -174,9 +174,9 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-
+   
 This project contains annotations derived from JCIP-ANNOTATIONS
 Copyright (c) 2005 Brian Goetz and Tim Peierls.
-See http://www.jcip.net and the Creative Commons Attribution License
+See http://www.jcip.net and the Creative Commons Attribution License 
 (http://creativecommons.org/licenses/by/2.5)
 
diff --git a/solr/licenses/httpclient-NOTICE.txt b/solr/licenses/httpclient-NOTICE.txt
index 4b40ea05719f..3a98f4542f51 100644
--- a/solr/licenses/httpclient-NOTICE.txt
+++ b/solr/licenses/httpclient-NOTICE.txt
@@ -5,4 +5,4 @@ This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
 This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
\ No newline at end of file
diff --git a/solr/licenses/httpcore-LICENSE-ASL.txt b/solr/licenses/httpcore-LICENSE-ASL.txt
index cba62b38a7c8..2c41ec88f61c 100644
--- a/solr/licenses/httpcore-LICENSE-ASL.txt
+++ b/solr/licenses/httpcore-LICENSE-ASL.txt
@@ -174,9 +174,9 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-
+   
 This project contains annotations derived from JCIP-ANNOTATIONS
 Copyright (c) 2005 Brian Goetz and Tim Peierls.
-See http://www.jcip.net and the Creative Commons Attribution License
+See http://www.jcip.net and the Creative Commons Attribution License 
 (http://creativecommons.org/licenses/by/2.5)
 
diff --git a/solr/licenses/httpcore-NOTICE.txt b/solr/licenses/httpcore-NOTICE.txt
index 4b40ea05719f..3a98f4542f51 100644
--- a/solr/licenses/httpcore-NOTICE.txt
+++ b/solr/licenses/httpcore-NOTICE.txt
@@ -5,4 +5,4 @@ This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
 This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
\ No newline at end of file

From 529b0a33cb50a0ffa08ea72fcabb8949808510f4 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 19 May 2026 22:10:08 -0400
Subject: [PATCH 26/27] restore solr/ui/gradle.lockfile And add other lockfiles

---
 solr/api/gradle.lockfile                     |  40 +-
 solr/benchmark/gradle.lockfile               |  40 +-
 solr/core/gradle.lockfile                    |  40 +-
 solr/cross-dc-manager/gradle.lockfile        |  40 +-
 solr/modules/analysis-extras/gradle.lockfile |  40 +-
 solr/modules/clustering/gradle.lockfile      |  40 +-
 solr/modules/cross-dc/gradle.lockfile        |  40 +-
 solr/modules/cuvs/gradle.lockfile            |  40 +-
 solr/modules/extraction/gradle.lockfile      |  40 +-
 solr/modules/gcs-repository/gradle.lockfile  |  40 +-
 solr/modules/jwt-auth/gradle.lockfile        |  40 +-
 solr/modules/langid/gradle.lockfile          |  40 +-
 solr/modules/language-models/gradle.lockfile |  40 +-
 solr/modules/ltr/gradle.lockfile             |  40 +-
 solr/modules/opentelemetry/gradle.lockfile   |  40 +-
 solr/modules/s3-repository/gradle.lockfile   |  40 +-
 solr/modules/scripting/gradle.lockfile       |  40 +-
 solr/modules/sql/gradle.lockfile             |  40 +-
 solr/server/gradle.lockfile                  |  40 +-
 solr/solr-ref-guide/gradle.lockfile          |  40 +-
 solr/solrj-jetty/gradle.lockfile             |  40 +-
 solr/solrj-streaming/gradle.lockfile         |  40 +-
 solr/solrj-zookeeper/gradle.lockfile         |  40 +-
 solr/solrj/gradle.lockfile                   |  40 +-
 solr/test-framework/gradle.lockfile          |  40 +-
 solr/ui/gradle.lockfile                      | 444 +++++++++++++++++++
 solr/webapp/gradle.lockfile                  |  40 +-
 27 files changed, 964 insertions(+), 520 deletions(-)
 create mode 100644 solr/ui/gradle.lockfile

diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile
index 1e43f423567f..8642404b5dd4 100644
--- a/solr/api/gradle.lockfile
+++ b/solr/api/gradle.lockfile
@@ -15,22 +15,22 @@ com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.21.2=swagger
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,swaggerBuild,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath
 com.sun.activation:jakarta.activation:2.0.1=swaggerBuild
@@ -40,8 +40,8 @@ commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
 io.github.classgraph:classgraph:4.8.165=swaggerBuild
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -84,7 +84,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspa
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=swaggerBuild
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspath
@@ -155,7 +155,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,testRun
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,swaggerBuild,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,swaggerBuild,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -164,7 +164,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile
index cb5139a1f2b7..d5bd38498272 100644
--- a/solr/benchmark/gradle.lockfile
+++ b/solr/benchmark/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,testRuntimeClasspa
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -73,7 +73,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,testRun
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.sf.jopt-simple:jopt-simple:5.0.4=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -146,7 +146,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,testRuntime
 org.hamcrest:hamcrest:3.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.jctools:jctools-core:4.0.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -157,7 +157,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,runtimeClasspath,testRuntimeClassp
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.quicktheories:quicktheories:0.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,testRuntimeClasspath
diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile
index bab7c3ef1f42..7727bfffc9e8 100644
--- a/solr/core/gradle.lockfile
+++ b/solr/core/gradle.lockfile
@@ -12,24 +12,24 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=compileClasspat
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyHelper,compileOnlyHelperTest,testCompileClasspath
 com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,compileOnlyHelper,jarValidation
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.ibm.icu:icu4j:77.1=jarValidation,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -39,8 +39,8 @@ commons-cli:commons-cli:1.11.0=compileClasspath,jarValidation,runtimeClasspath,r
 commons-codec:commons-codec:1.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -80,7 +80,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=compileClasspath,jarValidation,r
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -165,7 +165,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=compileClasspath,jarV
 org.glassfish.jersey:jersey-bom:4.0.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.junit:junit-bom:5.14.0=compileOnlyHelper,compileOnlyHelperTest
@@ -182,7 +182,7 @@ org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,testCompileClassp
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile
index cf53d1708205..6ba8101beb96 100644
--- a/solr/cross-dc-manager/gradle.lockfile
+++ b/solr/cross-dc-manager/gradle.lockfile
@@ -15,27 +15,27 @@ com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=j
 com.fasterxml.jackson.module:jackson-module-scala_2.13:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.github.luben:zstd-jni:1.5.6-4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.google.android:annotations:4.1.1.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 com.google.api.grpc:proto-google-common-protos:2.63.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.code.gson:gson:2.13.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java-util:3.25.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -55,8 +55,8 @@ commons-digester:commons-digester:2.1=jarValidation,runtimeClasspath,runtimeLibs
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 commons-validator:commons-validator:1.10.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:4.1.12.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.grpc:grpc-api:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.grpc:grpc-context:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.grpc:grpc-core:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -116,7 +116,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,jarValidation,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy-agent:1.18.8-jdk5=jarValidation,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testRuntimeClasspath
@@ -216,7 +216,7 @@ org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspat
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:2.2.21=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -227,7 +227,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
 org.rocksdb:rocksdbjni:7.9.2=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 org.scala-lang.modules:scala-collection-compat_2.13:2.10.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.scala-lang.modules:scala-java8-compat_2.13:1.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile
index 62dee8652b7c..73274f402100 100644
--- a/solr/modules/analysis-extras/gradle.lockfile
+++ b/solr/modules/analysis-extras/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=apiHelper,jarVa
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.ibm.icu:icu4j:77.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -37,8 +37,8 @@ commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeL
 commons-codec:commons-codec:1.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -75,7 +75,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,jarValidation,runtimeClasspa
 jakarta.validation:jakarta.validation-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -160,7 +160,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=apiHelper,jarValidati
 org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -172,7 +172,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile
index af716411716f..3a8eb41550c9 100644
--- a/solr/modules/clustering/gradle.lockfile
+++ b/solr/modules/clustering/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -73,7 +73,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -148,7 +148,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -157,7 +157,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile
index 44e89451356d..7711749a871c 100644
--- a/solr/modules/cross-dc/gradle.lockfile
+++ b/solr/modules/cross-dc/gradle.lockfile
@@ -12,23 +12,23 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=apiHelper,jarVa
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.github.luben:zstd-jni:1.5.6-4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -37,8 +37,8 @@ commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeL
 commons-codec:commons-codec:1.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -75,7 +75,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,jarValidation,runtimeClasspa
 jakarta.validation:jakarta.validation-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy-agent:1.18.8-jdk5=jarValidation,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testRuntimeClasspath
@@ -152,7 +152,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=apiHelper,jarValidati
 org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -163,7 +163,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfile
index 4c44d008dcec..16dc0299f3fa 100644
--- a/solr/modules/cuvs/gradle.lockfile
+++ b/solr/modules/cuvs/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -37,8 +37,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -75,7 +75,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -149,7 +149,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -158,7 +158,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile
index d47d25516dcc..b9a493023b16 100644
--- a/solr/modules/extraction/gradle.lockfile
+++ b/solr/modules/extraction/gradle.lockfile
@@ -11,25 +11,25 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
 com.github.docker-java:docker-java-api:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 com.github.docker-java:docker-java-transport-zerodep:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 com.github.docker-java:docker-java-transport:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -38,8 +38,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -76,7 +76,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.18.1=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -154,7 +154,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.jetbrains:annotations:26.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -163,7 +163,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.rnorth.duct-tape:duct-tape:1.0.8=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile
index 9c0d661905cc..d53d9fa148aa 100644
--- a/solr/modules/gcs-repository/gradle.lockfile
+++ b/solr/modules/gcs-repository/gradle.lockfile
@@ -13,8 +13,8 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2=compileClasspath,j
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 com.google.api-client:google-api-client:2.7.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:gapic-google-cloud-storage-v2:2.67.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -29,9 +29,9 @@ com.google.api:gax:2.79.0=compileClasspath,jarValidation,runtimeClasspath,runtim
 com.google.apis:google-api-services-storage:v1-rev20260204-2.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.46.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.46.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.cloud:google-cloud-bom:0.261.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-core-grpc:2.69.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-core-http:2.69.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -39,25 +39,25 @@ com.google.cloud:google-cloud-core:2.69.0=compileClasspath,jarValidation,runtime
 com.google.cloud:google-cloud-nio:0.131.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-storage:2.67.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.13.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.45.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-apache-v2:2.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-appengine:2.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-gson:2.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-jackson2:2.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client:2.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client:1.39.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java-util:4.33.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.protobuf:protobuf-java:4.33.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.google.re2j:re2j:1.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -68,8 +68,8 @@ commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeL
 commons-codec:commons-codec:1.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.grpc:grpc-alts:1.80.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-api:1.80.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-auth:1.80.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -127,7 +127,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,jarValidation,runtimeClasspa
 jakarta.validation:jakarta.validation-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -205,7 +205,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=apiHelper,jarValidati
 org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -214,7 +214,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile
index 6b89b5d3fa4e..56c096bfda25 100644
--- a/solr/modules/jwt-auth/gradle.lockfile
+++ b/solr/modules/jwt-auth/gradle.lockfile
@@ -12,23 +12,23 @@ com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=j
 com.fasterxml.jackson.module:jackson-module-kotlin:2.21.2=jarValidation,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,constraintsOnly,jarValidation,permitTestUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.github.stephenc.jcip:jcip-annotations:1.0-1=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -45,8 +45,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.github.microutils:kotlin-logging-jvm:3.0.5=jarValidation,testRuntimeClasspath
 io.github.microutils:kotlin-logging:3.0.5=jarValidation,testRuntimeClasspath
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -87,7 +87,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,jarValidation,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.minidev:accessors-smart:2.4.9=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -179,7 +179,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20=jarValidation,testCompileClasspat
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:2.3.20=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:annotations:26.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -191,7 +191,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile
index 9f7b2a21beaa..ae749db359aa 100644
--- a/solr/modules/langid/gradle.lockfile
+++ b/solr/modules/langid/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -36,8 +36,8 @@ commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,so
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
 io.github.azagniotov:language-detection:12.5.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -74,7 +74,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -149,7 +149,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -158,7 +158,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfile
index 1eaa0b4dd360..bec30747f9f6 100644
--- a/solr/modules/language-models/gradle.lockfile
+++ b/solr/modules/language-models/gradle.lockfile
@@ -11,23 +11,23 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,compileOnlyHelper,jarValidation
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.knuddels:jtokkit:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -50,8 +50,8 @@ dev.langchain4j:langchain4j-hugging-face:1.9.1-beta17=jarValidation,runtimeClass
 dev.langchain4j:langchain4j-mistral-ai:1.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 dev.langchain4j:langchain4j-open-ai:1.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -88,7 +88,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -166,7 +166,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20=jarValidation,runtimeClasspath,ru
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:2.3.20=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -175,7 +175,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile
index e3b2d90b2752..34fad9e09df8 100644
--- a/solr/modules/ltr/gradle.lockfile
+++ b/solr/modules/ltr/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -73,7 +73,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -148,7 +148,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -160,7 +160,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile
index b1915bb00970..416927dff1b4 100644
--- a/solr/modules/opentelemetry/gradle.lockfile
+++ b/solr/modules/opentelemetry/gradle.lockfile
@@ -11,25 +11,25 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 com.google.api.grpc:proto-google-common-protos:2.63.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.code.gson:gson:2.13.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -42,8 +42,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.grpc:grpc-api:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.grpc:grpc-context:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 io.grpc:grpc-core:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -104,7 +104,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -181,7 +181,7 @@ org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspat
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:2.2.21=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -190,7 +190,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile
index f96a4ef84cce..e5f21b223f01 100644
--- a/solr/modules/s3-repository/gradle.lockfile
+++ b/solr/modules/s3-repository/gradle.lockfile
@@ -23,22 +23,22 @@ com.fasterxml.jackson.module:jackson-module-parameter-names:2.21.2=jarValidation
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs
 com.fasterxml.woodstox:woodstox-core:7.1.1=testCompileClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -48,8 +48,8 @@ commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeL
 commons-codec:commons-codec:1.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.micrometer:micrometer-commons:1.13.3=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.micrometer:micrometer-core:1.13.3=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.micrometer:micrometer-jakarta9:1.13.3=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -96,7 +96,7 @@ jakarta.websocket:jakarta.websocket-api:2.1.1=jarValidation,testCompileClasspath
 jakarta.websocket:jakarta.websocket-client-api:2.1.1=jarValidation,testCompileClasspath,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 joda-time:joda-time:2.14.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -196,7 +196,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,r
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.2.2=jarValidation,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -209,7 +209,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.reactivestreams:reactive-streams:1.0.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile
index 52bf529bf57e..2f6a5c50c80e 100644
--- a/solr/modules/scripting/gradle.lockfile
+++ b/solr/modules/scripting/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.lmax:disruptor:4.0.0=solrPlatformLibs
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -73,7 +73,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -147,7 +147,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -156,7 +156,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile
index 3f0833bb1325..34c7b3e2fa6e 100644
--- a/solr/modules/sql/gradle.lockfile
+++ b/solr/modules/sql/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 com.ibm.icu:icu4j:77.1=jarValidation,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -38,8 +38,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -76,7 +76,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtime
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.apache.calcite.avatica:avatica-core:1.25.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -172,7 +172,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.immutables:value-annotations:2.12.1=compileClasspath,compileOnlyHelper,jarValidation
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -184,7 +184,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile
index 8b50620c6f18..708f40862b34 100644
--- a/solr/server/gradle.lockfile
+++ b/solr/server/gradle.lockfile
@@ -10,22 +10,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,r
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,solrCore
 com.fasterxml.jackson:jackson-bom:2.21.2=jarValidation,runtimeClasspath,solrCore
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,solrCore
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=jarValidation,runtimeClasspath,solrCore
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
-com.google.guava:guava:33.5.0-jre=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,solrCore
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,solrCore
 com.lmax:disruptor:4.0.0=jarValidation,libExt,runtimeClasspath
@@ -33,8 +33,8 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,solrCore
 commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,solrCore
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,solrCore
 commons-io:commons-io:2.21.0=jarValidation,runtimeClasspath,solrCore
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=jarValidation,runtimeClasspath,solrCore
 io.netty:netty-codec-base:4.2.12.Final=jarValidation,runtimeClasspath,solrCore
 io.netty:netty-common:4.2.12.Final=jarValidation,runtimeClasspath,solrCore
@@ -71,7 +71,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,serverL
 jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,solrCore
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,solrCore
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,solrCore
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,solrCore
 org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,solrCore
 org.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,solrCore
@@ -147,12 +147,12 @@ org.glassfish.jersey.inject:jersey-hk2:4.0.2=jarValidation,runtimeClasspath,solr
 org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtimeClasspath,solrCore
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,solrCore
 org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,solrCore
-org.jspecify:jspecify:1.0.0=annotationProcessor,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
+org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
 org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,solrCore
 org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,solrCore
 org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,solrCore
 org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,solrCore
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,solrCore
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,libExt,runtimeClasspath,solrCore
 org.slf4j:jul-to-slf4j:2.0.17=jarValidation,libExt,runtimeClasspath
diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile
index ba743052ad89..5162141605de 100644
--- a/solr/solr-ref-guide/gradle.lockfile
+++ b/solr/solr-ref-guide/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=testRuntimeClas
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor,testRuntimeClasspath
 com.googlecode.json-simple:json-simple:1.1.1=testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=testRuntimeClasspath
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=testRuntimeClasspath
 commons-io:commons-io:2.21.0=testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=testCompileClasspath,testRuntimeClasspath
@@ -73,7 +73,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=testRuntimeClasspath
 jakarta.validation:jakarta.validation-api:3.1.0=testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=testRuntimeClasspath
 org.apache.calcite.avatica:avatica-core:1.25.0=testRuntimeClasspath
@@ -156,7 +156,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=testRuntimeClasspath
 org.glassfish.jersey:jersey-bom:4.0.2=testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=testRuntimeClasspath
 org.junit:junit-bom:5.6.2=testRuntimeClasspath
@@ -168,7 +168,7 @@ org.opentest4j:opentest4j:1.2.0=testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
 org.ow2.asm:asm:9.8=testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=testCompileClasspath,testRuntimeClasspath
diff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfile
index 4342df31fd95..954a371c9267 100644
--- a/solr/solrj-jetty/gradle.lockfile
+++ b/solr/solrj-jetty/gradle.lockfile
@@ -11,23 +11,23 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,t
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,compileOnlyHelper,jarValidation
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 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
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -74,7 +74,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspa
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspath
@@ -145,7 +145,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,testRun
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -154,7 +154,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile
index f86902b02b29..0c5f6b2b3bd2 100644
--- a/solr/solrj-streaming/gradle.lockfile
+++ b/solr/solrj-streaming/gradle.lockfile
@@ -11,22 +11,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,t
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
 com.googlecode.json-simple:json-simple:1.1.1=jarValidation,testRuntimeClasspath
 com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -74,7 +74,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspa
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
 org.apache.calcite.avatica:avatica-core:1.25.0=jarValidation,testRuntimeClasspath
@@ -157,7 +157,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.hsqldb:hsqldb:2.7.4=jarValidation,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -169,7 +169,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile
index 3b12416096da..92e459c934fe 100644
--- a/solr/solrj-zookeeper/gradle.lockfile
+++ b/solr/solrj-zookeeper/gradle.lockfile
@@ -11,27 +11,27 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,t
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyHelper
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.18.0=apiHelper
 com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.guava:failureaccess:1.0.1=apiHelper
-com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.guava:guava:32.0.0-jre=apiHelper
-com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:2.8=apiHelper
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 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
@@ -40,8 +40,8 @@ commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.17.0=apiHelper
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.1.119.Final=apiHelper
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -90,7 +90,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspa
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
 org.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspath
@@ -162,7 +162,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,testRun
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.14.0=compileOnlyHelper
@@ -172,7 +172,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.13=apiHelper
diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile
index 09a691463099..b1a1dc64c61b 100644
--- a/solr/solrj/gradle.lockfile
+++ b/solr/solrj/gradle.lockfile
@@ -11,23 +11,23 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,t
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,jarValidation,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,compileOnlyHelper,jarValidation
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 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
@@ -35,8 +35,8 @@ commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -74,7 +74,7 @@ jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspa
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.8-jdk5=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
@@ -149,7 +149,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,testRun
 org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
 org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
@@ -161,7 +161,7 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath
 org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile
index e0700899c3a5..e05994327ac4 100644
--- a/solr/test-framework/gradle.lockfile
+++ b/solr/test-framework/gradle.lockfile
@@ -12,23 +12,23 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=apiHelper,jarVa
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyHelper
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -36,8 +36,8 @@ commons-cli:commons-cli:1.11.0=apiHelper,compileClasspath,jarValidation,runtimeC
 commons-codec:commons-codec:1.21.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:3.2.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-base:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-common:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -74,7 +74,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,compileClasspath,jarValidati
 jakarta.validation:jakarta.validation-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 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.6.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -145,7 +145,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=apiHelper,jarValidati
 org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.6.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.6.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit:junit-bom:5.14.0=compileOnlyHelper
@@ -159,7 +159,7 @@ org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,testCompileClassp
 org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/ui/gradle.lockfile b/solr/ui/gradle.lockfile
new file mode 100644
index 000000000000..521d5efe58d0
--- /dev/null
+++ b/solr/ui/gradle.lockfile
@@ -0,0 +1,444 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+androidx.annotation:annotation-jvm:1.9.1=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.annotation:annotation-wasm-js:1.9.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.annotation:annotation:1.9.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.arch.core:core-common:2.2.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.collection:collection-jvm:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.collection:collection-wasm-js:1.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.collection:collection:1.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.compose.runtime:runtime-annotation-jvm:1.10.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.compose.runtime:runtime-annotation-jvm:1.9.0=composeHotReloadDevTools
+androidx.compose.runtime:runtime-annotation-wasm-js:1.10.5=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.compose.runtime:runtime-annotation:1.10.5=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.compose.runtime:runtime-annotation:1.9.0=composeHotReloadDevTools
+androidx.compose.runtime:runtime-desktop:1.10.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.compose.runtime:runtime-desktop:1.9.0=composeHotReloadDevTools
+androidx.compose.runtime:runtime-retain-desktop:1.10.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.compose.runtime:runtime-retain-wasm-js:1.10.5=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.compose.runtime:runtime-retain:1.10.5=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.compose.runtime:runtime-saveable-desktop:1.10.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.compose.runtime:runtime-saveable-wasm-js:1.10.5=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.compose.runtime:runtime-saveable:1.10.5=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.compose.runtime:runtime-wasm-js:1.10.5=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.compose.runtime:runtime:1.10.5=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.compose.runtime:runtime:1.9.0=composeHotReloadDevTools
+androidx.graphics:graphics-shapes-desktop:1.1.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.graphics:graphics-shapes-wasm-js:1.1.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.graphics:graphics-shapes:1.1.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.lifecycle:lifecycle-common-jvm:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.lifecycle:lifecycle-common-jvm:2.9.2=composeHotReloadDevTools
+androidx.lifecycle:lifecycle-common-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.lifecycle:lifecycle-common:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.lifecycle:lifecycle-common:2.9.2=composeHotReloadDevTools
+androidx.lifecycle:lifecycle-runtime-compose-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.lifecycle:lifecycle-runtime-compose-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.lifecycle:lifecycle-runtime-compose:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.lifecycle:lifecycle-runtime-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.lifecycle:lifecycle-runtime-desktop:2.9.2=composeHotReloadDevTools
+androidx.lifecycle:lifecycle-runtime-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.lifecycle:lifecycle-runtime:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.lifecycle:lifecycle-runtime:2.9.2=composeHotReloadDevTools
+androidx.lifecycle:lifecycle-viewmodel-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.lifecycle:lifecycle-viewmodel-desktop:2.9.2=composeHotReloadDevTools
+androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop:2.9.2=composeHotReloadDevTools
+androidx.lifecycle:lifecycle-viewmodel-savedstate-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2=composeHotReloadDevTools
+androidx.lifecycle:lifecycle-viewmodel-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.lifecycle:lifecycle-viewmodel:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.lifecycle:lifecycle-viewmodel:2.9.2=composeHotReloadDevTools
+androidx.navigation3:navigation3-runtime-desktop:1.1.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.navigation3:navigation3-runtime-wasm-js:1.1.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.navigation3:navigation3-runtime:1.1.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.navigationevent:navigationevent-desktop:1.0.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.navigationevent:navigationevent-wasm-js:1.0.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.navigationevent:navigationevent:1.0.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.savedstate:savedstate-compose-desktop:1.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.savedstate:savedstate-compose-wasm-js:1.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.savedstate:savedstate-compose:1.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.savedstate:savedstate-desktop:1.3.1=composeHotReloadDevTools
+androidx.savedstate:savedstate-desktop:1.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.savedstate:savedstate-wasm-js:1.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.savedstate:savedstate:1.3.1=composeHotReloadDevTools
+androidx.savedstate:savedstate:1.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+androidx.window:window-core-jvm:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+androidx.window:window-core-wasm-js:1.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+androidx.window:window-core:1.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.arkivanov.decompose:decompose-jvm:3.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+com.arkivanov.decompose:decompose-wasm-js:3.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.arkivanov.decompose:decompose:3.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.arkivanov.decompose:extensions-compose-jvm:3.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+com.arkivanov.decompose:extensions-compose-wasm-js:3.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.arkivanov.decompose:extensions-compose:3.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.arkivanov.essenty:back-handler-jvm:2.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+com.arkivanov.essenty:back-handler-wasm-js:2.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.arkivanov.essenty:back-handler:2.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.arkivanov.essenty:instance-keeper-jvm:2.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+com.arkivanov.essenty:instance-keeper-wasm-js:2.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.arkivanov.essenty:instance-keeper:2.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.arkivanov.essenty:lifecycle-jvm:2.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+com.arkivanov.essenty:lifecycle-wasm-js:2.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.arkivanov.essenty:lifecycle:2.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.arkivanov.essenty:state-keeper-jvm:2.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+com.arkivanov.essenty:state-keeper-wasm-js:2.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.arkivanov.essenty:state-keeper:2.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.arkivanov.essenty:utils-internal-jvm:2.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
+com.arkivanov.essenty:utils-internal-wasm-js:2.5.0=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.arkivanov.essenty:utils-internal:2.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines-jvm:4.3.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines-wasm-js:4.3.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines:4.3.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.arkivanov.mvikotlin:mvikotlin-jvm:4.3.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+com.arkivanov.mvikotlin:mvikotlin-logging-jvm:4.3.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+com.arkivanov.mvikotlin:mvikotlin-logging-wasm-js:4.3.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.arkivanov.mvikotlin:mvikotlin-logging:4.3.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.arkivanov.mvikotlin:mvikotlin-main-jvm:4.3.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+com.arkivanov.mvikotlin:mvikotlin-main-wasm-js:4.3.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.arkivanov.mvikotlin:mvikotlin-main:4.3.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.arkivanov.mvikotlin:mvikotlin-wasm-js:4.3.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.arkivanov.mvikotlin:mvikotlin:4.3.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.google.auto.value:auto-value-annotations:1.11.0=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.41.0=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
+com.google.guava:failureaccess:1.0.3=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
+com.google.guava:guava:33.5.0-jre=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.1=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
+com.google.truth:truth:1.0.1=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
+com.googlecode.java-diff-utils:diffutils:1.3.0=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
+com.squareup.okio:okio-jvm:3.16.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+com.squareup.okio:okio-wasm-js:3.16.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+com.squareup.okio:okio:3.16.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+com.typesafe:config:1.4.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
+io.github.oshai:kotlin-logging-jvm:8.0.01=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.github.oshai:kotlin-logging-wasm-js:8.0.01=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.github.oshai:kotlin-logging:8.0.01=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-bom:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-client-auth-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-client-auth-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-client-auth:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-client-cio-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-client-cio-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-client-cio:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-client-content-negotiation-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-client-content-negotiation-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-client-content-negotiation:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-client-core-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-client-core-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-client-core:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-client-mock-jvm:3.4.2=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-client-mock-wasm-js:3.4.2=wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-client-mock:3.4.2=allTestSourceSetsCompileDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webTestResolvableDependenciesMetadata
+io.ktor:ktor-events-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-events-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-events:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-http-cio-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-http-cio-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-http-cio:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-http-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-http-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-http:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-io-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-io-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-io:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-network-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-network-tls-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-network-tls-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-network-tls:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-network-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-network:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-serialization-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-serialization-kotlinx-json-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-serialization-kotlinx-json-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-serialization-kotlinx-json:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-serialization-kotlinx-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-serialization-kotlinx-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-serialization-kotlinx:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-serialization-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-serialization:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-server-cio-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-server-cio:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
+io.ktor:ktor-server-core-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-server-core:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
+io.ktor:ktor-server-html-builder-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-server-html-builder:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
+io.ktor:ktor-sse-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-sse-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-sse:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-utils-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-utils-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-utils:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-websocket-serialization-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-websocket-serialization-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-websocket-serialization:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.ktor:ktor-websockets-jvm:3.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+io.ktor:ktor-websockets-wasm-js:3.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+io.ktor:ktor-websockets:3.4.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+io.sellmair:evas-compose-jvm:1.3.0=composeHotReloadDevTools
+io.sellmair:evas-compose:1.3.0=composeHotReloadDevTools
+io.sellmair:evas-jvm:1.3.0=composeHotReloadDevTools
+io.sellmair:evas:1.3.0=composeHotReloadDevTools
+junit:junit:4.13.2=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.checkerframework:checker-compat-qual:2.5.5=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath
+org.fusesource.jansi:jansi:2.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
+org.hamcrest:hamcrest-core:1.3=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.javassist:javassist:3.30.2-GA=composeHotReloadAgent
+org.jetbrains.androidx.lifecycle:lifecycle-common-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.4=composeHotReloadDevTools
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop:2.9.4=composeHotReloadDevTools
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.4=composeHotReloadDevTools
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.4=composeHotReloadDevTools
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4=composeHotReloadDevTools
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.4=composeHotReloadDevTools
+org.jetbrains.androidx.navigation3:navigation3-ui-desktop:1.1.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.androidx.navigation3:navigation3-ui-wasm-js:1.1.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.navigation3:navigation3-ui:1.1.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop:1.0.1=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.androidx.navigationevent:navigationevent-compose-wasm-js:1.0.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.androidx.savedstate:savedstate-compose-desktop:1.3.4=composeHotReloadDevTools
+org.jetbrains.androidx.savedstate:savedstate-compose-desktop:1.3.6=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.androidx.savedstate:savedstate-compose-wasm-js:1.3.6=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.savedstate:savedstate-compose:1.3.4=composeHotReloadDevTools
+org.jetbrains.androidx.savedstate:savedstate-compose:1.3.6=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.androidx.savedstate:savedstate-wasm-js:1.3.6=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.savedstate:savedstate:1.3.4=composeHotReloadDevTools
+org.jetbrains.androidx.savedstate:savedstate:1.3.6=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.androidx.window:window-core-desktop:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.androidx.window:window-core-wasm-js:1.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.androidx.window:window-core:1.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.animation:animation-core-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.animation:animation-core-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.animation:animation-core-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.animation:animation-core:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.animation:animation-core:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.animation:animation-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.animation:animation-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.animation:animation-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.animation:animation:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.animation:animation:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.annotation-internal:annotation-wasm-js:1.10.3=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.annotation-internal:annotation:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.annotation-internal:annotation:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.collection-internal:collection-wasm-js:1.10.3=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.collection-internal:collection:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.collection-internal:collection:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.components:components-resources-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.components:components-resources-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.components:components-resources-wasmJs:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.components:components-resources:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.components:components-resources:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.desktop:desktop-jvm:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.desktop:desktop-jvm:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.desktop:desktop:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
+org.jetbrains.compose.desktop:desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.foundation:foundation-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.foundation:foundation-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.foundation:foundation-layout-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.foundation:foundation-layout-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.foundation:foundation-layout-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.foundation:foundation-layout:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.foundation:foundation-layout:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.foundation:foundation-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.foundation:foundation:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.foundation:foundation:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.hot-reload:hot-reload-agent:1.0.0=composeHotReloadAgent
+org.jetbrains.compose.hot-reload:hot-reload-analysis:1.0.0=composeHotReloadAgent
+org.jetbrains.compose.hot-reload:hot-reload-annotations-jvm:1.0.0=composeHotReloadAgent,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,composeHotReloadRuntime,desktopDevCompileClasspath,desktopDevRuntimeClasspath
+org.jetbrains.compose.hot-reload:hot-reload-annotations:1.0.0=allDevSourceSetsCompileDependenciesMetadata,composeHotReloadAgent,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,composeHotReloadRuntime,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath
+org.jetbrains.compose.hot-reload:hot-reload-core:1.0.0=composeHotReloadAgent,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,composeHotReloadRuntime
+org.jetbrains.compose.hot-reload:hot-reload-devtools-api:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,composeHotReloadRuntime
+org.jetbrains.compose.hot-reload:hot-reload-devtools:1.0.0=composeHotReloadDevTools
+org.jetbrains.compose.hot-reload:hot-reload-orchestration:1.0.0=composeHotReloadAgent,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,composeHotReloadRuntime
+org.jetbrains.compose.hot-reload:hot-reload-runtime-api-jvm:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevTools,desktopDevCompileClasspath,desktopDevRuntimeClasspath
+org.jetbrains.compose.hot-reload:hot-reload-runtime-api:1.0.0=allDevSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevTools,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath
+org.jetbrains.compose.hot-reload:hot-reload-runtime-jvm:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadRuntime
+org.jetbrains.compose.material3.adaptive:adaptive-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.material3.adaptive:adaptive-layout-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.material3.adaptive:adaptive-layout-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.material3.adaptive:adaptive-layout:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.material3.adaptive:adaptive-navigation-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.material3.adaptive:adaptive-navigation-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.material3.adaptive:adaptive-navigation3-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.material3.adaptive:adaptive-navigation3-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.material3.adaptive:adaptive-navigation3:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.material3.adaptive:adaptive-navigation:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.material3.adaptive:adaptive-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.material3.adaptive:adaptive:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.material3:material3-desktop:1.10.0-alpha05=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.material3:material3-desktop:1.8.2=composeHotReloadDevTools
+org.jetbrains.compose.material3:material3-wasm-js:1.10.0-alpha05=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.material3:material3:1.10.0-alpha05=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.material3:material3:1.8.2=composeHotReloadDevTools
+org.jetbrains.compose.material:material-icons-core-desktop:1.7.3=composeHotReloadDevTools
+org.jetbrains.compose.material:material-icons-core:1.7.3=composeHotReloadDevTools
+org.jetbrains.compose.material:material-ripple-desktop:1.8.2=composeHotReloadDevTools
+org.jetbrains.compose.material:material-ripple-desktop:1.9.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.material:material-ripple-wasm-js:1.9.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.material:material-ripple:1.8.2=composeHotReloadDevTools
+org.jetbrains.compose.material:material-ripple:1.9.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.runtime:runtime-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.runtime:runtime-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.runtime:runtime-saveable-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.runtime:runtime-saveable-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.runtime:runtime-saveable-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.runtime:runtime-saveable:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.runtime:runtime-saveable:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.runtime:runtime-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.runtime:runtime:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.runtime:runtime:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-backhandler-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-backhandler-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-backhandler-wasm-js:1.10.3=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-backhandler:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.ui:ui-backhandler:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-geometry-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-geometry-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-geometry-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-geometry:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.ui:ui-geometry:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-graphics-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-graphics-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-graphics-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-graphics:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.ui:ui-graphics:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-test-desktop:1.10.3=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-test-wasm-js:1.10.3=wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-test:1.10.3=allTestSourceSetsCompileDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.ui:ui-text-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-text-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-text-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-text:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.ui:ui-text:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-tooling-preview-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-tooling-preview-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-tooling-preview-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-tooling-preview:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.ui:ui-tooling-preview:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-uikit:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,desktopDevResolvableDependenciesMetadata,desktopMainResolvableDependenciesMetadata,desktopTestResolvableDependenciesMetadata,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsTestResolvableDependenciesMetadata,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.ui:ui-unit-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-unit-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-unit-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-unit:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.ui:ui-unit:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-util-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-util-desktop:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-util-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.ui:ui-util:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.ui:ui-util:1.9.0=composeHotReloadDevTools
+org.jetbrains.compose.ui:ui-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.compose.ui:ui:1.10.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.compose.ui:ui:1.9.0=composeHotReloadDevTools
+org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
+org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.3.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
+org.jetbrains.kotlin:kotlin-serialization-compiler-plugin-embeddable:2.3.20=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21=composeHotReloadDevTools
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21=composeHotReloadDevTools
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21=composeHotReloadDevTools
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-wasm-js:2.3.20=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.1.21=composeHotReloadDevTools,composeHotReloadRuntime
+org.jetbrains.kotlin:kotlin-stdlib:2.3.20=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.kotlin:kotlin-test-junit:2.3.20=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-test-wasm-js:2.3.20=wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-test:2.3.20=allTestSourceSetsCompileDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webTestResolvableDependenciesMetadata
+org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlinx:atomicfu-jvm:0.23.2=composeHotReloadDevTools
+org.jetbrains.kotlinx:atomicfu-jvm:0.31.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:atomicfu-wasm-js:0.32.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:atomicfu:0.23.2=composeHotReloadDevTools
+org.jetbrains.kotlinx:atomicfu:0.31.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsTestResolvableDependenciesMetadata,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.kotlinx:atomicfu:0.32.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-browser-wasm-js:0.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-browser:0.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-wasm-js:1.10.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.10.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.10.2=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-test-wasm-js:1.10.2=wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2=allTestSourceSetsCompileDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webTestResolvableDependenciesMetadata
+org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.7.1=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-datetime-wasm-js:0.7.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-datetime:0.7.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.kotlinx:kotlinx-html-jvm:0.12.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-html:0.12.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.8.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-io-bytestring-wasm-js:0.8.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-io-bytestring:0.8.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.8.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-io-core-wasm-js:0.8.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-io-core:0.8.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=composeHotReloadDevTools
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=composeHotReloadDevTools
+org.jetbrains.kotlinx:kotlinx-serialization-core-wasm-js:1.11.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.11.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=composeHotReloadDevTools
+org.jetbrains.kotlinx:kotlinx-serialization-json-io-jvm:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-json-io-wasm-js:1.9.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-json-io:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-json-io:1.9.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,desktopDevResolvableDependenciesMetadata,desktopMainResolvableDependenciesMetadata,desktopTestResolvableDependenciesMetadata,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-json-wasm-js:1.11.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains.runtime:jbr-api:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
+org.jetbrains.skiko:skiko-awt:0.9.22.2=composeHotReloadDevTools
+org.jetbrains.skiko:skiko-awt:0.9.37.4=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jetbrains.skiko:skiko-js-wasm-runtime:0.9.37.4=COMPOSE_SKIKO_JS_WASM_RUNTIME,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.skiko:skiko-wasm-js:0.9.37.4=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.skiko:skiko:0.9.22.2=composeHotReloadDevTools
+org.jetbrains.skiko:skiko:0.9.37.4=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+org.jetbrains:annotations:13.0=composeHotReloadRuntime,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
+org.jetbrains:annotations:23.0.0=composeHotReloadDevTools
+org.jetbrains:annotations:26.0.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.jspecify:jspecify:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
+org.ow2.asm:asm-tree:9.8=composeHotReloadAgent
+org.ow2.asm:asm:9.8=composeHotReloadAgent
+org.slf4j:slf4j-api:2.0.17=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata
+empty=commonMainImplementationDependenciesMetadata,commonTestImplementationDependenciesMetadata,desktopDevAnnotationProcessor,desktopDevImplementationDependenciesMetadata,desktopMainAnnotationProcessor,desktopMainImplementationDependenciesMetadata,desktopTestAnnotationProcessor,desktopTestImplementationDependenciesMetadata,devKotlinScriptDefExtensions,jarValidation,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,testKotlinScriptDefExtensions,wasmJsMainImplementationDependenciesMetadata,wasmJsTestImplementationDependenciesMetadata,webMainImplementationDependenciesMetadata,webTestImplementationDependenciesMetadata
diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile
index 34f45c7394c0..d0eab79b171a 100644
--- a/solr/webapp/gradle.lockfile
+++ b/solr/webapp/gradle.lockfile
@@ -10,22 +10,22 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=solrCore
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=solrCore
 com.fasterxml.jackson:jackson-bom:2.21.2=solrCore
 com.fasterxml.woodstox:woodstox-core:7.0.0=solrCore
-com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,solrCore,testAnnotationProcessor
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.41.0=solrCore
-com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,solrCore,testAnnotationProcessor
-com.google.guava:guava:33.5.0-jre=annotationProcessor,solrCore,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,solrCore,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,solrCore,testAnnotationProcessor
-com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
+com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
+com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
+com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
 com.j256.simplemagic:simplemagic:1.17=solrCore
 com.jayway.jsonpath:json-path:2.9.0=solrCore
 com.lmax:disruptor:4.0.0=serverLib
@@ -33,8 +33,8 @@ com.tdunning:t-digest:3.3=solrCore
 commons-cli:commons-cli:1.11.0=solrCore
 commons-codec:commons-codec:1.21.0=solrCore
 commons-io:commons-io:2.21.0=solrCore
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
+io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=solrCore
 io.netty:netty-codec-base:4.2.12.Final=solrCore
 io.netty:netty-common:4.2.12.Final=solrCore
@@ -71,7 +71,7 @@ jakarta.servlet:jakarta.servlet-api:6.1.0=serverLib,solrCore
 jakarta.validation:jakarta.validation-api:3.1.0=solrCore
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=solrCore
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=solrCore
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
 org.antlr:antlr4-runtime:4.13.2=solrCore
 org.apache.commons:commons-exec:1.6.0=solrCore
 org.apache.commons:commons-lang3:3.20.0=solrCore
@@ -146,12 +146,12 @@ org.glassfish.jersey.inject:jersey-hk2:4.0.2=solrCore
 org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=solrCore
 org.glassfish.jersey:jersey-bom:4.0.2=solrCore
 org.javassist:javassist:3.30.2-GA=solrCore
-org.jspecify:jspecify:1.0.0=annotationProcessor,solrCore,testAnnotationProcessor
+org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,solrCore,testAnnotationProcessor
 org.locationtech.spatial4j:spatial4j:0.8=solrCore
 org.ow2.asm:asm-commons:9.8=solrCore
 org.ow2.asm:asm-tree:9.8=solrCore
 org.ow2.asm:asm:9.8=solrCore
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 org.semver4j:semver4j:6.0.0=solrCore
 org.slf4j:jcl-over-slf4j:2.0.17=serverLib,solrCore
 org.slf4j:jul-to-slf4j:2.0.17=serverLib

From 1af5b605e1ae00dc788b00969860ae401587648e Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Tue, 19 May 2026 22:15:51 -0400
Subject: [PATCH 27/27] changelog cleanup

---
 ...R-18188-testsStopUsingApacheHttpClient.yml | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/changelog/unreleased/SOLR-18188-testsStopUsingApacheHttpClient.yml b/changelog/unreleased/SOLR-18188-testsStopUsingApacheHttpClient.yml
index 59bf5682fff9..8f6c26a349c9 100644
--- a/changelog/unreleased/SOLR-18188-testsStopUsingApacheHttpClient.yml
+++ b/changelog/unreleased/SOLR-18188-testsStopUsingApacheHttpClient.yml
@@ -1,27 +1,3 @@
-# (DELETE ALL COMMENTS UP HERE AFTER FILLING THIS IN
-
-# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
-
-# If the change is minor, don't bother adding a changelog entry.
-# For `other` type entries, the threshold to bother with a changelog entry should be even higher.
-
-# title:
-#  * The audience is end-users and administrators, not committers.
-#  * Be short and focused on the user impact.  Multiple sentences is fine!
-#  * For technical/geeky details, prefer the commit message instead of changelog.
-#  * Reference JIRA issues like `SOLR-12345`, or if no JIRA but have a GitHub PR then `PR#12345`.
-
-# type:
-#  `added` for new features/improvements, opt-in by the user typically documented in the ref guide
-#  `changed` for improvements; not opt-in
-#  `fixed` for improvements that are deemed to have fixed buggy behavior
-#  `deprecated` for marking things deprecated
-#  `removed` for code removed
-#  `dependency_update` for updates to dependencies
-#  `other` for anything else, like large/significant refactorings, build changes,
-#    test infrastructure, or documentation.
-#    Most such changes are too small/minor to bother with a changelog entry.
-
 title: >
   Tests updated to NOT use org.apache.solr.client.solrj.apache which is now also removed.
   solr-test-framework doesn't use/depend on Apache HttpClient/httpcomponents anymore.